GDB 7.6.50

gdb/common/format.c

 /* Parse a printf-style format string.
 
-   Copyright (C) 1986-2012 Free Software Foundation, Inc.
+   Copyright (C) 1986-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef GDBSERVER
 #include "server.h"
 #else
 #include "defs.h"
 #endif
 
 #include <string.h>
 
 #include "format.h"
 
 struct format_piece *
-parse_format_string (char **arg)
+parse_format_string (const char **arg)
 {
-  char *s, *f, *string;
-  char *prev_start;
-  char *percent_loc;
+  const char *s;
+  char *f, *string;
+  const char *prev_start;
+  const char *percent_loc;
   char *sub_start, *current_substring;
   struct format_piece *pieces;
   int next_frag;
   int max_pieces;
   enum argclass this_argclass;
 
   s = *arg;
 
   /* Parse the format-control string and copy it into the string STRING,
      processing some kinds of escape sequence.  */
@@ skipping 102 matching lines @@
 
         percent_loc = f - 1;
 
         /* Check the validity of the format specifier, and work
            out what argument it expects.  We only accept C89
            format strings, with the exception of long long (which
            we autoconf for).  */
 
         /* The first part of a format specifier is a set of flag
            characters.  */
-        while (strchr ("0-+ #", *f))
+        while (*f != '\0' && strchr ("0-+ #", *f))
           {
             if (*f == '#')
               seen_hash = 1;
             else if (*f == '0')
               seen_zero = 1;
             else if (*f == ' ')
               seen_space = 1;
             else if (*f == '+')
               seen_plus = 1;
             f++;
           }
 
         /* The next part of a format specifier is a width.  */
-        while (strchr ("0123456789", *f))
+        while (*f != '\0' && strchr ("0123456789", *f))
           f++;
 
         /* The next part of a format specifier is a precision.  */
         if (*f == '.')
           {
             seen_prec = 1;
             f++;
-            while (strchr ("0123456789", *f))
+            while (*f != '\0' && strchr ("0123456789", *f))
               f++;
           }
 
         /* The next part of a format specifier is a length modifier.  */
         if (*f == 'h')
           {
             seen_h = 1;
             f++;
           }
         else if (*f == 'l')
@@ skipping 47 matching lines @@
           /* FALLTHROUGH */
 
           case 'd':
           case 'i':
             if (lcount == 0)
               this_argclass = int_arg;
             else if (lcount == 1)
               this_argclass = long_arg;
             else
               this_argclass = long_long_arg;
- 
-          if (seen_big_l)
-            bad = 1;
-          break;
+
+            if (seen_big_l)
+              bad = 1;
+            break;
 
           case 'c':
             this_argclass = lcount == 0 ? int_arg : wide_char_arg;
             if (lcount > 1 || seen_h || seen_big_l)
               bad = 1;
             if (seen_prec || seen_zero || seen_space || seen_plus)
               bad = 1;
             break;
 
           case 'p':
             this_argclass = ptr_arg;
             if (lcount || seen_h || seen_big_l)
               bad = 1;
-            if (seen_prec || seen_zero || seen_space || seen_plus)
+            if (seen_prec)
+              bad = 1;
+            if (seen_hash || seen_zero || seen_space || seen_plus)
               bad = 1;
             break;
 
           case 's':
             this_argclass = lcount == 0 ? string_arg : wide_string_arg;
             if (lcount > 1 || seen_h || seen_big_l)
               bad = 1;
             if (seen_zero || seen_space || seen_plus)
               bad = 1;
             break;
 
           case 'e':
           case 'f':
           case 'g':
           case 'E':
           case 'G':
             if (seen_big_h || seen_big_d || seen_double_big_d)
               this_argclass = decfloat_arg;
             else if (seen_big_l)
               this_argclass = long_double_arg;
             else
               this_argclass = double_arg;
 
-          if (lcount || seen_h)
-            bad = 1;
-          break;
+            if (lcount || seen_h)
+              bad = 1;
+            break;
 
           case '*':
             error (_("`*' not supported for precision or width in printf"));
 
           case 'n':
             error (_("Format specifier `n' not supported in printf"));
 
           case '\0':
             error (_("Incomplete format specifier at end of format string"));
 
@@ skipping 89 matching lines @@
   if (location == NULL)
     return;
 
   if (*location != NULL)
     {
       free_format_pieces (*location);
       *location = NULL;
     }
 }