aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/go32-nat.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 921fbdd..57ad491 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-26 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * go32-nat.c (read_memory_region): Make sure the segment limit was
+ indeed set, to work around a Windows 2000 bug.
+
2001-07-25 Daniel Jacobowitz <drow@mvista.com>
* infptrace.c (child_xfer_memory): Add cast to CORE_ADDR.
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index fce7a0f..b2828eb 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -1331,7 +1331,10 @@ read_memory_region (unsigned long addr, void *dest, size_t len)
if (__dpmi_set_segment_base_address (sel, addr) != -1
&& __dpmi_set_descriptor_access_rights (sel, access_rights) != -1
- && __dpmi_set_segment_limit (sel, segment_limit) != -1)
+ && __dpmi_set_segment_limit (sel, segment_limit) != -1
+ /* W2K silently fails to set the segment limit, leaving
+ it at zero; this test avoids the resulting crash. */
+ && __dpmi_get_segment_limit (sel) >= segment_limit)
movedata (sel, 0, _my_ds (), (unsigned)dest, len);
else
retval = 0;