commit 5124dedfeb6c6f138c2d08d1d3abdc2eda240e0e
author Bruno Haible <bruno@clisp.org> Mon Feb 28 23:44:13 2011 +0100
committer Bruno Haible <bruno@clisp.org> Mon Feb 28 23:44:13 2011 +0100
tree f02d9c99bacd5409c621819caa5c405eeca4c54e
parent ccc9de4b0fa376dd87aa2b95c81913990be333aa

Assume ANSI C behaviour of free().

libcharset/lib/ChangeLog

diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index a2c3fe9..a2495ec 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,5 +1,12 @@
 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.
 	* relocatable.c: Likewise.
 

libcharset/lib/localcharset.c

diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
index cbcdace..3aceb42 100644
--- a/libcharset/lib/localcharset.c
+++ b/libcharset/lib/localcharset.c
@@ -229,8 +229,7 @@
                         {
                           /* 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);