From 76b83c514f6b202659c8b600b20fe0e107f83f6f Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 6 Jul 2012 15:51:40 +0000 Subject: gdb/ PR 14321 * findcmd.c (parse_find_args): New variable pattern_buf_size_need. Increase buffer sizes to 2x we need, not just 2x of the previous size. gdb/testsuite/ PR 14321 * gdb.base/find.exp (find int64_search_buf, +64/8*100, int64_search_buf): New test. --- gdb/findcmd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gdb/findcmd.c') diff --git a/gdb/findcmd.c b/gdb/findcmd.c index 3fce269..68184aa 100644 --- a/gdb/findcmd.c +++ b/gdb/findcmd.c @@ -170,6 +170,7 @@ parse_find_args (char *args, ULONGEST *max_countp, { LONGEST x; int val_bytes; + ULONGEST pattern_buf_size_need; while (isspace (*s)) ++s; @@ -179,12 +180,13 @@ parse_find_args (char *args, ULONGEST *max_countp, /* 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; } -- cgit v1.1