---

yaml
---
r: 348767
b: refs/heads/master
c: 263bbbb
h: refs/heads/master
i:
  348765: 1bdb58e
  348763: af7d7ca
  348759: 318cda4
  348751: ef426a7
  348735: 792944a

Author: jckarter

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5d3ee68f9ce112a5f9401d3b378b24541042bbbd
+refs/heads/master: 263bbbb8392340ed427c043e08d4eb4a3b768219
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Remote/CMemoryReader.h

@@ -66,8 +66,13 @@ class CMemoryReader final : public MemoryReader {
 
   bool readString(RemoteAddress address, std::string &dest) override {
     auto length = getStringLength(address);
-    if (!length)
-      return false;
+    if (length == 0) {
+      // A length of zero unfortunately might mean either that there's a zero
+      // length string at the location we're trying to read, or that reading
+      // failed. We can do a one-byte read to tell them apart.
+      auto buf = readBytes(address, 1);
+      return buf && ((const char*)buf.get())[0] == 0;
+    }
 
     auto Buf = readBytes(address, length);
     if (!Buf)