From: Bruno Haible <bruno@clisp.org>
Date: Thu, 18 May 2006 16:51:34 +0000 (+0000)
Subject: Fix memory leak (merge from glibc).
X-Git-Tag: v0.15~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9fbb030c26927bab72a8bfedd65d633f71074cb;p=thirdparty%2Fgettext.git

Fix memory leak (merge from glibc).
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 72c4d3d5c..1d6d4405d 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-21  Roland McGrath  <roland@redhat.com>
+
+	* l10nflist.c (_nl_make_l10nflist): Free ABS_FILENAME when later malloc
+	fails.
+
 2006-05-17  Bruno Haible  <bruno@clisp.org>
 
 	Cygwin portability.
diff --git a/gettext-runtime/intl/l10nflist.c b/gettext-runtime/intl/l10nflist.c
index 1baaa792d..adcaa7f84 100644
--- a/gettext-runtime/intl/l10nflist.c
+++ b/gettext-runtime/intl/l10nflist.c
@@ -273,7 +273,10 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
 	    + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
 	       * sizeof (struct loaded_l10nfile *)));
   if (retval == NULL)
-    return NULL;
+    {
+      free (abs_filename);
+      return NULL;
+    }
 
   retval->filename = abs_filename;