localcharset: Assume ANSI C behaviour of free().

* lib/localcharset.c (get_charset_aliases): Remove NULL test before
calling free().
Suggested by Simon Josefsson <simon@josefsson.org>.

diff --git a/ChangeLog b/ChangeLog
index eaecb2e897f38c57deb026087efad4b66da3308c..3f7bd50d3ceff58479d280af6c0e68837258d143 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-28  Bruno Haible  <bruno@clisp.org>
+
+       localcharset: Assume ANSI C behaviour of free().
+       * lib/localcharset.c (get_charset_aliases): Remove NULL test before
+       calling free().
+       Suggested by Simon Josefsson <simon@josefsson.org>.
+
 2011-02-28  Corinna Vinschen  <vinschen@redhat.com>  (tiny change)
             Charles Wilson  <cygwin@cwilson.fastmail.fm>  (tiny change)
             Bruno Haible  <bruno@clisp.org>  (tiny change)

diff --git a/lib/localcharset.c b/lib/localcharset.c
index e96188bb7a82f70affe9072c2bea6c94c7c07d03..38e36ef3c94801c39f7fabd36c613ac846609621 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -228,8 +228,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);