Update.

2002-04-14  Bruno Haible  <bruno@clisp.org>

	* locale/programs/charmap.c (charmap_read): Don't access result if
	result == NULL.

diff --git a/ChangeLog b/ChangeLog
index 050fc07f41a3b1728aeadfe2471fec0049acb40c..a30d8d7a373822d40c2dc596eb18d175ce5947ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-14  Bruno Haible  <bruno@clisp.org>
+
+       * locale/programs/charmap.c (charmap_read): Don't access result if
+       result == NULL.
+
 2002-02-17  Andreas Schwab  <schwab@suse.de>
 
        * reldep7.c: New file.

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 82d5fb349f801c578976888605335fa3ba429f55..0aa623bf34add3a583f72e2ca69e8ff2e558b281 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -194,7 +194,7 @@ character map file `%s' not found"), filename));
 default character map file `%s' not found"), DEFAULT_CHARMAP));
     }
 
-  if (result->code_set_name == NULL)
+  if (result != NULL && result->code_set_name == NULL)
     /* The input file does not specify a code set name.  This
        shouldn't happen but we should cope with it.  */
     result->code_set_name = basename (filename);