Import upstream version 1.26

[debian/tar] / gnu / localcharset.c

diff --git a/gnu/localcharset.c b/gnu/localcharset.c
index 794fec6bef28f2965436a94abf8f6bd8b8e51186..d8b5953c23fa0714dc5fbaa513eeae95945638d0 100644 (file)
--- a/gnu/localcharset.c
+++ b/gnu/localcharset.c
@@ -2,7 +2,7 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -230,8 +230,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);