2007-10-24 Nathan Sidwell <nathan@codesourcery.com>

	* target-memory.c (claim_memory): Propagate baton for split memory
	requests.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f06e63242128a2eb0b8a1084961fd5a3c86ed5db..fd634e5f12f4b7a6b8c9a7a7ecc0ba14024ea8b6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * target-memory.c (claim_memory): Propagate baton for split memory
+       requests.
+
 2007-10-24  Pedro Alves  <pedro_alves@portugalmail.pt>
 
        PR gdb/2341

diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index 78f9d9c31cda6f3d1e1c5dc8c5c5b3bdf8a52149..b0133677dde08892b9e9dff374eeba85283fc940 100644 (file)
--- a/gdb/target-memory.c
+++ b/gdb/target-memory.c
@@ -84,10 +84,10 @@ claim_memory (VEC(memory_write_request_s) *blocks,
        {
          struct memory_write_request *n =
            VEC_safe_push (memory_write_request_s, *result, NULL);
-         memset (n, 0, sizeof (struct memory_write_request));
+         *n = *r;
          n->begin = claimed_begin;
          n->end = claimed_end;
-         n->data = r->data + (claimed_begin - r->begin);
+         n->data += claimed_begin - r->begin;
        }
     }
 }