Merge pull request #27318 from jckarter/remote-ref-null-relative

jckarter · web-flow · commit bc8dfe488606 · 2019-09-24T08:03:05.000-07:00
Fix handling of null relative references in RemoteRef.
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -95,6 +95,8 @@ class RemoteRef {
   uint64_t resolveRelativeAddressData() const {
     int32_t offset;
     memcpy(&offset, LocalBuffer, sizeof(int32_t));
+    if (offset == 0)
+      return 0;
     return Address + (int64_t)offset;
   }
   

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ class RemoteRef {`
`95`	`95`	`uint64_t resolveRelativeAddressData() const {`
`96`	`96`	`int32_t offset;`
`97`	`97`	`memcpy(&offset, LocalBuffer, sizeof(int32_t));`
	`98`	`+ if (offset == 0)`
	`99`	`+ return 0;`
`98`	`100`	`return Address + (int64_t)offset;`
`99`	`101`	`}`
`100`	`102`