diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5fdbf4f314..bc8573c1d0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-24  Yuanhui Zhang  <asmwarrior@gmail.com>
+
+	* windows-nat.c (windows_xfer_shared_libraries): Return
+	TARGET_XFER_EOF if LEN is zero to fix an assert failure when
+	requested object is TARGET_OBJECT_LIBRARIES.
+
 2014-02-24  Yao Qi  <yao@codesourcery.com>
 
 	* target.h (enum target_xfer_status)
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 4366aab64b..6c45d0a0a6 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2501,7 +2501,7 @@ windows_xfer_shared_libraries (struct target_ops *ops,
 
   obstack_free (&obstack, NULL);
   *xfered_len = (ULONGEST) len;
-  return TARGET_XFER_OK;
+  return len != 0 ? TARGET_XFER_OK : TARGET_XFER_EOF;
 }
 
 static enum target_xfer_status