MetadataReader: Correct size measurement reading AnonymousContextDescriptors.

jckarter · jckarter · commit a37f81880e19 · 2019-09-25T14:29:47.000-07:00
By including the trailing mangled name reference in the baseSize, we computed the wrong offset for
the generic parameter header, and then miscomputed the size of the trailing generic context info.
This would lead to accesses into the context sometimes reading from uninitialized memory.
Fixes rdar://problem/55711107
diff --git a/include/swift/Remote/MetadataReader.h b/include/swift/Remote/MetadataReader.h
@@ -761,7 +761,7 @@ class MetadataReader {
       baseSize = sizeof(TargetAnonymousContextDescriptor<Runtime>);
       if (AnonymousContextDescriptorFlags(flags.getKindSpecificFlags())
             .hasMangledName()) {
-        baseSize += sizeof(TargetMangledContextName<Runtime>);
+        metadataInitSize = sizeof(TargetMangledContextName<Runtime>);
       }
       break;
     case ContextDescriptorKind::Class:

Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ class MetadataReader {`
`761`	`761`	`baseSize = sizeof(TargetAnonymousContextDescriptor<Runtime>);`
`762`	`762`	`if (AnonymousContextDescriptorFlags(flags.getKindSpecificFlags())`
`763`	`763`	`.hasMangledName()) {`
`764`		`- baseSize += sizeof(TargetMangledContextName<Runtime>);`
	`764`	`+ metadataInitSize = sizeof(TargetMangledContextName<Runtime>);`
`765`	`765`	`}`
`766`	`766`	`break;`
`767`	`767`	`case ContextDescriptorKind::Class:`