226204 2021-05-24 18:13:26 -0700 AX: Fix build failure for WK API WTF::String usage 2021-05-24 19:33:24 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach darin thorton webkit-bug-importer oldest_to_newest 1763367 0 cfleizach 2021-05-24 18:13:26 -0700 Build failure from https://bugs.webkit.org/show_bug.cgi?id=225909#c13 1763368 1 webkit-bug-importer 2021-05-24 18:13:43 -0700 <rdar://problem/78428840> 1763369 2 429605 cfleizach 2021-05-24 18:15:38 -0700 Created attachment 429605 patch 1763371 3 429605 thorton 2021-05-24 18:42:03 -0700 Comment on attachment 429605 patch I think the caller of WKAccessibilityTestingInjectPreference in WKTR likely needs to change too 1763374 4 429607 cfleizach 2021-05-24 18:48:37 -0700 Created attachment 429607 patch 1763377 5 429607 thorton 2021-05-24 18:56:19 -0700 Comment on attachment 429607 patch View in context: https://bugs.webkit.org/attachment.cgi?id=429607&action=review > Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:105 > + WKAccessibilityTestingInjectPreference(page, toWKString(context, JSValueMakeString(context, domain)).get(), toWKString(context, JSValueMakeString(context, key)).get(), toWK((String)encodedString).get()); Probably could be WKStringCreateWithJSString 1763379 6 429607 darin 2021-05-24 19:04:37 -0700 Comment on attachment 429607 patch View in context: https://bugs.webkit.org/attachment.cgi?id=429607&action=review >> Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:105 >> + WKAccessibilityTestingInjectPreference(page, toWKString(context, JSValueMakeString(context, domain)).get(), toWKString(context, JSValueMakeString(context, key)).get(), toWK((String)encodedString).get()); > > Probably could be WKStringCreateWithJSString instead of: toWKString(context, JSValueMakeString(context, domain)).get() write: toWK(domain).get() As long as you include the header StringFunctions.h. Also should come up with a better way to convert an NSString to a WKString that does not involve converting to (String). 1763380 7 darin 2021-05-24 19:08:41 -0700 Instead of: toWK((String)encodedString).get() Should use: toWK(encodedString.createJSStringRef.get()) As long as we include the header AccessibilityCommonMac.h and StringFunctions.h 1763383 8 darin 2021-05-24 19:10:38 -0700 Or could add createWKStringRef to the NSString category. 1763384 9 darin 2021-05-24 19:11:01 -0700 Could name that toWK and overload it for NSString. 1763391 10 ews-feeder 2021-05-24 19:33:23 -0700 Committed r277987 (238100@main): <https://commits.webkit.org/238100@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429607. 429605 2021-05-24 18:15:38 -0700 2021-05-24 18:48:37 -0700 patch file_226204.txt text/plain 2921 cfleizach ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cNCmluZGV4IDIxOWI1YjQ5MDcwOS4uNTM1OGExMjc5Yjc5IDEwMDY0NA0KLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cNCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nDQpAQCAt MSwzICsxLDE2IEBADQorMjAyMS0wNS0yNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBw bGUuY29tPg0KKw0KKyAgICAgICAgQVg6IEZpeCBidWlsZCBmYWlsdXJlIGZvciBXSyBBUEkgV1RG OjpTdHJpbmcgdXNhZ2UNCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjYyMDQNCisNCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLg0K Kw0KKyAgICAgICAgQnVpbGQgZml4IGZvciBXVEYgc3RyaW5nIHVzYWdlLg0KKw0KKyAgICAgICAg KiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHA6DQorICAg ICAgICAoV0tBY2Nlc3NpYmlsaXR5VGVzdGluZ0luamVjdFByZWZlcmVuY2UpOg0KKyAgICAgICAg KiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaDoN CisNCiAyMDIxLTA1LTI0ICBEYW5hIEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4NCiANCiAgICAg ICAgIFJlbW92ZSBkZXByZWNhdGVkIEFQSSB1c2FnZSBpbiBQYWdlQ2xpZW50SW1wbE1hYw0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X S0J1bmRsZVBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZS5jcHANCmluZGV4IDZkMDM3ZWQxNTRhZC4uNmEwOGVlNjFjNDJm IDEwMDY0NA0KLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUGFnZS5jcHANCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwDQpAQCAtMjMxLDEzICsyMzEsMTMgQEAg dm9pZCBXS0J1bmRsZVBhZ2VJbnNlcnROZXdsaW5lSW5RdW90ZWRDb250ZW50KFdLQnVuZGxlUGFn ZVJlZiBwYWdlUmVmKQ0KICAgICBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKS0+aW5zZXJ0TmV3bGlu ZUluUXVvdGVkQ29udGVudCgpOw0KIH0NCiANCi12b2lkIFdLQWNjZXNzaWJpbGl0eVRlc3RpbmdJ bmplY3RQcmVmZXJlbmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBTdHJpbmcmIGRv bWFpbiwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IE9wdGlvbmFsPFN0cmluZz4mIGVuY29kZWRW YWx1ZSkNCit2b2lkIFdLQWNjZXNzaWJpbGl0eVRlc3RpbmdJbmplY3RQcmVmZXJlbmNlKFdLQnVu ZGxlUGFnZVJlZiBwYWdlUmVmLCBXS1N0cmluZ1JlZiBkb21haW4sIFdLU3RyaW5nUmVmIGtleSwg V0tTdHJpbmdSZWYgZW5jb2RlZFZhbHVlKQ0KIHsNCiAgICAgaWYgKCFwYWdlUmVmKQ0KICAgICAg ICAgcmV0dXJuOw0KICAgICANCiAjaWYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpDQotICAg IFdlYktpdDo6V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkubm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2Vk KGRvbWFpbiwga2V5LCBlbmNvZGVkVmFsdWUpOw0KKyAgICBXZWJLaXQ6OldlYlByb2Nlc3M6OnNp bmdsZXRvbigpLm5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlZChXZWJLaXQ6OnRvV1RGU3RyaW5nKGRv bWFpbiksIFdlYktpdDo6dG9XVEZTdHJpbmcoa2V5KSwgV2ViS2l0Ojp0b1dURlN0cmluZyhlbmNv ZGVkVmFsdWUpKTsNCiAjZW5kaWYNCiB9DQogDQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VQ cml2YXRlLmgNCmluZGV4IGM2MWY4YzI5NzkxNS4uZTgxODVmOGMyNmU3IDEwMDY0NA0KLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn ZVByaXZhdGUuaA0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaA0KQEAgLTk2LDcgKzk2LDcgQEAgV0tfRVhQT1JU IGJvb2wgV0tCdW5kbGVQYWdlQ2FuU2hvd01JTUVUeXBlKFdLQnVuZGxlUGFnZVJlZiwgV0tTdHJp bmdSZWYgbWltZVR5cGUNCiBXS19FWFBPUlQgdm9pZCogV0tBY2Nlc3NpYmlsaXR5Um9vdE9iamVj dChXS0J1bmRsZVBhZ2VSZWYpOw0KIFdLX0VYUE9SVCB2b2lkKiBXS0FjY2Vzc2liaWxpdHlGb2N1 c2VkT2JqZWN0KFdLQnVuZGxlUGFnZVJlZik7DQogV0tfRVhQT1JUIGJvb2wgV0tBY2Nlc3NpYmls aXR5Q2FuVXNlU2Vjb25kYXJ5QVhUaHJlYWQoV0tCdW5kbGVQYWdlUmVmKTsNCi1XS19FWFBPUlQg dm9pZCBXS0FjY2Vzc2liaWxpdHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5jZShXS0J1bmRsZVBhZ2VS ZWYsIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgT3B0aW9u YWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKTsNCitXS19FWFBPUlQgdm9pZCBXS0FjY2Vzc2liaWxp dHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5jZShXS0J1bmRsZVBhZ2VSZWYsIFdLU3RyaW5nUmVmIGRv bWFpbiwgV0tTdHJpbmdSZWYga2V5LCBXS1N0cmluZ1JlZiBlbmNvZGVkVmFsdWUpOw0KIA0KIFdL X0VYUE9SVCB2b2lkIFdLQWNjZXNzaWJpbGl0eUVuYWJsZUVuaGFuY2VkQWNjZXNzaWJpbGl0eShi b29sKTsNCiBXS19FWFBPUlQgYm9vbCBXS0FjY2Vzc2liaWxpdHlFbmhhbmNlZEFjY2Vzc2liaWxp dHlFbmFibGVkKCk7DQo= 429607 2021-05-24 18:48:37 -0700 2021-05-24 19:33:24 -0700 patch file_226204.txt text/plain 5084 cfleizach ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cNCmluZGV4IDIxOWI1YjQ5MDcwOS4uNTM1OGExMjc5Yjc5IDEwMDY0NA0KLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cNCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nDQpAQCAt MSwzICsxLDE2IEBADQorMjAyMS0wNS0yNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBw bGUuY29tPg0KKw0KKyAgICAgICAgQVg6IEZpeCBidWlsZCBmYWlsdXJlIGZvciBXSyBBUEkgV1RG OjpTdHJpbmcgdXNhZ2UNCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjYyMDQNCisNCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLg0K Kw0KKyAgICAgICAgQnVpbGQgZml4IGZvciBXVEYgc3RyaW5nIHVzYWdlLg0KKw0KKyAgICAgICAg KiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHA6DQorICAg ICAgICAoV0tBY2Nlc3NpYmlsaXR5VGVzdGluZ0luamVjdFByZWZlcmVuY2UpOg0KKyAgICAgICAg KiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaDoN CisNCiAyMDIxLTA1LTI0ICBEYW5hIEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4NCiANCiAgICAg ICAgIFJlbW92ZSBkZXByZWNhdGVkIEFQSSB1c2FnZSBpbiBQYWdlQ2xpZW50SW1wbE1hYw0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X S0J1bmRsZVBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZS5jcHANCmluZGV4IDZkMDM3ZWQxNTRhZC4uNmEwOGVlNjFjNDJm IDEwMDY0NA0KLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUGFnZS5jcHANCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwDQpAQCAtMjMxLDEzICsyMzEsMTMgQEAg dm9pZCBXS0J1bmRsZVBhZ2VJbnNlcnROZXdsaW5lSW5RdW90ZWRDb250ZW50KFdLQnVuZGxlUGFn ZVJlZiBwYWdlUmVmKQ0KICAgICBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKS0+aW5zZXJ0TmV3bGlu ZUluUXVvdGVkQ29udGVudCgpOw0KIH0NCiANCi12b2lkIFdLQWNjZXNzaWJpbGl0eVRlc3RpbmdJ bmplY3RQcmVmZXJlbmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBTdHJpbmcmIGRv bWFpbiwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IE9wdGlvbmFsPFN0cmluZz4mIGVuY29kZWRW YWx1ZSkNCit2b2lkIFdLQWNjZXNzaWJpbGl0eVRlc3RpbmdJbmplY3RQcmVmZXJlbmNlKFdLQnVu ZGxlUGFnZVJlZiBwYWdlUmVmLCBXS1N0cmluZ1JlZiBkb21haW4sIFdLU3RyaW5nUmVmIGtleSwg V0tTdHJpbmdSZWYgZW5jb2RlZFZhbHVlKQ0KIHsNCiAgICAgaWYgKCFwYWdlUmVmKQ0KICAgICAg ICAgcmV0dXJuOw0KICAgICANCiAjaWYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpDQotICAg IFdlYktpdDo6V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkubm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2Vk KGRvbWFpbiwga2V5LCBlbmNvZGVkVmFsdWUpOw0KKyAgICBXZWJLaXQ6OldlYlByb2Nlc3M6OnNp bmdsZXRvbigpLm5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlZChXZWJLaXQ6OnRvV1RGU3RyaW5nKGRv bWFpbiksIFdlYktpdDo6dG9XVEZTdHJpbmcoa2V5KSwgV2ViS2l0Ojp0b1dURlN0cmluZyhlbmNv ZGVkVmFsdWUpKTsNCiAjZW5kaWYNCiB9DQogDQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VQ cml2YXRlLmgNCmluZGV4IGM2MWY4YzI5NzkxNS4uZTgxODVmOGMyNmU3IDEwMDY0NA0KLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn ZVByaXZhdGUuaA0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaA0KQEAgLTk2LDcgKzk2LDcgQEAgV0tfRVhQT1JU IGJvb2wgV0tCdW5kbGVQYWdlQ2FuU2hvd01JTUVUeXBlKFdLQnVuZGxlUGFnZVJlZiwgV0tTdHJp bmdSZWYgbWltZVR5cGUNCiBXS19FWFBPUlQgdm9pZCogV0tBY2Nlc3NpYmlsaXR5Um9vdE9iamVj dChXS0J1bmRsZVBhZ2VSZWYpOw0KIFdLX0VYUE9SVCB2b2lkKiBXS0FjY2Vzc2liaWxpdHlGb2N1 c2VkT2JqZWN0KFdLQnVuZGxlUGFnZVJlZik7DQogV0tfRVhQT1JUIGJvb2wgV0tBY2Nlc3NpYmls aXR5Q2FuVXNlU2Vjb25kYXJ5QVhUaHJlYWQoV0tCdW5kbGVQYWdlUmVmKTsNCi1XS19FWFBPUlQg dm9pZCBXS0FjY2Vzc2liaWxpdHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5jZShXS0J1bmRsZVBhZ2VS ZWYsIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgT3B0aW9u YWw8U3RyaW5nPiYgZW5jb2RlZFZhbHVlKTsNCitXS19FWFBPUlQgdm9pZCBXS0FjY2Vzc2liaWxp dHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5jZShXS0J1bmRsZVBhZ2VSZWYsIFdLU3RyaW5nUmVmIGRv bWFpbiwgV0tTdHJpbmdSZWYga2V5LCBXS1N0cmluZ1JlZiBlbmNvZGVkVmFsdWUpOw0KIA0KIFdL X0VYUE9SVCB2b2lkIFdLQWNjZXNzaWJpbGl0eUVuYWJsZUVuaGFuY2VkQWNjZXNzaWJpbGl0eShi b29sKTsNCiBXS19FWFBPUlQgYm9vbCBXS0FjY2Vzc2liaWxpdHlFbmhhbmNlZEFjY2Vzc2liaWxp dHlFbmFibGVkKCk7DQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nDQppbmRleCA4ZTdkM2E1NjI3OWMuLmI3MTAzMzEwMmEzMSAxMDA2NDQNCi0tLSBhL1Rvb2xz L0NoYW5nZUxvZw0KKysrIGIvVG9vbHMvQ2hhbmdlTG9nDQpAQCAtMSwzICsxLDE0IEBADQorMjAy MS0wNS0yNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPg0KKw0KKyAgICAg ICAgQVg6IEZpeCBidWlsZCBmYWlsdXJlIGZvciBXSyBBUEkgV1RGOjpTdHJpbmcgdXNhZ2UNCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYyMDQNCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODQyODg0MD4NCisNCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLg0KKw0KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVk QnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlck1hYy5tbToNCisgICAgICAgIChXVFI6 OkFjY2Vzc2liaWxpdHlDb250cm9sbGVyOjppbmplY3RBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZSk6 DQorDQogMjAyMS0wNS0yNCAgU3RlcGhhbiBTemFibyAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+ DQogDQogICAgICAgICBbUGxheVN0YXRpb25dIFVwZGF0ZSBzY3JpcHRzIGZvciBKU0MgdGVzdCBj aGFuZ2VzDQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9tYWMvQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXJNYWMubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlck1hYy5tbQ0KaW5k ZXggOWZhODM2ZmQ3ZmUxLi4xZWQ1YTMxMjU2ODEgMTAwNjQ0DQotLS0gYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlck1hYy5t bQ0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNz aWJpbGl0eUNvbnRyb2xsZXJNYWMubW0NCkBAIC05NywxMCArOTcsMTIgQEAgc3RhdGljIGlkIGZp bmRBY2Nlc3NpYmxlT2JqZWN0QnlJZChpZCBvYmosIE5TU3RyaW5nICppZEF0dHJpYnV0ZSkNCiAN CiB2b2lkIEFjY2Vzc2liaWxpdHlDb250cm9sbGVyOjppbmplY3RBY2Nlc3NpYmlsaXR5UHJlZmVy ZW5jZShKU1N0cmluZ1JlZiBkb21haW4sIEpTU3RyaW5nUmVmIGtleSwgSlNTdHJpbmdSZWYgdmFs dWUpDQogew0KKyAgICBhdXRvIHBhZ2UgPSBJbmplY3RlZEJ1bmRsZTo6c2luZ2xldG9uKCkucGFn ZSgpLT5wYWdlKCk7DQorICAgIGF1dG8gY29udGV4dCA9IFdLQnVuZGxlRnJhbWVHZXRKYXZhU2Ny aXB0Q29udGV4dChXS0J1bmRsZVBhZ2VHZXRNYWluRnJhbWUocGFnZSkpOw0KICAgICBOU051bWJl ciAqbnVtYmVyVmFsdWUgPSBAKFtbTlNTdHJpbmcgc3RyaW5nV2l0aEpTU3RyaW5nUmVmOnZhbHVl XSBpbnRlZ2VyVmFsdWVdKTsNCiAgICAgTlNEYXRhICplbmNvZGVkRGF0YSA9IFtOU0tleWVkQXJj aGl2ZXIgYXJjaGl2ZWREYXRhV2l0aFJvb3RPYmplY3Q6bnVtYmVyVmFsdWUgcmVxdWlyaW5nU2Vj dXJlQ29kaW5nOllFUyBlcnJvcjpuaWxdOw0KICAgICBOU1N0cmluZyAqZW5jb2RlZFN0cmluZyA9 IFtlbmNvZGVkRGF0YSBiYXNlNjRFbmNvZGVkU3RyaW5nV2l0aE9wdGlvbnM6MF07DQotICAgIFdL QWNjZXNzaWJpbGl0eVRlc3RpbmdJbmplY3RQcmVmZXJlbmNlKEluamVjdGVkQnVuZGxlOjpzaW5n bGV0b24oKS5wYWdlKCktPnBhZ2UoKSwgdG9XVEZTdHJpbmcoZG9tYWluKSwgdG9XVEZTdHJpbmco a2V5KSwgKFN0cmluZyllbmNvZGVkU3RyaW5nKTsNCisgICAgV0tBY2Nlc3NpYmlsaXR5VGVzdGlu Z0luamVjdFByZWZlcmVuY2UocGFnZSwgdG9XS1N0cmluZyhjb250ZXh0LCBKU1ZhbHVlTWFrZVN0 cmluZyhjb250ZXh0LCBkb21haW4pKS5nZXQoKSwgdG9XS1N0cmluZyhjb250ZXh0LCBKU1ZhbHVl TWFrZVN0cmluZyhjb250ZXh0LCBrZXkpKS5nZXQoKSwgdG9XSygoU3RyaW5nKWVuY29kZWRTdHJp bmcpLmdldCgpKTsNCiB9DQogDQogUmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+IEFjY2Vz c2liaWxpdHlDb250cm9sbGVyOjphY2Nlc3NpYmxlRWxlbWVudEJ5SWQoSlNTdHJpbmdSZWYgaWRB dHRyaWJ1dGUpDQo=