From: Pierre Muller <muller@sourceware.org>
Date: Fri, 14 Dec 2012 07:50:02 +0000 (+0000)
Subject: 	* windows-nat.c (windows_xfer_shared_libraries): Avoid
X-Git-Tag: cgen-snapshot-20130101~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49dc7f4b4736a708e8de645ebff64ba5084d33d1;p=thirdparty%2Fbinutils-gdb.git

	* windows-nat.c (windows_xfer_shared_libraries): Avoid
	memory leak when OFFSET >= LEN_AVAIL.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 891f6e05920..d3c886de93f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-14  Pierre Muller  <muller@sourceware.org>
+
+	* windows-nat.c (windows_xfer_shared_libraries): Avoid
+	memory leak when OFFSET >= LEN_AVAIL.
+
 2012-12-13  Tom Tromey  <tromey@redhat.com>
 
 	* solib-svr4.c (enable_break): Use SECT_OFF_TEXT.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 75831d821c3..cc81a66ff7f 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2411,11 +2411,13 @@ windows_xfer_shared_libraries (struct target_ops *ops,
   buf = obstack_finish (&obstack);
   len_avail = strlen (buf);
   if (offset >= len_avail)
-    return 0;
-
-  if (len > len_avail - offset)
-    len = len_avail - offset;
-  memcpy (readbuf, buf + offset, len);
+    len= 0;
+  else
+    {
+      if (len > len_avail - offset)
+	len = len_avail - offset;
+      memcpy (readbuf, buf + offset, len);
+    }
 
   obstack_free (&obstack, NULL);
   return len;