From 8fb822e099bd9e67a9bac094852e9bce15ceb175 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Wed, 5 Sep 2007 00:01:41 +0000 Subject: [PATCH] 2007-09-04 Michael Snyder * stabsread.c (patch_block_status): Guard against null. * Makefile.in (stabsread.o): Depend on gdb_assert.h. --- gdb/ChangeLog | 5 +++++ gdb/Makefile.in | 3 ++- gdb/stabsread.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index af3cf2fc864..1b52ca0fadd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-09-04 Michael Snyder + + * stabsread.c (patch_block_status): Guard against null. + * Makefile.in (stabsread.o): Depend on gdb_assert.h. + 2007-09-04 Daniel Jacobowitz * printcmd.c (printf_command): Handle ptr_arg. Correct typo diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a3a350b1789..7ddf098c49e 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2718,7 +2718,8 @@ stabsread.o: stabsread.c $(defs_h) $(gdb_string_h) $(bfd_h) $(gdb_obstack_h) \ $(symtab_h) $(gdbtypes_h) $(expression_h) $(symfile_h) $(objfiles_h) \ $(aout_stab_gnu_h) $(libaout_h) $(aout_aout64_h) $(gdb_stabs_h) \ $(buildsym_h) $(complaints_h) $(demangle_h) $(language_h) \ - $(doublest_h) $(cp_abi_h) $(cp_support_h) $(stabsread_h) + $(doublest_h) $(cp_abi_h) $(cp_support_h) $(stabsread_h) \ + $(gdb_assert_h) stack.o: stack.c $(defs_h) $(value_h) $(symtab_h) $(gdbtypes_h) \ $(expression_h) $(language_h) $(frame_h) $(gdbcmd_h) $(gdbcore_h) \ $(target_h) $(source_h) $(breakpoint_h) $(demangle_h) $(inferior_h) \ diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 410abec92a5..0e093686752 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -45,6 +45,7 @@ #include "doublest.h" #include "cp-abi.h" #include "cp-support.h" +#include "gdb_assert.h" #include @@ -359,6 +360,7 @@ patch_block_stabs (struct pending *symbols, struct pending_stabs *stabs, { name = stabs->stab[ii]; pp = (char *) strchr (name, ':'); + gdb_assert (pp); /* Must find a ':' or game's over. */ while (pp[1] == ':') { pp += 2;