[BZ #2066]

2005-12-21  Roland McGrath  <roland@redhat.com>
	[BZ #2066]
	* intl/l10nflist.c (_nl_make_l10nflist): Free ABS_FILENAME when later
	malloc fails.

diff --git a/ChangeLog b/ChangeLog
index a97417b9249b6012750b81ac857ccbdb3a564160..74d0f4052167068e237a77d8c34b989a9d7c9af2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-21  Roland McGrath  <roland@redhat.com>
+
+       [BZ #2066]
+       * intl/l10nflist.c (_nl_make_l10nflist): Free ABS_FILENAME when later
+       malloc fails.
+
 2005-12-21  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/powerpc/fpu/libm-test-ulps: Update for GCC 4.1 prerelease.

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 7ffb4ab590381ab2bc92636d877c638cc66607fc..2c06a91113b6015088580b8a4c41189222278937 100644 (file)
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -270,7 +270,10 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
                                * (1 << pop (mask))
                                * sizeof (struct loaded_l10nfile *)));
   if (retval == NULL)
-    return NULL;
+    {
+      free (abs_filename);
+      return NULL;
+    }
 
   retval->filename = abs_filename;
   /* If more than one directory is in the list this is a pseudo-entry