PR exp/11926

	* c-exp.y (parse_number): Handle 0 return from sscanf.

	testsuite/
	* gdb.base/printcmds.exp (test_integer_literals_rejected): Add
	test of "p 0x1.1".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5a378e3098d37d46dc4431a4bc34017ec8dc39da..3aa0bdfb20be0f79c3358050ab2f7dace216e683 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-19  Doug Evans  <dje@google.com>
+
+       PR exp/11926
+       * c-exp.y (parse_number): Handle 0 return from sscanf.
+
 2010-08-19  Joel Brobecker  <brobecker@adacore.com>
 
        * psymtab.c (map_symbol_filenames_psymtab): Call FUN with

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 030554c9823da302a790f21f1dfd6af562750b39..d83bbf4d8ab257ca4383726e0c41ce7071543525 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1371,6 +1371,12 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
                    &putithere->typed_val_float.dval, s);
       p[len] = saved_char;     /* restore the input stream */
 
+      if (num == 0)
+       {
+         free (s);
+         return ERROR;
+       }
+
       if (num == 1)
        putithere->typed_val_float.type = 
          parse_type->builtin_double;

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a07ffcf921500c33005ad57861671d00dd7f74f4..cf8e9330cd3eabdc85c1d913fb99f059fef46f3c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-19  Doug Evans  <dje@google.com>
+
+       PR exp/11926
+       * gdb.base/printcmds.exp (test_integer_literals_rejected): Add
+       test of "p 0x1.1".
+
 2010-08-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * gdb.python/python.exp (show height, set height 10)

diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index 11e29fa5a6549721e1efba5da82e2c7c01d63668..c602a8b8e13be126e20682c9de1cf18b11b21dd7 100644 (file)
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -128,6 +128,7 @@ proc test_integer_literals_rejected {} {
     test_print_reject "p 123DEADBEEF"
     test_print_reject "p 123foobar.bazfoo3"
     test_print_reject "p 123EEEEEEEEEEEEEEEEE33333k333"
+    test_print_reject "p 0x1.1"
     gdb_test "p 123.4+56.7" "180.(099\[0-9]*|100\[0-9\]*)" "check for floating addition"
 
     # Test various octal values.