merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 22bf58cfad8cdd72387c78c5cbb237f4c4e51844..13bdd39d96fd9a2e6b4aa1fbf4c034839f04e735 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * concat.c (reconcat): Fix for traditional C.
+
 2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * concat.c (reconcat): New function.

diff --git a/libiberty/concat.c b/libiberty/concat.c
index 136e8be866ebee04f7cf2e0536708d332b910778..cf026cf8f4cc1efeab9a4f5ab2f8d8b39e9df977 100644 (file)
--- a/libiberty/concat.c
+++ b/libiberty/concat.c
@@ -188,10 +188,9 @@ reconcat VPARAMS ((char *optr, const char *first, ...))
   VA_FIXEDARG (args, char *, optr);
   VA_FIXEDARG (args, const char *, first);
   vconcat_copy (newstr, first, args);
-  VA_CLOSE (args);
-
-  if (optr)
+  if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C.  */
     free (optr);
+  VA_CLOSE (args);
 
   return newstr;
 }