Merge GDB 7.5.1

gdb/findcmd.c

 /* The find command.
 
    Copyright (C) 2008-2012 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.
@@ skipping 152 matching lines @@
 
   if (*s == ',')
     ++s;
 
   /* Fetch the search string.  */
 
   while (*s != '\0')
     {
       LONGEST x;
       int val_bytes;
+      ULONGEST pattern_buf_size_need;
 
       while (isspace (*s))
         ++s;
 
       v = parse_to_comma_and_eval (&s);
       val_bytes = TYPE_LENGTH (value_type (v));
 
       /* Keep it simple and assume size == 'g' when watching for when we
          need to grow the pattern buf.  */
-      if ((pattern_buf_end - pattern_buf + max (val_bytes, sizeof (int64_t)))
-          > pattern_buf_size)
+      pattern_buf_size_need = (pattern_buf_end - pattern_buf
+                               + max (val_bytes, sizeof (int64_t)));
+      if (pattern_buf_size_need > pattern_buf_size)
         {
           size_t current_offset = pattern_buf_end - pattern_buf;
 
-          pattern_buf_size *= 2;
+          pattern_buf_size = pattern_buf_size_need * 2;
           pattern_buf = xrealloc (pattern_buf, pattern_buf_size);
           pattern_buf_end = pattern_buf + current_offset;
         }
 
       if (size != '\0')
         {
           x = value_as_long (v);
           switch (size)
             {
             case 'b':
@@ skipping 134 matching lines @@
 and if not specified the size is taken from the type of the expression\n\
 in the current language.\n\
 Note that this means for example that in the case of C-like languages\n\
 a search for an untyped 0x42 will search for \"(int) 0x42\"\n\
 which is typically four bytes.\n\
 \n\
 The address of the last match is stored as the value of \"$_\".\n\
 Convenience variable \"$numfound\" is set to the number of matches."),
            &cmdlist);
 }