2007-09-04 Michael Snyder <msnyder@access-company.com>

	* stabsread.c (patch_block_status): Guard against null.
	* Makefile.in (stabsread.o): Depend on gdb_assert.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index af3cf2fc864ad51ce356219aa5b20d1de6b2e9a9..1b52ca0fadd30e9f43dc46960310c20cc41f9aef 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-04  Michael Snyder  <msnyder@access-company.com>
+
+       * stabsread.c (patch_block_status): Guard against null.
+       * Makefile.in (stabsread.o): Depend on gdb_assert.h.
+
 2007-09-04  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * printcmd.c (printf_command): Handle ptr_arg.  Correct typo

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a3a350b178941092f464a9d5954a9f2da550c429..7ddf098c49e9d7dad6e90754c1e118e1f37563ed 100644 (file)
--- 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 410abec92a55714c36761f48af588b331bfc0dc9..0e093686752026baca699673b83b71d334d546fe 100644 (file)
--- 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 <ctype.h>
 
@@ -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;