2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 393223c0802..63ea7c29bf4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-31  Jim Meyering  <meyering@redhat.com>
+
+        * charset.c (load_charset_map): Don't deref NULL on failed malloc.
+        Use xmalloc rather than malloc.
+
 2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         strftime: import from gnulib
diff --git a/src/charset.c b/src/charset.c
index 57e24ae0c31..a6046600194 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -292,7 +292,7 @@ load_charset_map (struct charset *charset, struct charset_map_entries *entries,
       else
         {
           if (! temp_charset_work)
-            temp_charset_work = malloc (sizeof (*temp_charset_work));
+            temp_charset_work = xmalloc (sizeof (*temp_charset_work));
           if (control_flag == 1)
             {
               memset (temp_charset_work->table.decoder, -1,