From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 15 Apr 2002 17:35:59 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2-3~860
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=659f290ad4891da6c88e81b2c9649de1b3bf74ae;p=thirdparty%2Fglibc.git

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 050fc07f41a..a30d8d7a373 100644
--- 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 82d5fb349f8..0aa623bf34a 100644
--- 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);