Assume ANSI C behaviour of free().

bnoordhuis · Feb 28, 2011 · 5124ded · 5124ded
1 parent ccc9de4
commit 5124ded
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-28  Bruno Haible  <bruno@clisp.org>
+
+	Assume ANSI C behaviour of free().
+	* localcharset.c (get_charset_aliases): Remove NULL test before calling
+	free().
+	Suggested by Simon Josefsson <simon@josefsson.org>.
+
 2011-02-28  Bruno Haible  <bruno@clisp.org>
 
 	* relocatable.h: Update from gnulib.

diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
@@ -229,8 +229,7 @@ get_charset_aliases (void)
                         {
                           /* Out of memory. */
                           res_size = 0;
-                          if (old_res_ptr != NULL)
-                            free (old_res_ptr);
+                          free (old_res_ptr);
                           break;
                         }
                       strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);