* charset.c (find_charset_names): Check 'in' against NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5adc58781be848472e98ea41091fa1206d307129..f85f13971ac7a715651b085cb24f950fcc92b8e7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07  Tom Tromey  <tromey@redhat.com>
+
+       * charset.c (find_charset_names): Check 'in' against NULL.
+
 2012-02-06  Doug Evans  <dje@google.com>
 
        * gdbtypes.h (struct main_type): Change type of name,tag_name,

diff --git a/gdb/charset.c b/gdb/charset.c
index 62977d11d00c2f78517d1b01953d59f6a086a31b..16dab6b9fc0a8e74b5cf7a22f97b14f4e3c20f83 100644 (file)
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -839,7 +839,7 @@ find_charset_names (void)
         parse the glibc and libiconv formats; feel free to add others
         as needed.  */
 
-      while (!feof (in))
+      while (in != NULL && !feof (in))
        {
          /* The size of buf is chosen arbitrarily.  */
          char buf[1024];