diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/charset.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5adc587..f85f139 100644 --- 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 62977d1..16dab6b 100644 --- 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]; |