---

yaml
---
r: 343534
b: refs/heads/master-rebranch
c: 99d8042
h: refs/heads/master

Author: CodaFi

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 7a51cfcb8734deda7ae8d59296dc57fcfcec1ee5
+refs/heads/master-rebranch: 99d8042a701a24e4aa21346ac31fb84829767944
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/stdlib/toolchain/Compatibility50/Overrides.cpp

@@ -36,3 +36,56 @@ __attribute__((used, section("__DATA,__swift_hooks"))) = {
 __attribute__((weak, visibility("hidden")))
 extern "C"
 char _swift_FORCE_LOAD_$_swiftCompatibility50 = 0;
+
+// Put a getClass hook in front of the system Swift runtime's hook to prevent it
+// from trying to interpret symbolic references. rdar://problem/55036306
+
+// FIXME: delete this #if and dlsym once we don't
+// need to build with older libobjc headers
+#if !OBJC_GETCLASSHOOK_DEFINED
+using objc_hook_getClass =  BOOL(*)(const char * _Nonnull name,
+                                    Class _Nullable * _Nonnull outClass);
+#endif
+static objc_hook_getClass OldGetClassHook;
+
+static BOOL
+getObjCClassByMangledName_untrusted(const char * _Nonnull typeName,
+                                    Class _Nullable * _Nonnull outClass) {
+  // Scan the string for byte sequences that might be recognized as
+  // symbolic references, and reject them.
+  for (const char *c = typeName; *c != 0; ++c) {
+    if (*c < 0x20) {
+      *outClass = Nil;
+      return NO;
+    }
+  }
+  
+  if (OldGetClassHook) {
+    return OldGetClassHook(typeName, outClass);
+  }
+  // In case the OS runtime for some reason didn't install a hook, fallback to
+  // NO.
+  return NO;
+}
+
+__attribute__((constructor))
+static void installGetClassHook_untrusted() {
+  // FIXME: delete this #if and dlsym once we don't
+  // need to build with older libobjc headers
+#if !OBJC_GETCLASSHOOK_DEFINED
+  using objc_hook_getClass =  BOOL(*)(const char * _Nonnull name,
+                                      Class _Nullable * _Nonnull outClass);
+  auto objc_setHook_getClass =
+    (void(*)(objc_hook_getClass _Nonnull,
+             objc_hook_getClass _Nullable * _Nonnull))
+    dlsym(RTLD_DEFAULT, "objc_setHook_getClass");
+#endif
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
+  if (objc_setHook_getClass) {
+    objc_setHook_getClass(getObjCClassByMangledName_untrusted,
+                          &OldGetClassHook);
+  }
+#pragma clang diagnostic pop
+}