221963 2021-02-16 07:21:54 -0800 [GTK][WPE] Reduce the use of SoupURI in unit tests in preparation for libsoup3 2021-02-16 22:12:27 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 220508 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1729667 0 cgarcia 2021-02-16 07:21:54 -0800 Now that URL is in WTF we can just use it instead. 1729668 1 420470 cgarcia 2021-02-16 07:24:52 -0800 Created attachment 420470 Patch 1730138 2 cgarcia 2021-02-16 22:12:27 -0800 Committed r272984 (234187@main): <https://commits.webkit.org/234187@main> 420470 2021-02-16 07:24:52 -0800 2021-02-16 08:36:05 -0800 Patch wk-tests-soup-uri.diff text/plain 24325 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3Njk4 Nzc5MTkzZDQuLjg3ZTU0NTQxYzRjYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTAyLTE2ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXUEVdIFJl ZHVjZSB0aGUgdXNlIG9mIFNvdXBVUkkgaW4gdW5pdCB0ZXN0cyBpbiBwcmVwYXJhdGlvbiBmb3Ig bGlic291cDMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMTk2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vdyB0aGF0IFVSTCBpcyBpbiBXVEYgd2UgY2FuIGp1c3QgdXNlIGl0IGluc3RlYWQuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdEF1dGhlbnRpY2F0aW9u LmNwcDoKKyAgICAgICAgKHRlc3RXZWJWaWV3QXV0aGVudGljYXRpb25SZXF1ZXN0KToKKyAgICAg ICAgKFByb3h5QXV0aGVudGljYXRpb25UZXN0OjpQcm94eUF1dGhlbnRpY2F0aW9uVGVzdCk6Cisg ICAgICAgIChQcm94eUF1dGhlbnRpY2F0aW9uVGVzdDo6cHJveHlTZXJ2ZXJQb3J0QXNTdHJpbmcp OgorICAgICAgICAodGVzdFdlYlZpZXdBdXRoZW50aWNhdGlvblByb3h5KToKKyAgICAgICAgKHRl c3RXZWJWaWV3QXV0aGVudGljYXRpb25Qcm94eUhUVFBTKToKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHA6CisgICAgICAgICh0ZXN0TG9hZEZhaWxl ZFdpdGhUTFNFcnJvcnMpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xp Yi9UZXN0V2ViRXh0ZW5zaW9ucy5jcHA6CisgICAgICAgICh0ZXN0V2ViRXh0ZW5zaW9uUGFnZUlE KToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdl YkNvbnRleHQuY3BwOgorICAgICAgICAoUHJveHlUZXN0OjpQcm94eVRlc3QpOgorICAgICAgICAo UHJveHlUZXN0Ojpwcm94eVNlcnZlclBvcnRBc1N0cmluZyk6CisgICAgICAgICh0ZXN0V2ViQ29u dGV4dFByb3h5U2V0dGluZ3MpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgIChzZXRJbml0aWFsTm90aWZpY2F0 aW9uUGVybWlzc2lvbnNBbGxvd2VkQ2FsbGJhY2spOgorICAgICAgICAoc2V0SW5pdGlhbE5vdGlm aWNhdGlvblBlcm1pc3Npb25zRGlzYWxsb3dlZENhbGxiYWNrKToKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcDoKKyAgICAgICAgKFdl YktpdFRlc3RTZXJ2ZXI6OnJ1bik6CisgICAgICAgIChXZWJLaXRUZXN0U2VydmVyOjphZGRXZWJT b2NrZXRIYW5kbGVyKToKKyAgICAgICAgKFdlYktpdFRlc3RTZXJ2ZXI6OnJlbW92ZVdlYlNvY2tl dEhhbmRsZXIpOgorICAgICAgICAoV2ViS2l0VGVzdFNlcnZlcjo6Z2V0V2ViU29ja2V0VVJJRm9y UGF0aCBjb25zdCk6CisgICAgICAgIChXZWJLaXRUZXN0U2VydmVyOjpnZXRVUklGb3JQYXRoIGNv bnN0KToKKyAgICAgICAgKFdlYktpdFRlc3RTZXJ2ZXI6OnBvcnQgY29uc3QpOgorICAgICAgICAq IFRlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaDoKKyAgICAg ICAgKFdlYktpdFRlc3RTZXJ2ZXI6OmJhc2VVUkwgY29uc3QpOgorICAgICAgICAoV2ViS2l0VGVz dFNlcnZlcjo6YmFzZVdlYlNvY2tldFVSTCBjb25zdCk6CisKIDIwMjEtMDItMTUgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgUENNOiBBZGQgaGlnaCBlbnRy b3B5IGF0dHJpYnV0aW9uU291cmNlTm9uY2UgYXR0cmlidXRlIHRvIGFuY2hvciB0YWdzCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdEF1dGhlbnRp Y2F0aW9uLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0 aGVudGljYXRpb24uY3BwCmluZGV4IDdlMmI4MzM5ZTBlOC4uMzgwZTAyYjcyZjUwIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdEF1dGhlbnRpY2F0 aW9uLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdEF1 dGhlbnRpY2F0aW9uLmNwcApAQCAtMTI4LDE3ICsxMjgsMTcgQEAgc3RhdGljIHZvaWQgdGVzdFdl YlZpZXdBdXRoZW50aWNhdGlvblJlcXVlc3QoQXV0aGVudGljYXRpb25UZXN0KiB0ZXN0LCBnY29u c3Rwb2kKICAgICAvLyBUZXN0IGF1dGhlbnRpY2F0aW9uIHJlcXVlc3QgZ2V0dGVycyBtYXRjaCBz b3VwIGF1dGhlbnRpY2F0aW9uIGhlYWRlci4KICAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdl dFVSSUZvclBhdGgoIi9hdXRoLXRlc3QuaHRtbCIpLmRhdGEoKSk7CiAgICAgV2ViS2l0QXV0aGVu dGljYXRpb25SZXF1ZXN0KiByZXF1ZXN0ID0gdGVzdC0+d2FpdEZvckF1dGhlbnRpY2F0aW9uUmVx dWVzdCgpOwotICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVz dF9nZXRfaG9zdChyZXF1ZXN0KSwgPT0sIHNvdXBfdXJpX2dldF9ob3N0KGtTZXJ2ZXItPmJhc2VV UkkoKSkpOwotICAgIGdfYXNzZXJ0X2NtcHVpbnQod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVl c3RfZ2V0X3BvcnQocmVxdWVzdCksID09LCBzb3VwX3VyaV9nZXRfcG9ydChrU2VydmVyLT5iYXNl VVJJKCkpKTsKKyAgICBBU1NFUlRfQ01QX0NTVFJJTkcod2Via2l0X2F1dGhlbnRpY2F0aW9uX3Jl cXVlc3RfZ2V0X2hvc3QocmVxdWVzdCksID09LCBrU2VydmVyLT5iYXNlVVJMKCkuaG9zdCgpLnRv U3RyaW5nKCkudXRmOCgpKTsKKyAgICBnX2Fzc2VydF9jbXB1aW50KHdlYmtpdF9hdXRoZW50aWNh dGlvbl9yZXF1ZXN0X2dldF9wb3J0KHJlcXVlc3QpLCA9PSwga1NlcnZlci0+cG9ydCgpKTsKICAg ICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0X3JlYWxt KHJlcXVlc3QpLCA9PSwgIm15IHJlYWxtIik7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9h dXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zY2hlbWUocmVxdWVzdCksID09LCBXRUJLSVRfQVVU SEVOVElDQVRJT05fU0NIRU1FX0hUVFBfQkFTSUMpOwogICAgIGdfYXNzZXJ0X2ZhbHNlKHdlYmtp dF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2lzX2Zvcl9wcm94eShyZXF1ZXN0KSk7CiAgICAgZ19h c3NlcnRfZmFsc2Uod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfaXNfcmV0cnkocmVxdWVz dCkpOwogICAgIGF1dG8qIG9yaWdpbiA9IHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dl dF9zZWN1cml0eV9vcmlnaW4ocmVxdWVzdCk7CiAgICAgZ19hc3NlcnRfbm9ubnVsbChvcmlnaW4p OwotICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wcm90b2Nv bChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0X3NjaGVtZShrU2VydmVyLT5iYXNlVVJJKCkpKTsK LSAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmln aW4pLCA9PSwgc291cF91cmlfZ2V0X2hvc3Qoa1NlcnZlci0+YmFzZVVSSSgpKSk7Ci0gICAgZ19h c3NlcnRfY21wdWludCh3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wb3J0KG9yaWdpbiksID09 LCBzb3VwX3VyaV9nZXRfcG9ydChrU2VydmVyLT5iYXNlVVJJKCkpKTsKKyAgICBBU1NFUlRfQ01Q X0NTVFJJTkcod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfcHJvdG9jb2wob3JpZ2luKSwgPT0s IGtTZXJ2ZXItPmJhc2VVUkwoKS5wcm90b2NvbCgpLnRvU3RyaW5nKCkudXRmOCgpKTsKKyAgICBB U1NFUlRfQ01QX0NTVFJJTkcod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmlnaW4p LCA9PSwga1NlcnZlci0+YmFzZVVSTCgpLmhvc3QoKS50b1N0cmluZygpLnV0ZjgoKSk7CisgICAg Z19hc3NlcnRfY21wdWludCh3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wb3J0KG9yaWdpbiks ID09LCBrU2VydmVyLT5wb3J0KCkpOwogICAgIHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fdW5yZWYo b3JpZ2luKTsKIH0KIApAQCAtNDM3LDEwICs0MzcsOSBAQCBwdWJsaWM6CiAgICAgUHJveHlBdXRo ZW50aWNhdGlvblRlc3QoKQogICAgIHsKICAgICAgICAgbV9wcm94eVNlcnZlci5ydW4oc2VydmVy Q2FsbGJhY2spOwotICAgICAgICBnX2Fzc2VydF9ub25udWxsKG1fcHJveHlTZXJ2ZXIuYmFzZVVS SSgpKTsKLSAgICAgICAgZ1Byb3h5U2VydmVyUG9ydCA9IHNvdXBfdXJpX2dldF9wb3J0KG1fcHJv eHlTZXJ2ZXIuYmFzZVVSSSgpKTsKLSAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBwcm94eVVSSShz b3VwX3VyaV90b19zdHJpbmcobV9wcm94eVNlcnZlci5iYXNlVVJJKCksIEZBTFNFKSk7Ci0gICAg ICAgIFdlYktpdE5ldHdvcmtQcm94eVNldHRpbmdzKiBzZXR0aW5ncyA9IHdlYmtpdF9uZXR3b3Jr X3Byb3h5X3NldHRpbmdzX25ldyhwcm94eVVSSS5nZXQoKSwgbnVsbHB0cik7CisgICAgICAgIGdf YXNzZXJ0X2ZhbHNlKG1fcHJveHlTZXJ2ZXIuYmFzZVVSTCgpLmlzTnVsbCgpKTsKKyAgICAgICAg Z1Byb3h5U2VydmVyUG9ydCA9IG1fcHJveHlTZXJ2ZXIucG9ydCgpOworICAgICAgICBXZWJLaXRO ZXR3b3JrUHJveHlTZXR0aW5ncyogc2V0dGluZ3MgPSB3ZWJraXRfbmV0d29ya19wcm94eV9zZXR0 aW5nc19uZXcobV9wcm94eVNlcnZlci5iYXNlVVJMKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwg bnVsbHB0cik7CiAgICAgICAgIGF1dG8qIHdlYnNpdGVEYXRhTWFuYWdlciA9IHdlYmtpdF93ZWJf Y29udGV4dF9nZXRfd2Vic2l0ZV9kYXRhX21hbmFnZXIobV93ZWJDb250ZXh0LmdldCgpKTsKICAg ICAgICAgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX3NldF9uZXR3b3JrX3Byb3h5X3NldHRp bmdzKHdlYnNpdGVEYXRhTWFuYWdlciwgV0VCS0lUX05FVFdPUktfUFJPWFlfTU9ERV9DVVNUT00s IHNldHRpbmdzKTsKICAgICAgICAgd2Via2l0X25ldHdvcmtfcHJveHlfc2V0dGluZ3NfZnJlZShz ZXR0aW5ncyk7CkBAIC00NTMsNyArNDUyLDcgQEAgcHVibGljOgogCiAgICAgR1VuaXF1ZVB0cjxj aGFyPiBwcm94eVNlcnZlclBvcnRBc1N0cmluZygpCiAgICAgewotICAgICAgICBHVW5pcXVlUHRy PGNoYXI+IHBvcnQoZ19zdHJkdXBfcHJpbnRmKCIldSIsIHNvdXBfdXJpX2dldF9wb3J0KG1fcHJv eHlTZXJ2ZXIuYmFzZVVSSSgpKSkpOworICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IHBvcnQoZ19z dHJkdXBfcHJpbnRmKCIldSIsIG1fcHJveHlTZXJ2ZXIucG9ydCgpKSk7CiAgICAgICAgIHJldHVy biBwb3J0OwogICAgIH0KIApAQCAtNDY1LDE3ICs0NjQsMTcgQEAgc3RhdGljIHZvaWQgdGVzdFdl YlZpZXdBdXRoZW50aWNhdGlvblByb3h5KFByb3h5QXV0aGVudGljYXRpb25UZXN0KiB0ZXN0LCBn Y29uc3QKICAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9wcm94eS9h dXRoLXRlc3QuaHRtbCIpLmRhdGEoKSk7CiAgICAgV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0 KiByZXF1ZXN0ID0gdGVzdC0+d2FpdEZvckF1dGhlbnRpY2F0aW9uUmVxdWVzdCgpOwogICAgIC8v IEZJWE1FOiB0aGUgdXJpIGFuZCBob3N0IHNob3VsZCB0aGUgcHJveHkgb25lcywgbm90IHRoZSBy ZXF1ZXN0ZWQgb25lcy4KLSAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X2F1dGhlbnRpY2F0aW9u X3JlcXVlc3RfZ2V0X2hvc3QocmVxdWVzdCksID09LCBzb3VwX3VyaV9nZXRfaG9zdChrU2VydmVy LT5iYXNlVVJJKCkpKTsKLSAgICBnX2Fzc2VydF9jbXB1aW50KHdlYmtpdF9hdXRoZW50aWNhdGlv bl9yZXF1ZXN0X2dldF9wb3J0KHJlcXVlc3QpLCA9PSwgc291cF91cmlfZ2V0X3BvcnQoa1NlcnZl ci0+YmFzZVVSSSgpKSk7CisgICAgQVNTRVJUX0NNUF9DU1RSSU5HKHdlYmtpdF9hdXRoZW50aWNh dGlvbl9yZXF1ZXN0X2dldF9ob3N0KHJlcXVlc3QpLCA9PSwga1NlcnZlci0+YmFzZVVSTCgpLmhv c3QoKS50b1N0cmluZygpLnV0ZjgoKSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfYXV0 aGVudGljYXRpb25fcmVxdWVzdF9nZXRfcG9ydChyZXF1ZXN0KSwgPT0sIGtTZXJ2ZXItPnBvcnQo KSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dl dF9yZWFsbShyZXF1ZXN0KSwgPT0sICJQcm94eSByZWFsbSIpOwogICAgIGdfYXNzZXJ0X2NtcGlu dCh3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9nZXRfc2NoZW1lKHJlcXVlc3QpLCA9PSwg V0VCS0lUX0FVVEhFTlRJQ0FUSU9OX1NDSEVNRV9IVFRQX0JBU0lDKTsKICAgICBnX2Fzc2VydF90 cnVlKHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2lzX2Zvcl9wcm94eShyZXF1ZXN0KSk7 CiAgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfaXNfcmV0 cnkocmVxdWVzdCkpOwogICAgIGF1dG8qIG9yaWdpbiA9IHdlYmtpdF9hdXRoZW50aWNhdGlvbl9y ZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4ocmVxdWVzdCk7CiAgICAgZ19hc3NlcnRfbm9ubnVs bChvcmlnaW4pOwotICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dl dF9wcm90b2NvbChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0X3NjaGVtZShrU2VydmVyLT5iYXNl VVJJKCkpKTsKLSAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRf aG9zdChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0X2hvc3Qoa1NlcnZlci0+YmFzZVVSSSgpKSk7 Ci0gICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wb3J0KG9y aWdpbiksID09LCBzb3VwX3VyaV9nZXRfcG9ydChrU2VydmVyLT5iYXNlVVJJKCkpKTsKKyAgICBB U1NFUlRfQ01QX0NTVFJJTkcod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfcHJvdG9jb2wob3Jp Z2luKSwgPT0sIGtTZXJ2ZXItPmJhc2VVUkwoKS5wcm90b2NvbCgpLnRvU3RyaW5nKCkudXRmOCgp KTsKKyAgICBBU1NFUlRfQ01QX0NTVFJJTkcod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9z dChvcmlnaW4pLCA9PSwga1NlcnZlci0+YmFzZVVSTCgpLmhvc3QoKS50b1N0cmluZygpLnV0Zjgo KSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wb3J0 KG9yaWdpbiksID09LCBrU2VydmVyLT5wb3J0KCkpOwogICAgIHdlYmtpdF9zZWN1cml0eV9vcmln aW5fdW5yZWYob3JpZ2luKTsKIH0KIApAQCAtNDg3LDE3ICs0ODYsMTcgQEAgc3RhdGljIHZvaWQg dGVzdFdlYlZpZXdBdXRoZW50aWNhdGlvblByb3h5SFRUUFMoUHJveHlBdXRoZW50aWNhdGlvblRl c3QqIHRlc3QsIGcKICAgICB0ZXN0LT5sb2FkVVJJKGh0dHBzU2VydmVyLT5nZXRVUklGb3JQYXRo KCIvcHJveHkvYXV0aC10ZXN0Lmh0bWwiKS5kYXRhKCkpOwogICAgIFdlYktpdEF1dGhlbnRpY2F0 aW9uUmVxdWVzdCogcmVxdWVzdCA9IHRlc3QtPndhaXRGb3JBdXRoZW50aWNhdGlvblJlcXVlc3Qo KTsKICAgICAvLyBGSVhNRTogdGhlIHVyaSBhbmQgaG9zdCBzaG91bGQgdGhlIHByb3h5IG9uZXMs IG5vdCB0aGUgcmVxdWVzdGVkIG9uZXMuCi0gICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF9hdXRo ZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9ob3N0KHJlcXVlc3QpLCA9PSwgc291cF91cmlfZ2V0X2hv c3QoaHR0cHNTZXJ2ZXItPmJhc2VVUkkoKSkpOwotICAgIGdfYXNzZXJ0X2NtcHVpbnQod2Via2l0 X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0X3BvcnQocmVxdWVzdCksID09LCBzb3VwX3VyaV9n ZXRfcG9ydChodHRwc1NlcnZlci0+YmFzZVVSSSgpKSk7CisgICAgQVNTRVJUX0NNUF9DU1RSSU5H KHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9ob3N0KHJlcXVlc3QpLCA9PSwgaHR0 cHNTZXJ2ZXItPmJhc2VVUkwoKS5ob3N0KCkudG9TdHJpbmcoKS51dGY4KCkpOworICAgIGdfYXNz ZXJ0X2NtcHVpbnQod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0X3BvcnQocmVxdWVz dCksID09LCBodHRwc1NlcnZlci0+cG9ydCgpKTsKICAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0 X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0X3JlYWxtKHJlcXVlc3QpLCA9PSwgIlByb3h5IHJl YWxtIik7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0 X2dldF9zY2hlbWUocmVxdWVzdCksID09LCBXRUJLSVRfQVVUSEVOVElDQVRJT05fU0NIRU1FX0hU VFBfQkFTSUMpOwogICAgIGdfYXNzZXJ0X3RydWUod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVl c3RfaXNfZm9yX3Byb3h5KHJlcXVlc3QpKTsKICAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfYXV0 aGVudGljYXRpb25fcmVxdWVzdF9pc19yZXRyeShyZXF1ZXN0KSk7CiAgICAgYXV0byogb3JpZ2lu ID0gd2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0X3NlY3VyaXR5X29yaWdpbihyZXF1 ZXN0KTsKICAgICBnX2Fzc2VydF9ub25udWxsKG9yaWdpbik7Ci0gICAgZ19hc3NlcnRfY21wc3Ry KHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fZ2V0X3Byb3RvY29sKG9yaWdpbiksID09LCBzb3VwX3Vy aV9nZXRfc2NoZW1lKGh0dHBzU2VydmVyLT5iYXNlVVJJKCkpKTsKLSAgICBnX2Fzc2VydF9jbXBz dHIod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmlnaW4pLCA9PSwgc291cF91cmlf Z2V0X2hvc3QoaHR0cHNTZXJ2ZXItPmJhc2VVUkkoKSkpOwotICAgIGdfYXNzZXJ0X2NtcHVpbnQo d2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfcG9ydChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0 X3BvcnQoaHR0cHNTZXJ2ZXItPmJhc2VVUkkoKSkpOworICAgIEFTU0VSVF9DTVBfQ1NUUklORyh3 ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wcm90b2NvbChvcmlnaW4pLCA9PSwgaHR0cHNTZXJ2 ZXItPmJhc2VVUkwoKS5wcm90b2NvbCgpLnRvU3RyaW5nKCkudXRmOCgpKTsKKyAgICBBU1NFUlRf Q01QX0NTVFJJTkcod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmlnaW4pLCA9PSwg aHR0cHNTZXJ2ZXItPmJhc2VVUkwoKS5ob3N0KCkudG9TdHJpbmcoKS51dGY4KCkpOworICAgIGdf YXNzZXJ0X2NtcHVpbnQod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfcG9ydChvcmlnaW4pLCA9 PSwgaHR0cHNTZXJ2ZXItPnBvcnQoKSk7CiAgICAgd2Via2l0X3NlY3VyaXR5X29yaWdpbl91bnJl ZihvcmlnaW4pOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdEdMaWIvVGVzdFNTTC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdM aWIvVGVzdFNTTC5jcHAKaW5kZXggMmEwYTM0MDYzNjdlLi5mMzIzOWUyNjYxZTIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0U1NMLmNwcAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHAKQEAgLTIy MSwxNiArMjIxLDkgQEAgcHVibGljOgogCiAgICAgVExTRXJyb3JzVGVzdCgpCiAgICAgICAgIDog bV90bHNFcnJvcnMoc3RhdGljX2Nhc3Q8R1Rsc0NlcnRpZmljYXRlRmxhZ3M+KDApKQotICAgICAg ICAsIG1fZmFpbGluZ1VSSShudWxscHRyKQogICAgIHsKICAgICB9CiAKLSAgICB+VExTRXJyb3Jz VGVzdCgpCi0gICAgewotICAgICAgICBpZiAobV9mYWlsaW5nVVJJKQotICAgICAgICAgICAgc291 cF91cmlfZnJlZShtX2ZhaWxpbmdVUkkpOwotICAgIH0KLQogICAgIGJvb2wgbG9hZEZhaWxlZFdp dGhUTFNFcnJvcnMoY29uc3QgY2hhciogZmFpbGluZ1VSSSwgR1Rsc0NlcnRpZmljYXRlKiBjZXJ0 aWZpY2F0ZSwgR1Rsc0NlcnRpZmljYXRlRmxhZ3MgdGxzRXJyb3JzKSBvdmVycmlkZQogICAgIHsK ICAgICAgICAgTG9hZFRyYWNraW5nVGVzdDo6bG9hZEZhaWxlZFdpdGhUTFNFcnJvcnMoZmFpbGlu Z1VSSSwgY2VydGlmaWNhdGUsIHRsc0Vycm9ycyk7CkBAIC0yMzgsMjAgKzIzMSwxOCBAQCBwdWJs aWM6CiAgICAgICAgIGFzc2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpF Q1QoY2VydGlmaWNhdGUpKTsKICAgICAgICAgbV9jZXJ0aWZpY2F0ZSA9IGNlcnRpZmljYXRlOwog ICAgICAgICBtX3Rsc0Vycm9ycyA9IHRsc0Vycm9yczsKLSAgICAgICAgaWYgKG1fZmFpbGluZ1VS SSkKLSAgICAgICAgICAgIHNvdXBfdXJpX2ZyZWUobV9mYWlsaW5nVVJJKTsKLSAgICAgICAgbV9m YWlsaW5nVVJJID0gc291cF91cmlfbmV3KGZhaWxpbmdVUkkpOworICAgICAgICBtX2ZhaWxpbmdV UkwgPSBVUkwoeyB9LCBmYWlsaW5nVVJJKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQog CiAgICAgR1Rsc0NlcnRpZmljYXRlKiBjZXJ0aWZpY2F0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY2Vy dGlmaWNhdGUuZ2V0KCk7IH0KICAgICBHVGxzQ2VydGlmaWNhdGVGbGFncyB0bHNFcnJvcnMoKSBj b25zdCB7IHJldHVybiBtX3Rsc0Vycm9yczsgfQotICAgIGNvbnN0IGNoYXIqIGhvc3QoKSBjb25z dCB7IHJldHVybiBtX2ZhaWxpbmdVUkktPmhvc3Q7IH0KKyAgICBDU3RyaW5nIGhvc3QoKSBjb25z dCB7IHJldHVybiBtX2ZhaWxpbmdVUkwuaG9zdCgpLnRvU3RyaW5nKCkudXRmOCgpOyB9CiAKIHBy aXZhdGU6CiAgICAgR1JlZlB0cjxHVGxzQ2VydGlmaWNhdGU+IG1fY2VydGlmaWNhdGU7CiAgICAg R1Rsc0NlcnRpZmljYXRlRmxhZ3MgbV90bHNFcnJvcnM7Ci0gICAgU291cFVSSSogbV9mYWlsaW5n VVJJOworICAgIFVSTCBtX2ZhaWxpbmdVUkw7CiB9OwogCiBzdGF0aWMgdm9pZCB0ZXN0TG9hZEZh aWxlZFdpdGhUTFNFcnJvcnMoVExTRXJyb3JzVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKQEAg LTI2NiwxNCArMjU3LDE0IEBAIHN0YXRpYyB2b2lkIHRlc3RMb2FkRmFpbGVkV2l0aFRMU0Vycm9y cyhUTFNFcnJvcnNUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIHRlc3QtPndhaXRVbnRp bExvYWRGaW5pc2hlZCgpOwogICAgIGdfYXNzZXJ0X3RydWUoR19JU19UTFNfQ0VSVElGSUNBVEUo dGVzdC0+Y2VydGlmaWNhdGUoKSkpOwogICAgIGdfYXNzZXJ0X2NtcHVpbnQodGVzdC0+dGxzRXJy b3JzKCksID09LCBHX1RMU19DRVJUSUZJQ0FURV9VTktOT1dOX0NBKTsKLSAgICBnX2Fzc2VydF9j bXBzdHIodGVzdC0+aG9zdCgpLCA9PSwgc291cF91cmlfZ2V0X2hvc3Qoa0h0dHBzU2VydmVyLT5i YXNlVVJJKCkpKTsKKyAgICBBU1NFUlRfQ01QX0NTVFJJTkcodGVzdC0+aG9zdCgpLCA9PSwga0h0 dHBzU2VydmVyLT5iYXNlVVJMKCkuaG9zdCgpLnRvU3RyaW5nKCkudXRmOCgpKTsKICAgICBnX2Fz c2VydF9jbXBpbnQodGVzdC0+bV9sb2FkRXZlbnRzWzBdLCA9PSwgTG9hZFRyYWNraW5nVGVzdDo6 UHJvdmlzaW9uYWxMb2FkU3RhcnRlZCk7CiAgICAgZ19hc3NlcnRfY21waW50KHRlc3QtPm1fbG9h ZEV2ZW50c1sxXSwgPT0sIExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRGYWlsZWRXaXRoVExTRXJyb3Jz KTsKICAgICBnX2Fzc2VydF9jbXBpbnQodGVzdC0+bV9sb2FkRXZlbnRzWzJdLCA9PSwgTG9hZFRy YWNraW5nVGVzdDo6TG9hZEZpbmlzaGVkKTsKICAgICBhc3NlcnRJZlNTTFJlcXVlc3RQcm9jZXNz ZWQgPSBmYWxzZTsKIAogICAgIC8vIFRlc3QgYWxsb3dpbmcgYW4gZXhjZXB0aW9uIGZvciB0aGlz IGNlcnRpZmljYXRlIG9uIHRoaXMgaG9zdC4KLSAgICB3ZWJraXRfd2ViX2NvbnRleHRfYWxsb3df dGxzX2NlcnRpZmljYXRlX2Zvcl9ob3N0KHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSwgdGVzdC0+ Y2VydGlmaWNhdGUoKSwgdGVzdC0+aG9zdCgpKTsKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRfYWxs b3dfdGxzX2NlcnRpZmljYXRlX2Zvcl9ob3N0KHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSwgdGVz dC0+Y2VydGlmaWNhdGUoKSwgdGVzdC0+aG9zdCgpLmRhdGEoKSk7CiAgICAgLy8gVGhlIHBhZ2Ug c2hvdWxkIG5vdyBsb2FkIHdpdGhvdXQgZXJyb3JzLgogICAgIHRlc3QtPmxvYWRVUkkoa0h0dHBz U2VydmVyLT5nZXRVUklGb3JQYXRoKCIvdGVzdC10bHMvIikuZGF0YSgpKTsKICAgICB0ZXN0LT53 YWl0VW50aWxUaXRsZUNoYW5nZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViRXh0ZW5zaW9ucy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYkV4dGVuc2lvbnMuY3BwCmluZGV4IDc5NzRmYjEx YWFlMy4uZmEyZjA0YzQwZGY5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdEdMaWIvVGVzdFdlYkV4dGVuc2lvbnMuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViRXh0ZW5zaW9ucy5jcHAKQEAgLTIxLDYgKzIxLDcg QEAKIAogI2luY2x1ZGUgIldlYlZpZXdUZXN0LmgiCiAjaW5jbHVkZSA8Z2lvL2d1bml4ZmRsaXN0 Lmg+CisjaW5jbHVkZSA8d3RmL1VSTC5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4K IAogc3RhdGljIEdVbmlxdWVQdHI8Y2hhcj4gc2NyaXB0RGlhbG9nUmVzdWx0OwpAQCAtNDkzLDEw ICs0OTQsOSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViRXh0ZW5zaW9uUGFnZUlEKFdlYlZpZXdUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIC8vIFJlZ2lzdGVyIGEgY3VzdG9tIFVSSSBzY2hl bWUgdG8gdGVzdCBoaXN0b3J5IG5hdmlnYXRpb24uCiAgICAgd2Via2l0X3dlYl9jb250ZXh0X3Jl Z2lzdGVyX3VyaV9zY2hlbWUodGVzdC0+bV93ZWJDb250ZXh0LmdldCgpLCAiZm9vIiwKICAgICAg ICAgW10oV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogcmVxdWVzdCwgZ3BvaW50ZXIpIHsKLSAgICAg ICAgICAgIFNvdXBVUkkqIHVyaSA9IHNvdXBfdXJpX25ldyh3ZWJraXRfdXJpX3NjaGVtZV9yZXF1 ZXN0X2dldF91cmkocmVxdWVzdCkpOworICAgICAgICAgICAgVVJMIHVybCA9IFVSTCh7IH0sIHdl YmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSk7CiAgICAgICAgICAgICBH UmVmUHRyPEdJbnB1dFN0cmVhbT4gaW5wdXRTdHJlYW0gPSBhZG9wdEdSZWYoZ19tZW1vcnlfaW5w dXRfc3RyZWFtX25ldygpKTsKLSAgICAgICAgICAgIGNoYXIqIGh0bWwgPSBnX3N0cmR1cF9wcmlu dGYoIjxodG1sPjxoZWFkPjx0aXRsZT4lczwvdGl0bGU+PC9oZWFkPjxib2R5PjwvYm9keT48L2h0 bWw+IiwgIXN0cmNtcCh1cmktPmhvc3QsICJob3N0NSIpID8gIlRpdGxlNSIgOiAiVGl0bGU2Iik7 Ci0gICAgICAgICAgICBzb3VwX3VyaV9mcmVlKHVyaSk7CisgICAgICAgICAgICBjaGFyKiBodG1s ID0gZ19zdHJkdXBfcHJpbnRmKCI8aHRtbD48aGVhZD48dGl0bGU+JXM8L3RpdGxlPjwvaGVhZD48 Ym9keT48L2JvZHk+PC9odG1sPiIsIHVybC5ob3N0KCkgPT0gImhvc3Q1IiA/ICJUaXRsZTUiIDog IlRpdGxlNiIpOwogICAgICAgICAgICAgZ19tZW1vcnlfaW5wdXRfc3RyZWFtX2FkZF9kYXRhKEdf TUVNT1JZX0lOUFVUX1NUUkVBTShpbnB1dFN0cmVhbS5nZXQoKSksIGh0bWwsIHN0cmxlbihodG1s KSwgZ19mcmVlKTsKICAgICAgICAgICAgIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNo KHJlcXVlc3QsIGlucHV0U3RyZWFtLmdldCgpLCBzdHJsZW4oaHRtbCksICJ0ZXh0L2h0bWwiKTsK ICAgICAgICAgfSwgbnVsbHB0ciwgbnVsbHB0cik7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcApp bmRleCA4ZTkxYzQzZDdiYjkuLjNiNDU1MmI0ZjgwMiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYkNvbnRleHQu Y3BwCkBAIC01OTMsMTAgKzU5MywxMCBAQCBwdWJsaWM6CiAgICAgICAgIC8vIGFjdHVhbGx5IGEg cHJveHkgc2VydmVyLiBXZSdyZSB0ZXN0aW5nIHdoZXRoZXIgdGhlIHByb3h5IHNldHRpbmdzCiAg ICAgICAgIC8vIHdvcmssIG5vdCB3aGV0aGVyIHdlIGNhbiB3cml0ZSBhIHNvdXAgcHJveHkgc2Vy dmVyLgogICAgICAgICBtX3Byb3h5U2VydmVyLnJ1bihzZXJ2ZXJDYWxsYmFjayk7Ci0gICAgICAg IGdfYXNzZXJ0X25vbm51bGwobV9wcm94eVNlcnZlci5iYXNlVVJJKCkpOworICAgICAgICBnX2Fz c2VydF9mYWxzZShtX3Byb3h5U2VydmVyLmJhc2VVUkwoKS5pc051bGwoKSk7CiAjaWYgU09VUF9D SEVDS19WRVJTSU9OKDIsIDYxLCA5MCkKICAgICAgICAgbV9wcm94eVNlcnZlci5hZGRXZWJTb2Nr ZXRIYW5kbGVyKHdlYlNvY2tldFByb3h5U2VydmVyQ2FsbGJhY2ssIHRoaXMpOwotICAgICAgICBn X2Fzc2VydF9ub25udWxsKG1fcHJveHlTZXJ2ZXIuYmFzZVdlYlNvY2tldFVSSSgpKTsKKyAgICAg ICAgZ19hc3NlcnRfZmFsc2UobV9wcm94eVNlcnZlci5iYXNlV2ViU29ja2V0VVJMKCkuaXNOdWxs KCkpOwogI2VuZGlmCiAgICAgfQogCkBAIC02MTEsNyArNjExLDcgQEAgcHVibGljOgogCiAgICAg R1VuaXF1ZVB0cjxjaGFyPiBwcm94eVNlcnZlclBvcnRBc1N0cmluZygpCiAgICAgewotICAgICAg ICBHVW5pcXVlUHRyPGNoYXI+IHBvcnQoZ19zdHJkdXBfcHJpbnRmKCIldSIsIHNvdXBfdXJpX2dl dF9wb3J0KG1fcHJveHlTZXJ2ZXIuYmFzZVVSSSgpKSkpOworICAgICAgICBHVW5pcXVlUHRyPGNo YXI+IHBvcnQoZ19zdHJkdXBfcHJpbnRmKCIldSIsIG1fcHJveHlTZXJ2ZXIucG9ydCgpKSk7CiAg ICAgICAgIHJldHVybiBwb3J0OwogICAgIH0KIApAQCAtNjU3LDcgKzY1Nyw3IEBAIHN0YXRpYyB2 b2lkIGVwaGVtZXJhbFZpZXdsb2FkQ2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJL aXRMb2FkRXZlbnQgbG9hCiBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dFByb3h5U2V0dGluZ3Mo UHJveHlUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewogICAgIC8vIFByb3h5IFVSSSBpcyB1 bnNldCBieSBkZWZhdWx0LiBSZXF1ZXN0cyB0byBrU2VydmVyIHNob3VsZCBiZSByZWNlaXZlZCBi eSBrU2VydmVyLgotICAgIEdVbmlxdWVQdHI8Y2hhcj4gc2VydmVyUG9ydEFzU3RyaW5nKGdfc3Ry ZHVwX3ByaW50ZigiJXUiLCBzb3VwX3VyaV9nZXRfcG9ydChrU2VydmVyLT5iYXNlVVJJKCkpKSk7 CisgICAgR1VuaXF1ZVB0cjxjaGFyPiBzZXJ2ZXJQb3J0QXNTdHJpbmcoZ19zdHJkdXBfcHJpbnRm KCIldSIsIGtTZXJ2ZXItPnBvcnQoKSkpOwogICAgIGF1dG8gbWFpblJlc291cmNlRGF0YSA9IHRl c3QtPmxvYWRVUklBbmRHZXRNYWluUmVzb3VyY2VEYXRhKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgo Ii9lY2hvUG9ydCIpLmRhdGEoKSk7CiAgICAgQVNTRVJUX0NNUF9DU1RSSU5HKG1haW5SZXNvdXJj ZURhdGEsID09LCBzZXJ2ZXJQb3J0QXNTdHJpbmcuZ2V0KCkpOwogCkBAIC02NjksOCArNjY5LDcg QEAgc3RhdGljIHZvaWQgdGVzdFdlYkNvbnRleHRQcm94eVNldHRpbmdzKFByb3h5VGVzdCogdGVz dCwgZ2NvbnN0cG9pbnRlcikKICNlbmRpZgogCiAgICAgLy8gU2V0IGRlZmF1bHQgcHJveHkgVVJJ IHRvIHBvaW50IHRvIHByb3h5U2VydmVyLiBSZXF1ZXN0cyB0byBrU2VydmVyIHNob3VsZCBiZSBy ZWNlaXZlZCBieSBwcm94eVNlcnZlciBpbnN0ZWFkLgotICAgIEdVbmlxdWVQdHI8Y2hhcj4gcHJv eHlVUkkoc291cF91cmlfdG9fc3RyaW5nKHRlc3QtPm1fcHJveHlTZXJ2ZXIuYmFzZVVSSSgpLCBG QUxTRSkpOwotICAgIFdlYktpdE5ldHdvcmtQcm94eVNldHRpbmdzKiBzZXR0aW5ncyA9IHdlYmtp dF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzX25ldyhwcm94eVVSSS5nZXQoKSwgbnVsbHB0cik7Cisg ICAgV2ViS2l0TmV0d29ya1Byb3h5U2V0dGluZ3MqIHNldHRpbmdzID0gd2Via2l0X25ldHdvcmtf cHJveHlfc2V0dGluZ3NfbmV3KHRlc3QtPm1fcHJveHlTZXJ2ZXIuYmFzZVVSTCgpLnN0cmluZygp LnV0ZjgoKS5kYXRhKCksIG51bGxwdHIpOwogICAgIGF1dG8qIGRhdGFNYW5hZ2VyID0gd2Via2l0 X3dlYl9jb250ZXh0X2dldF93ZWJzaXRlX2RhdGFfbWFuYWdlcih0ZXN0LT5tX3dlYkNvbnRleHQu Z2V0KCkpOwogICAgIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9zZXRfbmV0d29ya19wcm94 eV9zZXR0aW5ncyhkYXRhTWFuYWdlciwgV0VCS0lUX05FVFdPUktfUFJPWFlfTU9ERV9DVVNUT00s IHNldHRpbmdzKTsKICAgICBHVW5pcXVlUHRyPGNoYXI+IHByb3h5U2VydmVyUG9ydEFzU3RyaW5n ID0gdGVzdC0+cHJveHlTZXJ2ZXJQb3J0QXNTdHJpbmcoKTsKQEAgLTcxOCw3ICs3MTcsNyBAQCBz dGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dFByb3h5U2V0dGluZ3MoUHJveHlUZXN0KiB0ZXN0LCBn Y29uc3Rwb2ludGVyKQogCiAgICAgLy8gVXNlIGEgZGVmYXVsdCBwcm94eSB1cmksIGJ1dCBpZ25v cmluZyByZXF1ZXN0cyB0byBsb2NhbGhvc3QuCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGlnbm9y ZUhvc3RzW10gPSB7ICJsb2NhbGhvc3QiLCBudWxscHRyIH07Ci0gICAgc2V0dGluZ3MgPSB3ZWJr aXRfbmV0d29ya19wcm94eV9zZXR0aW5nc19uZXcocHJveHlVUkkuZ2V0KCksIGlnbm9yZUhvc3Rz KTsKKyAgICBzZXR0aW5ncyA9IHdlYmtpdF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzX25ldyh0ZXN0 LT5tX3Byb3h5U2VydmVyLmJhc2VVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBpZ25vcmVI b3N0cyk7CiAgICAgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX3NldF9uZXR3b3JrX3Byb3h5 X3NldHRpbmdzKGRhdGFNYW5hZ2VyLCBXRUJLSVRfTkVUV09SS19QUk9YWV9NT0RFX0NVU1RPTSwg c2V0dGluZ3MpOwogICAgIG1haW5SZXNvdXJjZURhdGEgPSB0ZXN0LT5sb2FkVVJJQW5kR2V0TWFp blJlc291cmNlRGF0YShrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvZWNob1BvcnQiKS5kYXRhKCkp OwogICAgIEFTU0VSVF9DTVBfQ1NUUklORyhtYWluUmVzb3VyY2VEYXRhLCA9PSwgcHJveHlTZXJ2 ZXJQb3J0QXNTdHJpbmcuZ2V0KCkpOwpAQCAtNzM0LDcgKzczMyw3IEBAIHN0YXRpYyB2b2lkIHRl c3RXZWJDb250ZXh0UHJveHlTZXR0aW5ncyhQcm94eVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CiAKICAgICAvLyBVc2Ugc2NoZW1lIHNwZWNpZmljIHByb3h5IGluc3RlYWQgb2YgdGhlIGRlZmF1 bHQuCiAgICAgc2V0dGluZ3MgPSB3ZWJraXRfbmV0d29ya19wcm94eV9zZXR0aW5nc19uZXcobnVs bHB0ciwgbnVsbHB0cik7Ci0gICAgd2Via2l0X25ldHdvcmtfcHJveHlfc2V0dGluZ3NfYWRkX3By b3h5X2Zvcl9zY2hlbWUoc2V0dGluZ3MsICJodHRwIiwgcHJveHlVUkkuZ2V0KCkpOworICAgIHdl YmtpdF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzX2FkZF9wcm94eV9mb3Jfc2NoZW1lKHNldHRpbmdz LCAiaHR0cCIsIHRlc3QtPm1fcHJveHlTZXJ2ZXIuYmFzZVVSTCgpLnN0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwogICAgIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9zZXRfbmV0d29ya19wcm94 eV9zZXR0aW5ncyhkYXRhTWFuYWdlciwgV0VCS0lUX05FVFdPUktfUFJPWFlfTU9ERV9DVVNUT00s IHNldHRpbmdzKTsKICAgICBtYWluUmVzb3VyY2VEYXRhID0gdGVzdC0+bG9hZFVSSUFuZEdldE1h aW5SZXNvdXJjZURhdGEoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2VjaG9Qb3J0IikuZGF0YSgp KTsKICAgICBBU1NFUlRfQ01QX0NTVFJJTkcobWFpblJlc291cmNlRGF0YSwgPT0sIHByb3h5U2Vy dmVyUG9ydEFzU3RyaW5nLmdldCgpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYlZpZXcuY3BwCmluZGV4IDBmMTAxYmNl ZDZkNC4uNWMyMmIyMWNjOWM0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYlZpZXcuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHAKQEAgLTEwNjksMTYgKzEw NjksMTQgQEAgc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdOb3RpZmljYXRpb24oTm90aWZpY2F0aW9u V2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIKIAogc3RhdGljIHZvaWQgc2V0SW5pdGlh bE5vdGlmaWNhdGlvblBlcm1pc3Npb25zQWxsb3dlZENhbGxiYWNrKFdlYktpdFdlYkNvbnRleHQq IGNvbnRleHQsIE5vdGlmaWNhdGlvbldlYlZpZXdUZXN0KiB0ZXN0KQogewotICAgIEdVbmlxdWVQ dHI8Y2hhcj4gYmFzZVVSSShzb3VwX3VyaV90b19zdHJpbmcoZ1NlcnZlci0+YmFzZVVSSSgpLCBG QUxTRSkpOwotICAgIEdMaXN0KiBhbGxvd2VkT3JpZ2lucyA9IGdfbGlzdF9wcmVwZW5kKG51bGxw dHIsIHdlYmtpdF9zZWN1cml0eV9vcmlnaW5fbmV3X2Zvcl91cmkoYmFzZVVSSS5nZXQoKSkpOwor ICAgIEdMaXN0KiBhbGxvd2VkT3JpZ2lucyA9IGdfbGlzdF9wcmVwZW5kKG51bGxwdHIsIHdlYmtp dF9zZWN1cml0eV9vcmlnaW5fbmV3X2Zvcl91cmkoZ1NlcnZlci0+YmFzZVVSTCgpLnN0cmluZygp LnV0ZjgoKS5kYXRhKCkpKTsKICAgICB3ZWJraXRfd2ViX2NvbnRleHRfaW5pdGlhbGl6ZV9ub3Rp ZmljYXRpb25fcGVybWlzc2lvbnModGVzdC0+bV93ZWJDb250ZXh0LmdldCgpLCBhbGxvd2VkT3Jp Z2lucywgbnVsbHB0cik7CiAgICAgZ19saXN0X2ZyZWVfZnVsbChhbGxvd2VkT3JpZ2lucywgcmVp bnRlcnByZXRfY2FzdDxHRGVzdHJveU5vdGlmeT4od2Via2l0X3NlY3VyaXR5X29yaWdpbl91bnJl ZikpOwogfQogCiBzdGF0aWMgdm9pZCBzZXRJbml0aWFsTm90aWZpY2F0aW9uUGVybWlzc2lvbnNE aXNhbGxvd2VkQ2FsbGJhY2soV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgTm90aWZpY2F0aW9u V2ViVmlld1Rlc3QqIHRlc3QpCiB7Ci0gICAgR1VuaXF1ZVB0cjxjaGFyPiBiYXNlVVJJKHNvdXBf dXJpX3RvX3N0cmluZyhnU2VydmVyLT5iYXNlVVJJKCksIEZBTFNFKSk7Ci0gICAgR0xpc3QqIGRp c2FsbG93ZWRPcmlnaW5zID0gZ19saXN0X3ByZXBlbmQobnVsbHB0ciwgd2Via2l0X3NlY3VyaXR5 X29yaWdpbl9uZXdfZm9yX3VyaShiYXNlVVJJLmdldCgpKSk7CisgICAgR0xpc3QqIGRpc2FsbG93 ZWRPcmlnaW5zID0gZ19saXN0X3ByZXBlbmQobnVsbHB0ciwgd2Via2l0X3NlY3VyaXR5X29yaWdp bl9uZXdfZm9yX3VyaShnU2VydmVyLT5iYXNlVVJMKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSkp OwogICAgIHdlYmtpdF93ZWJfY29udGV4dF9pbml0aWFsaXplX25vdGlmaWNhdGlvbl9wZXJtaXNz aW9ucyh0ZXN0LT5tX3dlYkNvbnRleHQuZ2V0KCksIG51bGxwdHIsIGRpc2FsbG93ZWRPcmlnaW5z KTsKICAgICBnX2xpc3RfZnJlZV9mdWxsKGRpc2FsbG93ZWRPcmlnaW5zLCByZWludGVycHJldF9j YXN0PEdEZXN0cm95Tm90aWZ5Pih3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3VucmVmKSk7CiB9CmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0 U2VydmVyLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRl c3RTZXJ2ZXIuY3BwCmluZGV4IDdlMTA4NWM3OWZlMi4uY2I4MzdlMzI2YzgzIDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNw cAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2Vy dmVyLmNwcApAQCAtNDIsMTMgKzQyLDYgQEAgV2ViS2l0VGVzdFNlcnZlcjo6V2ViS2l0VGVzdFNl cnZlcihTZXJ2ZXJPcHRpb25zIG9wdGlvbnMpCiAgICAgfQogfQogCi1XZWJLaXRUZXN0U2VydmVy Ojp+V2ViS2l0VGVzdFNlcnZlcigpCi17Ci0gICAgc291cF91cmlfZnJlZShtX2Jhc2VVUkkpOwot ICAgIGlmIChtX2Jhc2VXZWJTb2NrZXRVUkkpCi0gICAgICAgIHNvdXBfdXJpX2ZyZWUobV9iYXNl V2ViU29ja2V0VVJJKTsKLX0KLQogdm9pZCBXZWJLaXRUZXN0U2VydmVyOjpydW4oU291cFNlcnZl ckNhbGxiYWNrIHNlcnZlckNhbGxiYWNrKQogewogICAgIHNvdXBfc2VydmVyX2FkZF9oYW5kbGVy KG1fc291cFNlcnZlci5nZXQoKSwgbnVsbHB0ciwgc2VydmVyQ2FsbGJhY2ssIG51bGxwdHIsIG51 bGxwdHIpOwpAQCAtNjksMTQgKzYyLDE1IEBAIHZvaWQgV2ViS2l0VGVzdFNlcnZlcjo6cnVuKFNv dXBTZXJ2ZXJDYWxsYmFjayBzZXJ2ZXJDYWxsYmFjaykKIAogICAgIEdTTGlzdCogdXJpcyA9IHNv dXBfc2VydmVyX2dldF91cmlzKG1fc291cFNlcnZlci5nZXQoKSk7CiAgICAgZ19hc3NlcnRfbm9u bnVsbCh1cmlzKTsKLSAgICBtX2Jhc2VVUkkgPSBzb3VwX3VyaV9jb3B5KHN0YXRpY19jYXN0PFNv dXBVUkkqPih1cmlzLT5kYXRhKSk7CisgICAgR1VuaXF1ZVB0cjxnY2hhcj4gdXJsU3RyaW5nKHNv dXBfdXJpX3RvX3N0cmluZyhzdGF0aWNfY2FzdDxTb3VwVVJJKj4odXJpcy0+ZGF0YSksIEZBTFNF KSk7CisgICAgbV9iYXNlVVJMID0gVVJMKHsgfSwgU3RyaW5nOjpmcm9tVVRGOCh1cmxTdHJpbmcu Z2V0KCkpKTsKICAgICBnX3NsaXN0X2ZyZWVfZnVsbCh1cmlzLCByZWludGVycHJldF9jYXN0PEdE ZXN0cm95Tm90aWZ5Pihzb3VwX3VyaV9mcmVlKSk7CiB9CiAKIHZvaWQgV2ViS2l0VGVzdFNlcnZl cjo6YWRkV2ViU29ja2V0SGFuZGxlcihTb3VwU2VydmVyV2Vic29ja2V0Q2FsbGJhY2sgY2FsbGJh Y2ssIGdwb2ludGVyIHVzZXJEYXRhKQogewotICAgIG1fYmFzZVdlYlNvY2tldFVSSSA9IHNvdXBf dXJpX25ld193aXRoX2Jhc2UobV9iYXNlVVJJLCAiL3dlYnNvY2tldC8iKTsKLSAgICBtX2Jhc2VX ZWJTb2NrZXRVUkktPnNjaGVtZSA9IG1fYmFzZVdlYlNvY2tldFVSSS0+c2NoZW1lID09IFNPVVBf VVJJX1NDSEVNRV9IVFRQID8gU09VUF9VUklfU0NIRU1FX1dTIDogU09VUF9VUklfU0NIRU1FX1dT UzsKKyAgICBtX2Jhc2VXZWJTb2NrZXRVUkwgPSBVUkwobV9iYXNlVVJMLCAiL3dlYnNvY2tldC8i KTsKKyAgICBtX2Jhc2VXZWJTb2NrZXRVUkwuc2V0UHJvdG9jb2wobV9iYXNlV2ViU29ja2V0VVJM LnByb3RvY29sSXMoImh0dHAiKSA/IFNPVVBfVVJJX1NDSEVNRV9XUyA6IFNPVVBfVVJJX1NDSEVN RV9XU1MpOwogCiAgICAgaWYgKG1fcXVldWUpIHsKICAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2go W3RoaXMsIGNhbGxiYWNrLCB1c2VyRGF0YV0gewpAQCAtODgsOCArODIsNyBAQCB2b2lkIFdlYktp dFRlc3RTZXJ2ZXI6OmFkZFdlYlNvY2tldEhhbmRsZXIoU291cFNlcnZlcldlYnNvY2tldENhbGxi YWNrIGNhbGxiYWNrLAogCiB2b2lkIFdlYktpdFRlc3RTZXJ2ZXI6OnJlbW92ZVdlYlNvY2tldEhh bmRsZXIoKQogewotICAgIHNvdXBfdXJpX2ZyZWUobV9iYXNlV2ViU29ja2V0VVJJKTsKLSAgICBt X2Jhc2VXZWJTb2NrZXRVUkkgPSBudWxscHRyOworICAgIG1fYmFzZVdlYlNvY2tldFVSTCA9IHsg fTsKIAogICAgIGlmIChtX3F1ZXVlKSB7CiAgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlz XSB7CkBAIC0xMDEsMjMgKzk0LDE3IEBAIHZvaWQgV2ViS2l0VGVzdFNlcnZlcjo6cmVtb3ZlV2Vi U29ja2V0SGFuZGxlcigpCiAKIENTdHJpbmcgV2ViS2l0VGVzdFNlcnZlcjo6Z2V0V2ViU29ja2V0 VVJJRm9yUGF0aChjb25zdCBjaGFyKiBwYXRoKSBjb25zdAogewotICAgIGdfYXNzZXJ0X25vbm51 bGwobV9iYXNlV2ViU29ja2V0VVJJKTsKKyAgICBnX2Fzc2VydF9mYWxzZShtX2Jhc2VXZWJTb2Nr ZXRVUkwuaXNOdWxsKCkpOwogICAgIGdfYXNzZXJ0X3RydWUocGF0aCAmJiAqcGF0aCA9PSAnLycp OwotICAgIFNvdXBVUkkqIHVyaSA9IHNvdXBfdXJpX25ld193aXRoX2Jhc2UobV9iYXNlV2ViU29j a2V0VVJJLCBwYXRoICsgMSk7IC8vIElnbm9yZSB0aGUgbGVhZGluZyBzbGFzaC4KLSAgICBHVW5p cXVlUHRyPGdjaGFyPiB1cmlTdHJpbmcoc291cF91cmlfdG9fc3RyaW5nKHVyaSwgRkFMU0UpKTsK LSAgICBzb3VwX3VyaV9mcmVlKHVyaSk7Ci0gICAgcmV0dXJuIHVyaVN0cmluZy5nZXQoKTsKKyAg ICByZXR1cm4gVVJMKG1fYmFzZVdlYlNvY2tldFVSTCwgcGF0aCArIDEpLnN0cmluZygpLnV0Zjgo KTsgLy8gSWdub3JlIHRoZSBsZWFkaW5nIHNsYXNoLgogfQogCiBDU3RyaW5nIFdlYktpdFRlc3RT ZXJ2ZXI6OmdldFVSSUZvclBhdGgoY29uc3QgY2hhciogcGF0aCkgY29uc3QKIHsKLSAgICBTb3Vw VVJJKiB1cmkgPSBzb3VwX3VyaV9uZXdfd2l0aF9iYXNlKG1fYmFzZVVSSSwgcGF0aCk7Ci0gICAg R1VuaXF1ZVB0cjxnY2hhcj4gdXJpU3RyaW5nKHNvdXBfdXJpX3RvX3N0cmluZyh1cmksIEZBTFNF KSk7Ci0gICAgc291cF91cmlfZnJlZSh1cmkpOwotICAgIHJldHVybiB1cmlTdHJpbmcuZ2V0KCk7 CisgICAgcmV0dXJuIFVSTChtX2Jhc2VVUkwsIHBhdGgpLnN0cmluZygpLnV0ZjgoKTsKIH0KIAog dW5zaWduZWQgV2ViS2l0VGVzdFNlcnZlcjo6cG9ydCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHNv dXBfdXJpX2dldF9wb3J0KG1fYmFzZVVSSSk7CisgICAgcmV0dXJuIG1fYmFzZVVSTC5wb3J0KCku dmFsdWVPcigwKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJL aXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJL aXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaAppbmRleCBmNWJkNDdkNmQzM2MuLjlkYzIwYzMxMjRi NCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0 VGVzdFNlcnZlci5oCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dl YktpdFRlc3RTZXJ2ZXIuaApAQCAtMjAsNiArMjAsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNs dWRlIDxsaWJzb3VwL3NvdXAuaD4KKyNpbmNsdWRlIDx3dGYvVVJMLmg+CiAjaW5jbHVkZSA8d3Rm L1dvcmtRdWV1ZS5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC0zNSw5ICszNiw4IEBAIHB1YmxpYzoKICAgICB9OwogCiAg ICAgV2ViS2l0VGVzdFNlcnZlcihTZXJ2ZXJPcHRpb25zID0gU2VydmVySFRUUCk7Ci0gICAgdmly dHVhbCB+V2ViS2l0VGVzdFNlcnZlcigpOwogCi0gICAgU291cFVSSSogYmFzZVVSSSgpIGNvbnN0 IHsgcmV0dXJuIG1fYmFzZVVSSTsgfQorICAgIGNvbnN0IFVSTCYgYmFzZVVSTCgpIGNvbnN0IHsg cmV0dXJuIG1fYmFzZVVSTDsgfQogICAgIHVuc2lnbmVkIHBvcnQoKSBjb25zdDsKICAgICBDU3Ry aW5nIGdldFVSSUZvclBhdGgoY29uc3QgY2hhciogcGF0aCkgY29uc3Q7CiAgICAgdm9pZCBydW4o U291cFNlcnZlckNhbGxiYWNrKTsKQEAgLTQ1LDE1ICs0NSwxNSBAQCBwdWJsaWM6CiAjaWYgU09V UF9DSEVDS19WRVJTSU9OKDIsIDUwLCAwKQogICAgIHZvaWQgYWRkV2ViU29ja2V0SGFuZGxlcihT b3VwU2VydmVyV2Vic29ja2V0Q2FsbGJhY2ssIGdwb2ludGVyIHVzZXJEYXRhKTsKICAgICB2b2lk IHJlbW92ZVdlYlNvY2tldEhhbmRsZXIoKTsKLSAgICBTb3VwVVJJKiBiYXNlV2ViU29ja2V0VVJJ KCkgY29uc3QgeyByZXR1cm4gbV9iYXNlV2ViU29ja2V0VVJJOyB9CisgICAgY29uc3QgVVJMJiBi YXNlV2ViU29ja2V0VVJMKCkgY29uc3QgeyByZXR1cm4gbV9iYXNlV2ViU29ja2V0VVJMOyB9CiAg ICAgQ1N0cmluZyBnZXRXZWJTb2NrZXRVUklGb3JQYXRoKGNvbnN0IGNoYXIqIHBhdGgpIGNvbnN0 OwogI2VuZGlmCiAKIHByaXZhdGU6CiAgICAgR1JlZlB0cjxTb3VwU2VydmVyPiBtX3NvdXBTZXJ2 ZXI7Ci0gICAgU291cFVSSSogbV9iYXNlVVJJIHsgbnVsbHB0ciB9OworICAgIFVSTCBtX2Jhc2VV Ukw7CiAjaWYgU09VUF9DSEVDS19WRVJTSU9OKDIsIDUwLCAwKQotICAgIFNvdXBVUkkqIG1fYmFz ZVdlYlNvY2tldFVSSSB7IG51bGxwdHIgfTsKKyAgICBVUkwgbV9iYXNlV2ViU29ja2V0VVJMOwog I2VuZGlmCiAgICAgUmVmUHRyPFdvcmtRdWV1ZT4gbV9xdWV1ZTsKIH07Cg==