re PR fortran/54678 (second call to get_environment_variable gives valgrind warning...

2013-01-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/54678
        * intrinsics/env.c (get_environment_variable_i8): Don't use
        uninitialized variable.

From-SVN: r194948

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index e7142d8f354daffee221459ac23ff167c11c8931..a5b4034dc3811558950a44f4759a39caacf46ceb 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-06  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/54678
+       * intrinsics/env.c (get_environment_variable_i8): Don't use
+       uninitialized variable.
+
 2013-01-02  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libfortran/55818

diff --git a/libgfortran/intrinsics/env.c b/libgfortran/intrinsics/env.c
index 8836038488a9b380d6451716baaeff1dcc105918..252ee2f5c8a3774a096beff98fee8ed492d88df1 100644 (file)
--- a/libgfortran/intrinsics/env.c
+++ b/libgfortran/intrinsics/env.c
@@ -185,7 +185,8 @@ get_environment_variable_i8 (char *name, char *value, GFC_INTEGER_8 *length,
     trim_name4 = *trim_name;
 
   get_environment_variable_i4 (name, value, &length4, &status4, 
-                              &trim_name4, name_len, value_len);
+                              trim_name ? &trim_name4 : NULL,
+                              name_len, value_len);
 
   if (length)
     *length = length4;