From 8a35fb51cdadb1abc314e1a3071ec201c30ed523 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Thu, 29 Oct 2009 20:12:26 +0000 Subject: [PATCH] 2009-10-29 Sandra Loosemore PR gdb/10783 gdb/ * target.c (simple_search_memory): Correct read_addr initialization in loop for searching subsequent chunks. gdb/gdbserver/ * server.c (handle_search_memory_1): Correct read_addr initialization in loop for searching subsequent chunks. --- gdb/ChangeLog | 7 +++++++ gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/server.c | 2 +- gdb/target.c | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fe28f95a72..5b02b0e724 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2009-10-29 Sandra Loosemore + + PR gdb/10783 + + * target.c (simple_search_memory): Correct read_addr initialization + in loop for searching subsequent chunks. + 2009-10-28 Daniel Jacobowitz Reported by Antti Hatala . diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index fceb900c4f..5a83c8fa63 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2009-10-29 Sandra Loosemore + + PR gdb/10783 + + * server.c (handle_search_memory_1): Correct read_addr initialization + in loop for searching subsequent chunks. + 2009-10-29 Paul Pluzhnikov * configure.ac: New --with-libthread-db option. diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 9bf4f3dbd0..14bc7e752e 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -557,7 +557,7 @@ handle_search_memory_1 (CORE_ADDR start_addr, CORE_ADDR search_space_len, if (search_space_len >= pattern_len) { unsigned keep_len = search_buf_size - chunk_size; - CORE_ADDR read_addr = start_addr + keep_len; + CORE_ADDR read_addr = start_addr + chunk_size + keep_len; int nr_to_read; /* Copy the trailing part of the previous iteration to the front diff --git a/gdb/target.c b/gdb/target.c index 21db30c35c..fc24730951 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2305,7 +2305,7 @@ simple_search_memory (struct target_ops *ops, if (search_space_len >= pattern_len) { unsigned keep_len = search_buf_size - chunk_size; - CORE_ADDR read_addr = start_addr + keep_len; + CORE_ADDR read_addr = start_addr + chunk_size + keep_len; int nr_to_read; /* Copy the trailing part of the previous iteration to the front