195337 2019-03-05 12:58:09 -0800 [JSC] Should check exception for JSString::toExistingAtomicString 2022-02-10 16:29:28 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1512771 0 ysuzuki 2019-03-05 12:58:09 -0800 [JSC] Should check exception for JSString::toExistingAtomicString 1512773 1 363672 ysuzuki 2019-03-05 13:02:27 -0800 Created attachment 363672 Patch 1512774 2 363672 keith_miller 2019-03-05 13:04:07 -0800 Comment on attachment 363672 Patch r=me 1512775 3 363672 saam 2019-03-05 13:04:34 -0800 Comment on attachment 363672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363672&action=review > Source/JavaScriptCore/dfg/DFGOperations.cpp:693 > + RETURN_IF_EXCEPTION(scope, encodedJSValue()); encodedJSValue() => { } ? > Source/JavaScriptCore/runtime/JSString.cpp:273 > + RELEASE_AND_RETURN(scope, existingAtomicString); hmmm, why do you need to release here? > Source/JavaScriptCore/runtime/JSString.cpp:280 > + RELEASE_AND_RETURN(scope, existingAtomicString); ditto > Source/JavaScriptCore/runtime/JSString.cpp:284 > + RELEASE_AND_RETURN(scope, nullptr); ditto 1512776 4 363672 mark.lam 2019-03-05 13:06:58 -0800 Comment on attachment 363672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363672&action=review r=me >> Source/JavaScriptCore/runtime/JSString.cpp:273 >> + RELEASE_AND_RETURN(scope, existingAtomicString); > > hmmm, why do you need to release here? Because otherwise, the ThrowScope will think you have an unchecked exception. RELEASE here means we're intentionally letting the caller handle any pending exceptions upon return. 1512777 5 mark.lam 2019-03-05 13:07:35 -0800 (In reply to Mark Lam from comment #4) > Comment on attachment 363672 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=363672&action=review > > r=me > > >> Source/JavaScriptCore/runtime/JSString.cpp:273 > >> + RELEASE_AND_RETURN(scope, existingAtomicString); > > > > hmmm, why do you need to release here? > > Because otherwise, the ThrowScope will think you have an unchecked > exception. RELEASE here means we're intentionally letting the caller handle > any pending exceptions upon return. Reminder: the ThrowScope destructor does this checking. 1512782 6 363672 mark.lam 2019-03-05 13:11:06 -0800 Comment on attachment 363672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363672&action=review >>>> Source/JavaScriptCore/runtime/JSString.cpp:273 >>>> + RELEASE_AND_RETURN(scope, existingAtomicString); >>> >>> hmmm, why do you need to release here? >> >> Because otherwise, the ThrowScope will think you have an unchecked exception. RELEASE here means we're intentionally letting the caller handle any pending exceptions upon return. > > Reminder: the ThrowScope destructor does this checking. I was wrong. The existingAtomicString expression cannot throw. Saam is right about the RELEASE_AND_RETURN not being needed. 1512784 7 363672 ysuzuki 2019-03-05 13:12:27 -0800 Comment on attachment 363672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363672&action=review >> Source/JavaScriptCore/dfg/DFGOperations.cpp:693 >> + RETURN_IF_EXCEPTION(scope, encodedJSValue()); > > encodedJSValue() => { } ? I use `encodedJSValue()` here because of consistency in this file. >> Source/JavaScriptCore/runtime/JSString.cpp:273 >> + RELEASE_AND_RETURN(scope, existingAtomicString); > > hmmm, why do you need to release here? Right! We do not need to use RELEASE_AND_RETURN here. Dropped. >> Source/JavaScriptCore/runtime/JSString.cpp:280 >> + RELEASE_AND_RETURN(scope, existingAtomicString); > > ditto Fixed. >> Source/JavaScriptCore/runtime/JSString.cpp:284 >> + RELEASE_AND_RETURN(scope, nullptr); > > ditto Fixed. 1512793 8 ysuzuki 2019-03-05 13:20:53 -0800 Committed r242500: <https://trac.webkit.org/changeset/242500> 1512795 9 webkit-bug-importer 2019-03-05 13:21:38 -0800 <rdar://problem/48611208> 363672 2019-03-05 13:02:27 -0800 2022-02-10 16:29:28 -0800 Patch bug-195337-20190305130227.patch text/plain 8502 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz YWU5MTNlZWZlYTg2ZDc0OTFmNjdiNmUwYzg2YzRmZjZhMGM2MTBmLi44NGQ3ZTkxZGE3NWRhODM4 MTg2ZGNhZDU0MzUzMWM1ZmU5ZWZhNzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxOS0wMy0wNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFNob3VsZCBjaGVjayBleGNlcHRpb24gZm9yIEpTU3RyaW5nOjp0 b0V4aXN0aW5nQXRvbWljU3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTUzMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZSBtaXNzZWQgdGhlIGV4Y2VwdGlvbiBjaGVjayBmb3IgSlNTdHJpbmc6 OnRvRXhpc3RpbmdBdG9taWNTdHJpbmcgd2hpbGUgaXQgY2FuIHJlc29sdmUKKyAgICAgICAgYSBy b3BlIGFuZCB0aHJvdyBhbiBPT00gZXhjZXB0aW9uLiBUaGlzIHBhdGNoIGFkZHMgbmVjZXNzYXJ5 IGV4Y2VwdGlvbiBjaGVja3MuIFRoaXMgcGF0Y2gKKyAgICAgICAgZml4ZXMgdGVzdCBmYWlsdXJl cyBpbiBkZWJ1ZyBidWlsZCwgcmVwb3J0ZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NDM3NSNjOTMuCisKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5j cHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoSlNDOjpnZXRC eVZhbCk6CisgICAgICAgICogbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwOgorICAgICAgICAoSlND OjpMTEludDo6Z2V0QnlWYWwpOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNw cDoKKyAgICAgICAgKEpTQzo6U0xPV19QQVRIX0RFQ0wpOgorICAgICAgICAqIHJ1bnRpbWUvSlNT dHJpbmcuY3BwOgorICAgICAgICAoSlNDOjpKU1JvcGVTdHJpbmc6OnJlc29sdmVSb3BlVG9FeGlz dGluZ0F0b21pY1N0cmluZyBjb25zdCk6CisKIDIwMTktMDMtMDQgIFl1c3VrZSBTdXp1a2kgIDx5 c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXggZm9yIGRl YnVnIGJ1aWxkcyBhZnRlciByMjQyMzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdP cGVyYXRpb25zLmNwcAppbmRleCA0MWNhNzE2NzUyZWU2YjNkYjZjOWE5NzkyYTEyODY5ZWIyMTgz Y2E0Li44NmJjYTNiNTgwNWJlNDdjY2IzZjExYTJlYjU1OTIzNzc5M2JiZWU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKQEAgLTY4OSw3ICs2ODksOSBA QCBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldEJ5VmFsKEV4ZWNTdGF0 ZSogZXhlYywgRW5jb2RlZEpTVmFsdWUgZQogICAgICAgICB9IGVsc2UgaWYgKHByb3BlcnR5Lmlz U3RyaW5nKCkpIHsKICAgICAgICAgICAgIFN0cnVjdHVyZSYgc3RydWN0dXJlID0gKmJhc2UtPnN0 cnVjdHVyZSh2bSk7CiAgICAgICAgICAgICBpZiAoSlNDZWxsOjpjYW5Vc2VGYXN0R2V0T3duUHJv cGVydHkoc3RydWN0dXJlKSkgewotICAgICAgICAgICAgICAgIGlmIChSZWZQdHI8QXRvbWljU3Ry aW5nSW1wbD4gZXhpc3RpbmdBdG9taWNTdHJpbmcgPSBhc1N0cmluZyhwcm9wZXJ0eSktPnRvRXhp c3RpbmdBdG9taWNTdHJpbmcoZXhlYykpIHsKKyAgICAgICAgICAgICAgICBSZWZQdHI8QXRvbWlj U3RyaW5nSW1wbD4gZXhpc3RpbmdBdG9taWNTdHJpbmcgPSBhc1N0cmluZyhwcm9wZXJ0eSktPnRv RXhpc3RpbmdBdG9taWNTdHJpbmcoZXhlYyk7CisgICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgICAgICAgICAgICAgaWYgKGV4 aXN0aW5nQXRvbWljU3RyaW5nKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChKU1ZhbHVlIHJl c3VsdCA9IGJhc2UtPmZhc3RHZXRPd25Qcm9wZXJ0eSh2bSwgc3RydWN0dXJlLCBleGlzdGluZ0F0 b21pY1N0cmluZy5nZXQoKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gSlNWYWx1 ZTo6ZW5jb2RlKHJlc3VsdCk7CiAgICAgICAgICAgICAgICAgfQpAQCAtNzI0LDcgKzcyNiw5IEBA IEVuY29kZWRKU1ZhbHVlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uR2V0QnlWYWxDZWxsKEV4ZWNT dGF0ZSogZXhlYywgSlNDZWxsKiBiYXNlCiAgICAgfSBlbHNlIGlmIChwcm9wZXJ0eS5pc1N0cmlu ZygpKSB7CiAgICAgICAgIFN0cnVjdHVyZSYgc3RydWN0dXJlID0gKmJhc2UtPnN0cnVjdHVyZSh2 bSk7CiAgICAgICAgIGlmIChKU0NlbGw6OmNhblVzZUZhc3RHZXRPd25Qcm9wZXJ0eShzdHJ1Y3R1 cmUpKSB7Ci0gICAgICAgICAgICBpZiAoUmVmUHRyPEF0b21pY1N0cmluZ0ltcGw+IGV4aXN0aW5n QXRvbWljU3RyaW5nID0gYXNTdHJpbmcocHJvcGVydHkpLT50b0V4aXN0aW5nQXRvbWljU3RyaW5n KGV4ZWMpKSB7CisgICAgICAgICAgICBSZWZQdHI8QXRvbWljU3RyaW5nSW1wbD4gZXhpc3RpbmdB dG9taWNTdHJpbmcgPSBhc1N0cmluZyhwcm9wZXJ0eSktPnRvRXhpc3RpbmdBdG9taWNTdHJpbmco ZXhlYyk7CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNW YWx1ZSgpKTsKKyAgICAgICAgICAgIGlmIChleGlzdGluZ0F0b21pY1N0cmluZykgewogICAgICAg ICAgICAgICAgIGlmIChKU1ZhbHVlIHJlc3VsdCA9IGJhc2UtPmZhc3RHZXRPd25Qcm9wZXJ0eSh2 bSwgc3RydWN0dXJlLCBleGlzdGluZ0F0b21pY1N0cmluZy5nZXQoKSkpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKICAgICAgICAgICAgIH0KQEAg LTE0NDUsNyArMTQ0OSw5IEBAIEVuY29kZWRKU1ZhbHVlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9u R2V0QnlWYWxXaXRoVGhpcyhFeGVjU3RhdGUqIGV4ZWMsIEVuY29kZWRKCiAgICAgaWYgKExJS0VM WShiYXNlVmFsdWUuaXNDZWxsKCkgJiYgc3Vic2NyaXB0LmlzU3RyaW5nKCkpKSB7CiAgICAgICAg IFN0cnVjdHVyZSYgc3RydWN0dXJlID0gKmJhc2VWYWx1ZS5hc0NlbGwoKS0+c3RydWN0dXJlKHZt KTsKICAgICAgICAgaWYgKEpTQ2VsbDo6Y2FuVXNlRmFzdEdldE93blByb3BlcnR5KHN0cnVjdHVy ZSkpIHsKLSAgICAgICAgICAgIGlmIChSZWZQdHI8QXRvbWljU3RyaW5nSW1wbD4gZXhpc3RpbmdB dG9taWNTdHJpbmcgPSBhc1N0cmluZyhzdWJzY3JpcHQpLT50b0V4aXN0aW5nQXRvbWljU3RyaW5n KGV4ZWMpKSB7CisgICAgICAgICAgICBSZWZQdHI8QXRvbWljU3RyaW5nSW1wbD4gZXhpc3RpbmdB dG9taWNTdHJpbmcgPSBhc1N0cmluZyhzdWJzY3JpcHQpLT50b0V4aXN0aW5nQXRvbWljU3RyaW5n KGV4ZWMpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpT VmFsdWUoKSk7CisgICAgICAgICAgICBpZiAoZXhpc3RpbmdBdG9taWNTdHJpbmcpIHsKICAgICAg ICAgICAgICAgICBpZiAoSlNWYWx1ZSByZXN1bHQgPSBiYXNlVmFsdWUuYXNDZWxsKCktPmZhc3RH ZXRPd25Qcm9wZXJ0eSh2bSwgc3RydWN0dXJlLCBleGlzdGluZ0F0b21pY1N0cmluZy5nZXQoKSkp CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKICAg ICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bl cmF0aW9ucy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3Bw CmluZGV4IDVmZmU4ZTAyMTA2MGE2MGFjZGQ4YjBiNzMwMDk1MDllYzAxMDViNmUuLmYyNGZmMThk ZDRjMzhmNjQxMjRjZmZlY2YyMjIwYmRjMGVmOWFjZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcApAQCAtMTgwNiw3ICsxODA2LDkgQEAgc3RhdGljIEpT VmFsdWUgZ2V0QnlWYWwoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgSlNWYWx1 ZSBzdWJzY3JpcHQsIEIKICAgICBpZiAoTElLRUxZKGJhc2VWYWx1ZS5pc0NlbGwoKSAmJiBzdWJz Y3JpcHQuaXNTdHJpbmcoKSkpIHsKICAgICAgICAgU3RydWN0dXJlJiBzdHJ1Y3R1cmUgPSAqYmFz ZVZhbHVlLmFzQ2VsbCgpLT5zdHJ1Y3R1cmUodm0pOwogICAgICAgICBpZiAoSlNDZWxsOjpjYW5V c2VGYXN0R2V0T3duUHJvcGVydHkoc3RydWN0dXJlKSkgewotICAgICAgICAgICAgaWYgKFJlZlB0 cjxBdG9taWNTdHJpbmdJbXBsPiBleGlzdGluZ0F0b21pY1N0cmluZyA9IGFzU3RyaW5nKHN1YnNj cmlwdCktPnRvRXhpc3RpbmdBdG9taWNTdHJpbmcoZXhlYykpIHsKKyAgICAgICAgICAgIFJlZlB0 cjxBdG9taWNTdHJpbmdJbXBsPiBleGlzdGluZ0F0b21pY1N0cmluZyA9IGFzU3RyaW5nKHN1YnNj cmlwdCktPnRvRXhpc3RpbmdBdG9taWNTdHJpbmcoZXhlYyk7CisgICAgICAgICAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHNjb3BlLCBKU1ZhbHVlKCkpOworICAgICAgICAgICAgaWYgKGV4aXN0aW5n QXRvbWljU3RyaW5nKSB7CiAgICAgICAgICAgICAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0gYmFz ZVZhbHVlLmFzQ2VsbCgpLT5mYXN0R2V0T3duUHJvcGVydHkodm0sIHN0cnVjdHVyZSwgZXhpc3Rp bmdBdG9taWNTdHJpbmcuZ2V0KCkpKSB7CiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVChleGVj LT5ieXRlY29kZU9mZnNldCgpKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGJ5VmFsSW5mby0+ c3R1YkluZm8gJiYgYnlWYWxJbmZvLT5jYWNoZWRJZC5pbXBsKCkgIT0gZXhpc3RpbmdBdG9taWNT dHJpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93 UGF0aHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNw cAppbmRleCAwNDA2YzkyYTc2M2JjOGFkNWEwN2YxM2U1ZjlhNzE5ZDdiNzU5ODE3Li44YjU0MzYy NDkwMDAzMDkxMTMzOTEzNTgwN2I1Yzg5MjI3YzFjYzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAKQEAgLTk0Miw3ICs5NDIsOSBAQCBzdGF0 aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGdldEJ5VmFsKFZNJiB2bSwgRXhlY1N0YXRlKiBleGVj LCBPcEdldEJ5VmFsIGJ5dGVjbwogICAgIGlmIChMSUtFTFkoYmFzZVZhbHVlLmlzQ2VsbCgpICYm IHN1YnNjcmlwdC5pc1N0cmluZygpKSkgewogICAgICAgICBTdHJ1Y3R1cmUmIHN0cnVjdHVyZSA9 ICpiYXNlVmFsdWUuYXNDZWxsKCktPnN0cnVjdHVyZSh2bSk7CiAgICAgICAgIGlmIChKU0NlbGw6 OmNhblVzZUZhc3RHZXRPd25Qcm9wZXJ0eShzdHJ1Y3R1cmUpKSB7Ci0gICAgICAgICAgICBpZiAo UmVmUHRyPEF0b21pY1N0cmluZ0ltcGw+IGV4aXN0aW5nQXRvbWljU3RyaW5nID0gYXNTdHJpbmco c3Vic2NyaXB0KS0+dG9FeGlzdGluZ0F0b21pY1N0cmluZyhleGVjKSkgeworICAgICAgICAgICAg UmVmUHRyPEF0b21pY1N0cmluZ0ltcGw+IGV4aXN0aW5nQXRvbWljU3RyaW5nID0gYXNTdHJpbmco c3Vic2NyaXB0KS0+dG9FeGlzdGluZ0F0b21pY1N0cmluZyhleGVjKTsKKyAgICAgICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAgICAgICBpZiAoZXhp c3RpbmdBdG9taWNTdHJpbmcpIHsKICAgICAgICAgICAgICAgICBpZiAoSlNWYWx1ZSByZXN1bHQg PSBiYXNlVmFsdWUuYXNDZWxsKCktPmZhc3RHZXRPd25Qcm9wZXJ0eSh2bSwgc3RydWN0dXJlLCBl eGlzdGluZ0F0b21pY1N0cmluZy5nZXQoKSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBy ZXN1bHQ7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQ29tbW9uU2xvd1BhdGhzLmNwcAppbmRleCA1ODcxYzkzMGJiYzhlMDY2MzYxMTBlYTRjNjc2 OWIyMDIzNDA3NTFkLi5iOGQ4YmRiZWQzODA0MWM4MmU0NDI2NjA3ZTFlOGJjMmM0M2NhOWNkIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5j cHAKQEAgLTExMjUsNyArMTEyNSw5IEBAIFNMT1dfUEFUSF9ERUNMKHNsb3dfcGF0aF9nZXRfYnlf dmFsX3dpdGhfdGhpcykKICAgICBpZiAoTElLRUxZKGJhc2VWYWx1ZS5pc0NlbGwoKSAmJiBzdWJz Y3JpcHQuaXNTdHJpbmcoKSkpIHsKICAgICAgICAgU3RydWN0dXJlJiBzdHJ1Y3R1cmUgPSAqYmFz ZVZhbHVlLmFzQ2VsbCgpLT5zdHJ1Y3R1cmUodm0pOwogICAgICAgICBpZiAoSlNDZWxsOjpjYW5V c2VGYXN0R2V0T3duUHJvcGVydHkoc3RydWN0dXJlKSkgewotICAgICAgICAgICAgaWYgKFJlZlB0 cjxBdG9taWNTdHJpbmdJbXBsPiBleGlzdGluZ0F0b21pY1N0cmluZyA9IGFzU3RyaW5nKHN1YnNj cmlwdCktPnRvRXhpc3RpbmdBdG9taWNTdHJpbmcoZXhlYykpIHsKKyAgICAgICAgICAgIFJlZlB0 cjxBdG9taWNTdHJpbmdJbXBsPiBleGlzdGluZ0F0b21pY1N0cmluZyA9IGFzU3RyaW5nKHN1YnNj cmlwdCktPnRvRXhpc3RpbmdBdG9taWNTdHJpbmcoZXhlYyk7CisgICAgICAgICAgICBDSEVDS19F WENFUFRJT04oKTsKKyAgICAgICAgICAgIGlmIChleGlzdGluZ0F0b21pY1N0cmluZykgewogICAg ICAgICAgICAgICAgIGlmIChKU1ZhbHVlIHJlc3VsdCA9IGJhc2VWYWx1ZS5hc0NlbGwoKS0+ZmFz dEdldE93blByb3BlcnR5KHZtLCBzdHJ1Y3R1cmUsIGV4aXN0aW5nQXRvbWljU3RyaW5nLmdldCgp KSkKICAgICAgICAgICAgICAgICAgICAgUkVUVVJOX1BST0ZJTEVEKHJlc3VsdCk7CiAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0cmlu Zy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0cmluZy5jcHAKaW5kZXgg YzgzNmZhMmUyZGZhOTljNjQ2NzhiMzk2ODY0ZTdjZWM0MmZkYmYzZS4uMGQyMTE4ODQzMzNjZWIz ZWIyYjE2YzlmYTdjMDk4ODBkYTI2MmYwMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNTdHJpbmcuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTU3RyaW5nLmNwcApAQCAtMjcwLDE4ICsyNzAsMTggQEAgUmVmUHRyPEF0b21pY1N0cmlu Z0ltcGw+IEpTUm9wZVN0cmluZzo6cmVzb2x2ZVJvcGVUb0V4aXN0aW5nQXRvbWljU3RyaW5nKEV4 ZWNTdGEKICAgICAgICAgcmVzb2x2ZVJvcGVJbnRlcm5hbDgoYnVmZmVyKTsKICAgICAgICAgaWYg KFJlZlB0cjxBdG9taWNTdHJpbmdJbXBsPiBleGlzdGluZ0F0b21pY1N0cmluZyA9IEF0b21pY1N0 cmluZ0ltcGw6Omxvb2tVcChidWZmZXIsIGxlbmd0aCgpKSkgewogICAgICAgICAgICAgY29udmVy dFRvTm9uUm9wZSgqZXhpc3RpbmdBdG9taWNTdHJpbmcpOwotICAgICAgICAgICAgcmV0dXJuIGV4 aXN0aW5nQXRvbWljU3RyaW5nOworICAgICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3Bl LCBleGlzdGluZ0F0b21pY1N0cmluZyk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAg ICBVQ2hhciBidWZmZXJbbWF4TGVuZ3RoRm9yT25TdGFja1Jlc29sdmVdOwogICAgICAgICByZXNv bHZlUm9wZUludGVybmFsMTYoYnVmZmVyKTsKICAgICAgICAgaWYgKFJlZlB0cjxBdG9taWNTdHJp bmdJbXBsPiBleGlzdGluZ0F0b21pY1N0cmluZyA9IEF0b21pY1N0cmluZ0ltcGw6Omxvb2tVcChi dWZmZXIsIGxlbmd0aCgpKSkgewogICAgICAgICAgICAgY29udmVydFRvTm9uUm9wZSgqZXhpc3Rp bmdBdG9taWNTdHJpbmcpOwotICAgICAgICAgICAgcmV0dXJuIGV4aXN0aW5nQXRvbWljU3RyaW5n OworICAgICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBleGlzdGluZ0F0b21pY1N0 cmluZyk7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICByZXR1cm4gbnVsbHB0cjsKKyAgICBSRUxF QVNFX0FORF9SRVRVUk4oc2NvcGUsIG51bGxwdHIpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBG dW5jdGlvbj4K