Avoid memory leak upon realloc failure.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 51ecefbcb8227a9d3781581dc70c1667ce023423..05b5e2046451333ffe90c04604dd3eeacc6c001a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-20  Jim Meyering  <jim@meyering.net>
+            Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c (get_charset_aliases) [!VMS && !WIN32]: Don't leak
+       memory when realloc fails.
+
 2004-04-18  Jim Meyering  <jim@meyering.net>
 
        * readutmp.c (read_utmp) [UTMP_NAME_FUNCTION]: Upon realloc failure,

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 5b146e795796ad63d40560b3052aa16bca14fabb..0953d0aa6590dc9a69fc842dd83eb202f333e423 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -140,15 +140,17 @@ get_charset_aliases ()
       else
        {
          /* Parse the file's contents.  */
-         int c;
-         char buf1[50+1];
-         char buf2[50+1];
          char *res_ptr = NULL;
          size_t res_size = 0;
-         size_t l1, l2;
 
          for (;;)
            {
+             int c;
+             char buf1[50+1];
+             char buf2[50+1];
+             size_t l1, l2;
+             char *old_res_ptr;
+
              c = getc (fp);
              if (c == EOF)
                break;
@@ -169,6 +171,7 @@ get_charset_aliases ()
                break;
              l1 = strlen (buf1);
              l2 = strlen (buf2);
+             old_res_ptr = res_ptr;
              if (res_size == 0)
                {
                  res_size = l1 + 1 + l2 + 1;
@@ -183,6 +186,8 @@ get_charset_aliases ()
                {
                  /* Out of memory. */
                  res_size = 0;
+                 if (old_res_ptr != NULL)
+                   free (old_res_ptr);
                  break;
                }
              strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);