233015 2021-11-11 14:21:10 -0800 [Cocoa] Web Inspector: fix bundle identifier lookup for enabling remote inspection 2021-11-30 12:10:42 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg darin ews-watchlist hi inspector-bugzilla-changes joepeck pangle webkit-bug-importer oldest_to_newest 1814224 0 bburg 2021-11-11 14:21:10 -0800 . 1814226 1 bburg 2021-11-11 14:21:39 -0800 <rdar://85277115> 1814230 2 444001 bburg 2021-11-11 14:24:49 -0800 Created attachment 444001 Patch v1.0 1814255 3 444008 bburg 2021-11-11 15:12:36 -0800 Created attachment 444008 Patch v1.1 1814311 4 444008 darin 2021-11-11 17:05:14 -0800 Comment on attachment 444008 Patch v1.1 View in context: https://bugs.webkit.org/attachment.cgi?id=444008&action=review > Source/WebKit/UIProcess/Inspector/WebInspectorUtilities.h:48 > +String bundleIdentifierForSandboxBroker(); I think this should return a CFStringRef. Also, could return ASCIILiteral if you really want to stick with WTF instead of platform-specific. 1814528 5 444008 pangle 2021-11-12 11:09:29 -0800 Comment on attachment 444008 Patch v1.1 View in context: https://bugs.webkit.org/attachment.cgi?id=444008&action=review > Source/WebKit/UIProcess/Inspector/WebInspectorUtilities.cpp:119 > + auto sandboxBrokerBundleIdentifier = "com.apple.Safari.SandboxBroker"_s; Nit: Now that this logic is in a standalone function, can we just return the correct string inside the conditionals instead of setting a local variable? 1815182 6 444296 bburg 2021-11-15 12:39:09 -0800 Created attachment 444296 Patch v1.2 1815218 7 444296 darin 2021-11-15 14:37:17 -0800 Comment on attachment 444296 Patch v1.2 View in context: https://bugs.webkit.org/attachment.cgi?id=444296&action=review > Source/WebKit/UIProcess/Cocoa/WebInspectorPreferenceObserver.mm:53 > + String sandboxBrokerBundleIdentifier = WebKit::bundleIdentifierForSandboxBroker(); I suggest not involving WTF::String at all: auto sandboxBrokerBundleIdentifier = WebKit::bundleIdentifierForSandboxBroker(); m_userDefaults = adoptNS([[NSUserDefaults alloc] initWithSuiteName:bridge_cast(sandboxBrokerBundleIdentifier)]); if (!m_userDefaults) { WTFLogAlways("Could not init user defaults instance for domain %@.", sandboxBrokerBundleIdentifier); 1815287 8 444296 darin 2021-11-15 17:07:13 -0800 Comment on attachment 444296 Patch v1.2 View in context: https://bugs.webkit.org/attachment.cgi?id=444296&action=review > Source/WebKit/UIProcess/Inspector/WebInspectorUtilities.cpp:122 > + if (WebCore::applicationBundleIdentifier() == "com.apple.SafariTechnologyPreview"_s) > + return CFSTR("com.apple.SafariTechnologyPreview.SandboxBroker"); > + if (WebCore::applicationBundleIdentifier() == "com.apple.Safari.automation"_s) > + return CFSTR("com.apple.Safari.automation.SandboxBroker"); One other thought: Since bundle identifiers are not case sensitive, it might be safer to call equalLettersIgnoringASCIICase instead of using ==. 1818821 9 445440 bburg 2021-11-30 10:44:01 -0800 Created attachment 445440 Patch for Landing 1818833 10 445440 joepeck 2021-11-30 10:53:10 -0800 Comment on attachment 445440 Patch for Landing View in context: https://bugs.webkit.org/attachment.cgi?id=445440&action=review > Source/WebKit/UIProcess/Inspector/WebInspectorUtilities.cpp:119 > + if (WebCore::applicationBundleIdentifier() == "com.apple.SafariTechnologyPreview"_s) Perhaps avoid calling `WebCore::applicationBundleIdentifier` twice with a local? Is the result always `applicationBundleIdentifier() + ".SandboxBroker"? 1818871 11 ews-feeder 2021-11-30 12:10:40 -0800 Committed r286314 (244673@main): <https://commits.webkit.org/244673@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445440. 444001 2021-11-11 14:24:49 -0800 2021-11-11 14:26:06 -0800 Patch v1.0 bug-233015-20211111142448.patch text/plain 1736 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNiYWE4MzNlMTcwMDYwYmI1 MWM1NzI0ZmE5OTNiZmY4NzZmM2UyYjYuLjcwNGZkZTVjNmVhMWQwYTVkYjk3ODA5ZmMyZWNhN2Vh NzRiZjc2OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMTEtMTEgIEJKIEJ1cmcg IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBXZWIgSW5zcGVjdG9yOiBmaXgg YnVuZGxlIGlkZW50aWZpZXIgbG9va3VwIGZvciBlbmFibGluZyByZW1vdGUgaW5zcGVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDE1Cisg ICAgICAgIDxyZGFyOi8vODUyNzcxMTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Byb3h5Q29jb2Eu bW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6c2hvdWxkRW5hYmxlUmVtb3Rl SW5zcGVjdG9yKToKKwogMjAyMS0xMS0xMCAgUGVyIEFybmUgVm9sbGFuIDxwdm9sbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBCbG9jayBzYW5kYm94IGFjY2VzcyB0byBjb25zdW1lIG1hY2ggZXh0 ZW5zaW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJv Y2Vzc1Byb3h5Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUHJveHlDb2NvYS5tbQppbmRleCA3OTJmMDc5YTZkZjU1ZmRlMWY5M2RhMTQ4NDc0M2U0ODU3 NTllMjgxLi41MjkwYzkyODg3NzdhZTdmNGVhZDUyNjViYWI2NzhmOTFmNDQ4YTc5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUHJveHlDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUHJveHlDb2Nv YS5tbQpAQCAtMjEwLDYgKzIxMCw4IEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpzaG91bGRFbmFi bGVSZW1vdGVJbnNwZWN0b3IoKQogICAgIGF1dG8gc2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZp ZXIgPSBDRlNUUigiY29tLmFwcGxlLlNhZmFyaS5TYW5kYm94QnJva2VyIik7CiAgICAgaWYgKFdl YkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcigpID09ICJjb20uYXBwbGUuU2FmYXJp VGVjaG5vbG9neVByZXZpZXciX3MpCiAgICAgICAgIHNhbmRib3hCcm9rZXJCdW5kbGVJZGVudGlm aWVyID0gQ0ZTVFIoImNvbS5hcHBsZS5TYWZhcmlUZWNobm9sb2d5UHJldmlldy5TYW5kYm94QnJv a2VyIik7CisgICAgZWxzZSBpZiAoV2ViQ29yZTo6YXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVy KCkgPT0gImNvbS5hcHBsZS5TYWZhcmkuYXV0b21hdGlvbiJfcykKKyAgICAgICAgc2FuZGJveEJy b2tlckJ1bmRsZUlkZW50aWZpZXIgPSBDRlNUUigiY29tLmFwcGxlLlNhZmFyaS5hdXRvbWF0aW9u LlNhbmRib3hCcm9rZXIiKTsKICAgICByZXR1cm4gQ0ZQcmVmZXJlbmNlc0dldEFwcEludGVnZXJW YWx1ZShDRlNUUigiU2hvd0RldmVsb3BNZW51IiksIHNhbmRib3hCcm9rZXJCdW5kbGVJZGVudGlm aWVyLCBudWxscHRyKTsKICNlbmRpZgogfQo= 444008 2021-11-11 15:12:36 -0800 2021-11-15 12:39:08 -0800 Patch v1.1 bug-233015-20211111151235.patch text/plain 6010 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNiYWE4MzNlMTcwMDYwYmI1 MWM1NzI0ZmE5OTNiZmY4NzZmM2UyYjYuLmZmZDg5OTE4ZGYzYTIxNThiMGY1MThkODc0NzM3NDhm Yzc4MTdhM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTEtMTEgIEJKIEJ1cmcg IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBXZWIgSW5zcGVjdG9yOiBmaXgg YnVuZGxlIGlkZW50aWZpZXIgbG9va3VwIGZvciBlbmFibGluZyByZW1vdGUgaW5zcGVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDE1Cisg ICAgICAgIDxyZGFyOi8vODUyNzcxMTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxp dGllcy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0 aWVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6YnVuZGxlSWRlbnRpZmllckZvclNhbmRib3hCcm9r ZXIpOgorICAgICAgICBUbyBhdm9pZCByZXBlYXRpbmcgdGhlIGxvZ2ljLCBleHRyYWN0IHRoaXMg Y29kZSB0byBhIGhlbHBlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJJbnNwZWN0 b3JQcmVmZXJlbmNlT2JzZXJ2ZXIubW06CisgICAgICAgICgtW1dLV2ViSW5zcGVjdG9yUHJlZmVy ZW5jZU9ic2VydmVyIGluaXRdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz c1Byb3h5Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6c2hvdWxk RW5hYmxlUmVtb3RlSW5zcGVjdG9yKToKKyAgICAgICAgVXNlIHRoZSBoZWxwZXIgbWV0aG9kLgor CiAyMDIxLTExLTEwICBQZXIgQXJuZSBWb2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIEJsb2NrIHNhbmRib3ggYWNjZXNzIHRvIGNvbnN1bWUgbWFjaCBleHRlbnNpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJJbnNwZWN0b3JQcmVmZXJl bmNlT2JzZXJ2ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJJbnNwZWN0 b3JQcmVmZXJlbmNlT2JzZXJ2ZXIubW0KaW5kZXggOTIwNWMxNjE3OTQzY2E1YTA2ZTBhOGQzNTU5 ZTc1MDgzNmRjZmZiYS4uMDQwMWVmMmRlNzUzYTRiNzIwZDUwYzgzYzlmZjI4MjllZWFhZTMzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViSW5zcGVjdG9yUHJl ZmVyZW5jZU9ic2VydmVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl Ykluc3BlY3RvclByZWZlcmVuY2VPYnNlcnZlci5tbQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0qIENv cHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisqIENvcHly aWdodCAoQykgMjAyMC0yMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICoKICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjYsOCArMjYsOCBAQAogI2ltcG9ydCAiY29uZmln LmgiCiAjaW1wb3J0ICJXZWJJbnNwZWN0b3JQcmVmZXJlbmNlT2JzZXJ2ZXIuaCIKIAorI2ltcG9y dCAiV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzUG9vbC5oIgot CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIEBpbnRlcmZhY2UgV0tXZWJJbnNwZWN0b3JQ cmVmZXJlbmNlT2JzZXJ2ZXIgKCkKQEAgLTUwLDkgKzUwLDEwIEBAIC0gKGluc3RhbmNldHlwZSlp bml0CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJldHVybiBuaWw7 CiAKLSAgICBtX3VzZXJEZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJEZWZhdWx0cyBhbGxvY10g aW5pdFdpdGhTdWl0ZU5hbWU6QCJjb20uYXBwbGUuU2FmYXJpLlNhbmRib3hCcm9rZXIiXSk7Cisg ICAgU3RyaW5nIHNhbmRib3hCcm9rZXJCdW5kbGVJZGVudGlmaWVyID0gV2ViS2l0OjpidW5kbGVJ ZGVudGlmaWVyRm9yU2FuZGJveEJyb2tlcigpOworICAgIG1fdXNlckRlZmF1bHRzID0gYWRvcHRO UyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRlTmFtZTpzYW5kYm94QnJva2Vy QnVuZGxlSWRlbnRpZmllcl0pOwogICAgIGlmICghbV91c2VyRGVmYXVsdHMpIHsKLSAgICAgICAg V1RGTG9nQWx3YXlzKCJDb3VsZCBub3QgaW5pdCB1c2VyIGRlZmF1bHRzIGluc3RhbmNlIGZvciBk b21haW4gY29tLmFwcGxlLlNhZmFyaS5TYW5kYm94QnJva2VyLiIpOworICAgICAgICBXVEZMb2dB bHdheXMoIkNvdWxkIG5vdCBpbml0IHVzZXIgZGVmYXVsdHMgaW5zdGFuY2UgZm9yIGRvbWFpbiAl cy4iLCBzYW5kYm94QnJva2VyQnVuZGxlSWRlbnRpZmllci51dGY4KCkuZGF0YSgpKTsKICAgICAg ICAgcmV0dXJuIHNlbGY7CiAgICAgfQogICAgIFttX3VzZXJEZWZhdWx0cy5nZXQoKSBhZGRPYnNl cnZlcjpzZWxmIGZvcktleVBhdGg6QCJTaG93RGV2ZWxvcE1lbnUiIG9wdGlvbnM6TlNLZXlWYWx1 ZU9ic2VydmluZ09wdGlvbk5ldyBjb250ZXh0Om5pbF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUHJveHlDb2NvYS5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQcm94eUNvY29hLm1tCmluZGV4IDc5MmYwNzlh NmRmNTVmZGUxZjkzZGExNDg0NzQzZTQ4NTc1OWUyODEuLjgxYTMzN2E2MmQ3YTcxYjk5NDdmZDUx OTg0N2E2MWIzYTg4OThmNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlByb2Nlc3NQcm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dlYlByb2Nlc3NQcm94eUNvY29hLm1tCkBAIC01Myw2ICs1Myw3IEBACiAjZW5kaWYK IAogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQorI2ltcG9ydCAiV2ViSW5zcGVjdG9yVXRp bGl0aWVzLmgiCiAjaW1wb3J0IDxKYXZhU2NyaXB0Q29yZS9SZW1vdGVJbnNwZWN0b3JDb25zdGFu dHMuaD4KICNlbmRpZgogCkBAIC0yMDcsMTAgKzIwOCw3IEBAIGJvb2wgV2ViUHJvY2Vzc1Byb3h5 OjpzaG91bGRFbmFibGVSZW1vdGVJbnNwZWN0b3IoKQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgcmV0dXJuIENGUHJlZmVyZW5jZXNHZXRBcHBJbnRlZ2VyVmFsdWUoV0lSUmVtb3RlSW5z cGVjdG9yRW5hYmxlZEtleSwgV0lSUmVtb3RlSW5zcGVjdG9yRG9tYWluTmFtZSwgbnVsbHB0cik7 CiAjZWxzZQotICAgIGF1dG8gc2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZpZXIgPSBDRlNUUigi Y29tLmFwcGxlLlNhZmFyaS5TYW5kYm94QnJva2VyIik7Ci0gICAgaWYgKFdlYkNvcmU6OmFwcGxp Y2F0aW9uQnVuZGxlSWRlbnRpZmllcigpID09ICJjb20uYXBwbGUuU2FmYXJpVGVjaG5vbG9neVBy ZXZpZXciX3MpCi0gICAgICAgIHNhbmRib3hCcm9rZXJCdW5kbGVJZGVudGlmaWVyID0gQ0ZTVFIo ImNvbS5hcHBsZS5TYWZhcmlUZWNobm9sb2d5UHJldmlldy5TYW5kYm94QnJva2VyIik7Ci0gICAg cmV0dXJuIENGUHJlZmVyZW5jZXNHZXRBcHBJbnRlZ2VyVmFsdWUoQ0ZTVFIoIlNob3dEZXZlbG9w TWVudSIpLCBzYW5kYm94QnJva2VyQnVuZGxlSWRlbnRpZmllciwgbnVsbHB0cik7CisgICAgcmV0 dXJuIENGUHJlZmVyZW5jZXNHZXRBcHBJbnRlZ2VyVmFsdWUoQ0ZTVFIoIlNob3dEZXZlbG9wTWVu dSIpLCBidW5kbGVJZGVudGlmaWVyRm9yU2FuZGJveEJyb2tlcigpLmNyZWF0ZUNGU3RyaW5nKCku Z2V0KCksIG51bGxwdHIpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGllcy5jcHAKaW5kZXgg Zjg5MGNiNzJmOWNlMjc2OTNlOTM4MWNjYzgzMmVkZjBmYTBmY2VjNC4uZmRiZWJhMDZhNTNmMzEy Zjc2ZDk5YzkxNGMzMTg0Mjc1MmRiYjQ0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGllcy5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGllcy5jcHAKQEAgLTMx LDYgKzMxLDcgQEAKICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKICNpbmNsdWRlICJXZWJQcm9j ZXNzUG9vbC5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgorI2luY2x1ZGUgPFdlYkNv cmUvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4K ICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvV2Vha0hhc2hT ZXQuaD4KQEAgLTExMiw0ICsxMTMsMTYgQEAgYm9vbCBpc0luc3BlY3RvclBhZ2UoV2ViUGFnZVBy b3h5JiB3ZWJQYWdlKQogICAgIHJldHVybiBwYWdlTGV2ZWxNYXAoKS5jb250YWlucygmd2ViUGFn ZSk7CiB9CiAKKyNpZiBQTEFURk9STShDT0NPQSkKK1N0cmluZyBidW5kbGVJZGVudGlmaWVyRm9y U2FuZGJveEJyb2tlcigpCit7CisgICAgYXV0byBzYW5kYm94QnJva2VyQnVuZGxlSWRlbnRpZmll ciA9ICJjb20uYXBwbGUuU2FmYXJpLlNhbmRib3hCcm9rZXIiX3M7CisgICAgaWYgKFdlYkNvcmU6 OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcigpID09ICJjb20uYXBwbGUuU2FmYXJpVGVjaG5v bG9neVByZXZpZXciX3MpCisgICAgICAgIHNhbmRib3hCcm9rZXJCdW5kbGVJZGVudGlmaWVyID0g ImNvbS5hcHBsZS5TYWZhcmlUZWNobm9sb2d5UHJldmlldy5TYW5kYm94QnJva2VyIl9zOworICAg IGVsc2UgaWYgKFdlYkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcigpID09ICJjb20u YXBwbGUuU2FmYXJpLmF1dG9tYXRpb24iX3MpCisgICAgICAgIHNhbmRib3hCcm9rZXJCdW5kbGVJ ZGVudGlmaWVyID0gImNvbS5hcHBsZS5TYWZhcmkuYXV0b21hdGlvbi5TYW5kYm94QnJva2VyIl9z OworICAgIHJldHVybiBzYW5kYm94QnJva2VyQnVuZGxlSWRlbnRpZmllcjsKK30KKyNlbmRpZiAv LyBQTEFURk9STShDT0NPQSkKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0aWVz LmgKaW5kZXggMzEyMTE5MzI4NWExYjUzZDE2NTQxYWFmZjVhOWVlNTBjNDZmN2JlMi4uMTEwZjY1 YjU3YTcxZDkyMTNiM2NhYzhjOWU1ZDY0YzcyNGUwYjQ2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGllcy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVdGlsaXRpZXMuaApA QCAtNDQsNCArNDQsOCBAQCBXZWJQcm9jZXNzUG9vbCYgZGVmYXVsdEluc3BlY3RvclByb2Nlc3NQ b29sKHVuc2lnbmVkIGluc3BlY3Rpb25MZXZlbCk7CiBib29sIGlzSW5zcGVjdG9yUHJvY2Vzc1Bv b2woV2ViUHJvY2Vzc1Bvb2wmKTsKIGJvb2wgaXNJbnNwZWN0b3JQYWdlKFdlYlBhZ2VQcm94eSYp OwogCisjaWYgUExBVEZPUk0oQ09DT0EpCitTdHJpbmcgYnVuZGxlSWRlbnRpZmllckZvclNhbmRi b3hCcm9rZXIoKTsKKyNlbmRpZgorCiB9Cg== 444296 2021-11-15 12:39:09 -0800 2021-11-30 10:43:59 -0800 Patch v1.2 bug-233015-20211115123909.patch text/plain 5908 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZmZjA4Mzg0MDA0ZDY1YmQ4 NTRjYWVkNWRkMWQwNzAzN2M0ZjdhZTcuLjdiMDkzZThiMGMxZmM2NWNhMzAxOTk1MjBjYjFkZThj ZTE4NGZkM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTEtMTUgIEJKIEJ1cmcg IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBXZWIgSW5zcGVjdG9yOiBmaXgg YnVuZGxlIGlkZW50aWZpZXIgbG9va3VwIGZvciBlbmFibGluZyByZW1vdGUgaW5zcGVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDE1Cisg ICAgICAgIDxyZGFyOi8vODUyNzcxMTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxp dGllcy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0 aWVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6YnVuZGxlSWRlbnRpZmllckZvclNhbmRib3hCcm9r ZXIpOgorICAgICAgICBUbyBhdm9pZCByZXBlYXRpbmcgdGhlIGxvZ2ljLCBleHRyYWN0IHRoaXMg Y29kZSB0byBhIGhlbHBlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJJbnNwZWN0 b3JQcmVmZXJlbmNlT2JzZXJ2ZXIubW06CisgICAgICAgICgtW1dLV2ViSW5zcGVjdG9yUHJlZmVy ZW5jZU9ic2VydmVyIGluaXRdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz c1Byb3h5Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6c2hvdWxk RW5hYmxlUmVtb3RlSW5zcGVjdG9yKToKKyAgICAgICAgVXNlIHRoZSBoZWxwZXIgbWV0aG9kLgor CiAyMDIxLTExLTE1ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgog CiAgICAgICAgIE1ha2UgdmFsZ3JpbmQgd29yayBwcm9wZXJseSB3aXRob3V0IGV4dHJhIGVudmly b25tZW50IHZhcmlhYmxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViSW5zcGVjdG9yUHJlZmVyZW5jZU9ic2VydmVyLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV2ViSW5zcGVjdG9yUHJlZmVyZW5jZU9ic2VydmVyLm1tCmluZGV4IDkyMDVj MTYxNzk0M2NhNWEwNmUwYThkMzU1OWU3NTA4MzZkY2ZmYmEuLjA0MDFlZjJkZTc1M2E0YjcyMGQ1 MGM4M2M5ZmYyODI5ZWVhYWUzMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dlYkluc3BlY3RvclByZWZlcmVuY2VPYnNlcnZlci5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJJbnNwZWN0b3JQcmVmZXJlbmNlT2JzZXJ2ZXIubW0KQEAg LTEsNSArMSw1IEBACiAvKgotKiBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorKiBDb3B5cmlnaHQgKEMpIDIwMjAtMjAyMSBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAqCiAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDggKzI2 LDggQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViSW5zcGVjdG9yUHJlZmVyZW5j ZU9ic2VydmVyLmgiCiAKKyNpbXBvcnQgIldlYkluc3BlY3RvclV0aWxpdGllcy5oIgogI2ltcG9y dCAiV2ViUHJvY2Vzc1Bvb2wuaCIKLQogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCiBAaW50 ZXJmYWNlIFdLV2ViSW5zcGVjdG9yUHJlZmVyZW5jZU9ic2VydmVyICgpCkBAIC01MCw5ICs1MCwx MCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdAogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0p KQogICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgbV91c2VyRGVmYXVsdHMgPSBhZG9wdE5TKFtb TlNVc2VyRGVmYXVsdHMgYWxsb2NdIGluaXRXaXRoU3VpdGVOYW1lOkAiY29tLmFwcGxlLlNhZmFy aS5TYW5kYm94QnJva2VyIl0pOworICAgIFN0cmluZyBzYW5kYm94QnJva2VyQnVuZGxlSWRlbnRp ZmllciA9IFdlYktpdDo6YnVuZGxlSWRlbnRpZmllckZvclNhbmRib3hCcm9rZXIoKTsKKyAgICBt X3VzZXJEZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5pdFdpdGhT dWl0ZU5hbWU6c2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZpZXJdKTsKICAgICBpZiAoIW1fdXNl ckRlZmF1bHRzKSB7Ci0gICAgICAgIFdURkxvZ0Fsd2F5cygiQ291bGQgbm90IGluaXQgdXNlciBk ZWZhdWx0cyBpbnN0YW5jZSBmb3IgZG9tYWluIGNvbS5hcHBsZS5TYWZhcmkuU2FuZGJveEJyb2tl ci4iKTsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJDb3VsZCBub3QgaW5pdCB1c2VyIGRlZmF1bHRz IGluc3RhbmNlIGZvciBkb21haW4gJXMuIiwgc2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZpZXIu dXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBzZWxmOwogICAgIH0KICAgICBbbV91c2Vy RGVmYXVsdHMuZ2V0KCkgYWRkT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAiU2hvd0RldmVsb3BN ZW51IiBvcHRpb25zOk5TS2V5VmFsdWVPYnNlcnZpbmdPcHRpb25OZXcgY29udGV4dDpuaWxdOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Byb3h5 Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUHJveHlD b2NvYS5tbQppbmRleCA3OTJmMDc5YTZkZjU1ZmRlMWY5M2RhMTQ4NDc0M2U0ODU3NTllMjgxLi44 MDJmZmFhNmQ2ZWRiZWEyZTk3Mjc3NGUyNjk2NWIyZGJiMmE3MzVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUHJveHlDb2NvYS5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUHJveHlDb2NvYS5tbQpAQCAt NTMsNiArNTMsNyBAQAogI2VuZGlmCiAKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKKyNp bXBvcnQgIldlYkluc3BlY3RvclV0aWxpdGllcy5oIgogI2ltcG9ydCA8SmF2YVNjcmlwdENvcmUv UmVtb3RlSW5zcGVjdG9yQ29uc3RhbnRzLmg+CiAjZW5kaWYKIApAQCAtMjA3LDEwICsyMDgsNyBA QCBib29sIFdlYlByb2Nlc3NQcm94eTo6c2hvdWxkRW5hYmxlUmVtb3RlSW5zcGVjdG9yKCkKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIHJldHVybiBDRlByZWZlcmVuY2VzR2V0QXBwSW50 ZWdlclZhbHVlKFdJUlJlbW90ZUluc3BlY3RvckVuYWJsZWRLZXksIFdJUlJlbW90ZUluc3BlY3Rv ckRvbWFpbk5hbWUsIG51bGxwdHIpOwogI2Vsc2UKLSAgICBhdXRvIHNhbmRib3hCcm9rZXJCdW5k bGVJZGVudGlmaWVyID0gQ0ZTVFIoImNvbS5hcHBsZS5TYWZhcmkuU2FuZGJveEJyb2tlciIpOwot ICAgIGlmIChXZWJDb3JlOjphcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKSA9PSAiY29tLmFw cGxlLlNhZmFyaVRlY2hub2xvZ3lQcmV2aWV3Il9zKQotICAgICAgICBzYW5kYm94QnJva2VyQnVu ZGxlSWRlbnRpZmllciA9IENGU1RSKCJjb20uYXBwbGUuU2FmYXJpVGVjaG5vbG9neVByZXZpZXcu U2FuZGJveEJyb2tlciIpOwotICAgIHJldHVybiBDRlByZWZlcmVuY2VzR2V0QXBwSW50ZWdlclZh bHVlKENGU1RSKCJTaG93RGV2ZWxvcE1lbnUiKSwgc2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZp ZXIsIG51bGxwdHIpOworICAgIHJldHVybiBDRlByZWZlcmVuY2VzR2V0QXBwSW50ZWdlclZhbHVl KENGU1RSKCJTaG93RGV2ZWxvcE1lbnUiKSwgYnVuZGxlSWRlbnRpZmllckZvclNhbmRib3hCcm9r ZXIoKSwgbnVsbHB0cik7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmNwcAppbmRleCBm ODkwY2I3MmY5Y2UyNzY5M2U5MzgxY2NjODMyZWRmMGZhMGZjZWM0Li45NmUwNWZlYjAwZTc0YjRi Njk3ZGMxYmQwNmMzMDcwM2Q4Mjc1NjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmNwcApAQCAtMzEs NiArMzEsNyBAQAogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIldlYlByb2Nl c3NQb29sLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29y ZS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgog I2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9XZWFrSGFzaFNl dC5oPgpAQCAtMTEyLDQgKzExMywxNiBAQCBib29sIGlzSW5zcGVjdG9yUGFnZShXZWJQYWdlUHJv eHkmIHdlYlBhZ2UpCiAgICAgcmV0dXJuIHBhZ2VMZXZlbE1hcCgpLmNvbnRhaW5zKCZ3ZWJQYWdl KTsKIH0KIAorI2lmIFBMQVRGT1JNKENPQ09BKQorQ0ZTdHJpbmdSZWYgYnVuZGxlSWRlbnRpZmll ckZvclNhbmRib3hCcm9rZXIoKQoreworICAgIGlmIChXZWJDb3JlOjphcHBsaWNhdGlvbkJ1bmRs ZUlkZW50aWZpZXIoKSA9PSAiY29tLmFwcGxlLlNhZmFyaVRlY2hub2xvZ3lQcmV2aWV3Il9zKQor ICAgICAgICByZXR1cm4gQ0ZTVFIoImNvbS5hcHBsZS5TYWZhcmlUZWNobm9sb2d5UHJldmlldy5T YW5kYm94QnJva2VyIik7CisgICAgaWYgKFdlYkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRp ZmllcigpID09ICJjb20uYXBwbGUuU2FmYXJpLmF1dG9tYXRpb24iX3MpCisgICAgICAgIHJldHVy biBDRlNUUigiY29tLmFwcGxlLlNhZmFyaS5hdXRvbWF0aW9uLlNhbmRib3hCcm9rZXIiKTsKKwor ICAgIHJldHVybiBDRlNUUigiY29tLmFwcGxlLlNhZmFyaS5TYW5kYm94QnJva2VyIik7Cit9Cisj ZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpCisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxp dGllcy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0 aWxpdGllcy5oCmluZGV4IDMxMjExOTMyODVhMWI1M2QxNjU0MWFhZmY1YTllZTUwYzQ2ZjdiZTIu LmI4Zjk5ZmQzODkzYWNkYmZiOTZmOWJkMWVjMTIyMzUwYzU0MDc3OWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVdGlsaXRpZXMuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0 aWVzLmgKQEAgLTQ0LDQgKzQ0LDggQEAgV2ViUHJvY2Vzc1Bvb2wmIGRlZmF1bHRJbnNwZWN0b3JQ cm9jZXNzUG9vbCh1bnNpZ25lZCBpbnNwZWN0aW9uTGV2ZWwpOwogYm9vbCBpc0luc3BlY3RvclBy b2Nlc3NQb29sKFdlYlByb2Nlc3NQb29sJik7CiBib29sIGlzSW5zcGVjdG9yUGFnZShXZWJQYWdl UHJveHkmKTsKIAorI2lmIFBMQVRGT1JNKENPQ09BKQorQ0ZTdHJpbmdSZWYgYnVuZGxlSWRlbnRp ZmllckZvclNhbmRib3hCcm9rZXIoKTsKKyNlbmRpZgorCiB9Cg== 445440 2021-11-30 10:44:01 -0800 2021-11-30 12:10:41 -0800 Patch for Landing bug-233015-20211130104400.patch text/plain 5933 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdhNjk5MzY0NTIyNGU1MTky MmUyNmI4OTJlNTIzZTQ2M2ZiOTFiNWQuLmI5OWZhY2JkZGJhMTk2OWE5M2U4ZTViYTM0MWUxNWVl ZDE1MzZmYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTEtMzAgIEJKIEJ1cmcg IDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBXZWIgSW5zcGVjdG9yOiBmaXgg YnVuZGxlIGlkZW50aWZpZXIgbG9va3VwIGZvciBlbmFibGluZyByZW1vdGUgaW5zcGVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDE1Cisg ICAgICAgIDxyZGFyOi8vODUyNzcxMTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs ZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGll cy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVXRpbGl0aWVz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6YnVuZGxlSWRlbnRpZmllckZvclNhbmRib3hCcm9rZXIp OgorICAgICAgICBUbyBhdm9pZCByZXBlYXRpbmcgdGhlIGxvZ2ljLCBleHRyYWN0IHRoaXMgY29k ZSB0byBhIGhlbHBlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJJbnNwZWN0b3JQ cmVmZXJlbmNlT2JzZXJ2ZXIubW06CisgICAgICAgICgtW1dLV2ViSW5zcGVjdG9yUHJlZmVyZW5j ZU9ic2VydmVyIGluaXRdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1By b3h5Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6c2hvdWxkRW5h YmxlUmVtb3RlSW5zcGVjdG9yKToKKyAgICAgICAgVXNlIHRoZSBoZWxwZXIgbWV0aG9kLgorCiAy MDIxLTExLTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBN aWdyYXRlIHNvbWUgV2ViU1dDbGllbnRDb25uZWN0aW9uIG1lc3NhZ2VzIHRvIGFzeW5jIHJlcGxp ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYkluc3BlY3Rv clByZWZlcmVuY2VPYnNlcnZlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl Ykluc3BlY3RvclByZWZlcmVuY2VPYnNlcnZlci5tbQppbmRleCA5MjA1YzE2MTc5NDNjYTVhMDZl MGE4ZDM1NTllNzUwODM2ZGNmZmJhLi4wMDYyMzM1ZGQ1NTE1MGMwZDUyNmRjMTM1MjFmMDQ0NTc0 MThlMDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJJbnNw ZWN0b3JQcmVmZXJlbmNlT2JzZXJ2ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvV2ViSW5zcGVjdG9yUHJlZmVyZW5jZU9ic2VydmVyLm1tCkBAIC0xLDUgKzEsNSBAQAog LyoKLSogQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyogQ29weXJpZ2h0IChDKSAyMDIwLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogKgogKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNiw5ICsyNiwxMCBAQAogI2ltcG9y dCAiY29uZmlnLmgiCiAjaW1wb3J0ICJXZWJJbnNwZWN0b3JQcmVmZXJlbmNlT2JzZXJ2ZXIuaCIK IAorI2ltcG9ydCAiV2ViSW5zcGVjdG9yVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNz UG9vbC5oIgotCiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CisjaW1wb3J0IDx3dGYvY29jb2Ev VHlwZUNhc3RzQ29jb2EuaD4KIAogQGludGVyZmFjZSBXS1dlYkluc3BlY3RvclByZWZlcmVuY2VP YnNlcnZlciAoKQogewpAQCAtNTAsOSArNTEsMTAgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXQKICAg ICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAotICAg IG1fdXNlckRlZmF1bHRzID0gYWRvcHROUyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0 aFN1aXRlTmFtZTpAImNvbS5hcHBsZS5TYWZhcmkuU2FuZGJveEJyb2tlciJdKTsKKyAgICBhdXRv IHNhbmRib3hCcm9rZXJCdW5kbGVJZGVudGlmaWVyID0gV2ViS2l0OjpidW5kbGVJZGVudGlmaWVy Rm9yU2FuZGJveEJyb2tlcigpOworICAgIG1fdXNlckRlZmF1bHRzID0gYWRvcHROUyhbW05TVXNl ckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRlTmFtZTpicmlkZ2VfY2FzdChzYW5kYm94QnJv a2VyQnVuZGxlSWRlbnRpZmllcildKTsKICAgICBpZiAoIW1fdXNlckRlZmF1bHRzKSB7Ci0gICAg ICAgIFdURkxvZ0Fsd2F5cygiQ291bGQgbm90IGluaXQgdXNlciBkZWZhdWx0cyBpbnN0YW5jZSBm b3IgZG9tYWluIGNvbS5hcHBsZS5TYWZhcmkuU2FuZGJveEJyb2tlci4iKTsKKyAgICAgICAgV1RG TG9nQWx3YXlzKCJDb3VsZCBub3QgaW5pdCB1c2VyIGRlZmF1bHRzIGluc3RhbmNlIGZvciBkb21h aW4gJXMuIiwgc2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZpZXIpOwogICAgICAgICByZXR1cm4g c2VsZjsKICAgICB9CiAgICAgW21fdXNlckRlZmF1bHRzLmdldCgpIGFkZE9ic2VydmVyOnNlbGYg Zm9yS2V5UGF0aDpAIlNob3dEZXZlbG9wTWVudSIgb3B0aW9uczpOU0tleVZhbHVlT2JzZXJ2aW5n T3B0aW9uTmV3IGNvbnRleHQ6bmlsXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1dlYlByb2Nlc3NQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvV2ViUHJvY2Vzc1Byb3h5Q29jb2EubW0KaW5kZXggYjhkZjE5NWI5NzdmNDU1MzBj NGVmZTlhNWQzNzQ5M2FlMWMzZTMyNC4uZjE2ZWFiYmYzNjBhOTZiNjMyYzgxZjEwN2FjZmY4YzRm NWM1YTNkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJv Y2Vzc1Byb3h5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi UHJvY2Vzc1Byb3h5Q29jb2EubW0KQEAgLTUyLDYgKzUyLDcgQEAKICNlbmRpZgogCiAjaWYgRU5B QkxFKFJFTU9URV9JTlNQRUNUT1IpCisjaW1wb3J0ICJXZWJJbnNwZWN0b3JVdGlsaXRpZXMuaCIK ICNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5oPgogI2Vu ZGlmCiAKQEAgLTIwNCwxMCArMjA1LDcgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OnNob3VsZEVu YWJsZVJlbW90ZUluc3BlY3RvcigpCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICByZXR1 cm4gQ0ZQcmVmZXJlbmNlc0dldEFwcEludGVnZXJWYWx1ZShXSVJSZW1vdGVJbnNwZWN0b3JFbmFi bGVkS2V5LCBXSVJSZW1vdGVJbnNwZWN0b3JEb21haW5OYW1lLCBudWxscHRyKTsKICNlbHNlCi0g ICAgYXV0byBzYW5kYm94QnJva2VyQnVuZGxlSWRlbnRpZmllciA9IENGU1RSKCJjb20uYXBwbGUu U2FmYXJpLlNhbmRib3hCcm9rZXIiKTsKLSAgICBpZiAoV2ViQ29yZTo6YXBwbGljYXRpb25CdW5k bGVJZGVudGlmaWVyKCkgPT0gImNvbS5hcHBsZS5TYWZhcmlUZWNobm9sb2d5UHJldmlldyJfcykK LSAgICAgICAgc2FuZGJveEJyb2tlckJ1bmRsZUlkZW50aWZpZXIgPSBDRlNUUigiY29tLmFwcGxl LlNhZmFyaVRlY2hub2xvZ3lQcmV2aWV3LlNhbmRib3hCcm9rZXIiKTsKLSAgICByZXR1cm4gQ0ZQ cmVmZXJlbmNlc0dldEFwcEludGVnZXJWYWx1ZShDRlNUUigiU2hvd0RldmVsb3BNZW51IiksIHNh bmRib3hCcm9rZXJCdW5kbGVJZGVudGlmaWVyLCBudWxscHRyKTsKKyAgICByZXR1cm4gQ0ZQcmVm ZXJlbmNlc0dldEFwcEludGVnZXJWYWx1ZShDRlNUUigiU2hvd0RldmVsb3BNZW51IiksIGJ1bmRs ZUlkZW50aWZpZXJGb3JTYW5kYm94QnJva2VyKCksIG51bGxwdHIpOwogI2VuZGlmCiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JV dGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3Bl Y3RvclV0aWxpdGllcy5jcHAKaW5kZXggZjg5MGNiNzJmOWNlMjc2OTNlOTM4MWNjYzgzMmVkZjBm YTBmY2VjNC4uOTZlMDVmZWIwMGU3NGI0YjY5N2RjMWJkMDZjMzA3MDNkODI3NTY4YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclV0aWxp dGllcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3Bl Y3RvclV0aWxpdGllcy5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJXZWJQYWdlUHJv eHkuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQ cm94eS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg+CiAj aW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4K ICNpbmNsdWRlIDx3dGYvV2Vha0hhc2hTZXQuaD4KQEAgLTExMiw0ICsxMTMsMTYgQEAgYm9vbCBp c0luc3BlY3RvclBhZ2UoV2ViUGFnZVByb3h5JiB3ZWJQYWdlKQogICAgIHJldHVybiBwYWdlTGV2 ZWxNYXAoKS5jb250YWlucygmd2ViUGFnZSk7CiB9CiAKKyNpZiBQTEFURk9STShDT0NPQSkKK0NG U3RyaW5nUmVmIGJ1bmRsZUlkZW50aWZpZXJGb3JTYW5kYm94QnJva2VyKCkKK3sKKyAgICBpZiAo V2ViQ29yZTo6YXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKCkgPT0gImNvbS5hcHBsZS5TYWZh cmlUZWNobm9sb2d5UHJldmlldyJfcykKKyAgICAgICAgcmV0dXJuIENGU1RSKCJjb20uYXBwbGUu U2FmYXJpVGVjaG5vbG9neVByZXZpZXcuU2FuZGJveEJyb2tlciIpOworICAgIGlmIChXZWJDb3Jl OjphcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKSA9PSAiY29tLmFwcGxlLlNhZmFyaS5hdXRv bWF0aW9uIl9zKQorICAgICAgICByZXR1cm4gQ0ZTVFIoImNvbS5hcHBsZS5TYWZhcmkuYXV0b21h dGlvbi5TYW5kYm94QnJva2VyIik7CisKKyAgICByZXR1cm4gQ0ZTVFIoImNvbS5hcHBsZS5TYWZh cmkuU2FuZGJveEJyb2tlciIpOworfQorI2VuZGlmIC8vIFBMQVRGT1JNKENPQ09BKQorCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0lu c3BlY3Rvci9XZWJJbnNwZWN0b3JVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVdGlsaXRpZXMuaAppbmRleCAzMTIxMTkzMjg1YTFiNTNk MTY1NDFhYWZmNWE5ZWU1MGM0NmY3YmUyLi5iOGY5OWZkMzg5M2FjZGJmYjk2ZjliZDFlYzEyMjM1 MGM1NDA3NzljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3Iv V2ViSW5zcGVjdG9yVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5z cGVjdG9yL1dlYkluc3BlY3RvclV0aWxpdGllcy5oCkBAIC00NCw0ICs0NCw4IEBAIFdlYlByb2Nl c3NQb29sJiBkZWZhdWx0SW5zcGVjdG9yUHJvY2Vzc1Bvb2wodW5zaWduZWQgaW5zcGVjdGlvbkxl dmVsKTsKIGJvb2wgaXNJbnNwZWN0b3JQcm9jZXNzUG9vbChXZWJQcm9jZXNzUG9vbCYpOwogYm9v bCBpc0luc3BlY3RvclBhZ2UoV2ViUGFnZVByb3h5Jik7CiAKKyNpZiBQTEFURk9STShDT0NPQSkK K0NGU3RyaW5nUmVmIGJ1bmRsZUlkZW50aWZpZXJGb3JTYW5kYm94QnJva2VyKCk7CisjZW5kaWYK KwogfQo=