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

	* expprint.c (print_subexp_standard): Check strchr for null.
	* Makefile.in (expprint.o): Depend on gdb_assert.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 848041a931a12399aa2394380228c05b3770fcd4..a26e493901e651327d7de1545daaee91b9af91b0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-04  Michael Snyder  <msnyder@access-company.com>
 
+       * expprint.c (print_subexp_standard): Check strchr for null.
+       * Makefile.in (expprint.o): Depend on gdb_assert.h.
+
        * gnu-v2-abi.c (gnuv2_value_rtti_type): Guard against null.
 
        * stabsread.c (patch_block_status): Guard against null.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7ddf098c49e9d7dad6e90754c1e118e1f37563ed..c740831dd7517307a75be9b0c1a8b6eb554b916e 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1995,7 +1995,7 @@ exec.o: exec.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) $(gdbcmd_h) \
        $(xcoffsolib_h) $(observer_h)
 expprint.o: expprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \
        $(value_h) $(language_h) $(parser_defs_h) $(user_regs_h) $(target_h) \
-       $(gdb_string_h) $(block_h) $(objfiles_h)
+       $(gdb_string_h) $(block_h) $(objfiles_h) $(gdb_assert_h)
 fbsd-nat.o: fbsd-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h) \
        $(regset_h) $(gdb_assert_h) $(gdb_string_h) $(elf_bfd_h) \
        $(fbsd_nat_h)

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 1dba437e9a22f79466cb53551edf056923da93c6..6f1fcbfe92ea6cd362d691b42a9d09ed56959041 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -30,6 +30,7 @@
 #include "gdb_string.h"
 #include "block.h"
 #include "objfiles.h"
+#include "gdb_assert.h"
 
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
@@ -212,6 +213,7 @@ print_subexp_standard (struct expression *exp, int *pos,
            for (tem = 0; tem < nargs; tem++)
              {
                nextS = strchr (s, ':');
+               gdb_assert (nextS);     /* Make sure we found ':'.  */
                *nextS = '\0';
                fprintf_unfiltered (stream, " %s: ", s);
                s = nextS + 1;