233751 2021-12-01 23:36:12 -0800 Improve dictionary-based DOMPromiseDeferred::settle 2021-12-03 09:36:22 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233523 1 youennf youennf cdumez webkit-bug-importer oldest_to_newest 1819593 0 youennf 2021-12-01 23:36:12 -0800 Improve dictionary-based DOMPromiseDeferred::settle 1819595 1 445680 youennf 2021-12-01 23:57:46 -0800 Created attachment 445680 Patch 1820120 2 445680 cdumez 2021-12-03 07:22:43 -0800 Comment on attachment 445680 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445680&action=review r=me > Source/WebCore/ChangeLog:9 > + Update call sites that use settle for non ExceptionOr types as they shouldeither use reject or resolve directly. typo: shouldeither 1820176 3 cdumez 2021-12-03 09:35:36 -0800 Committed r286496 (244835@main): <https://commits.webkit.org/244835@main> 1820179 4 webkit-bug-importer 2021-12-03 09:36:22 -0800 <rdar://problem/86021792> 445680 2021-12-01 23:57:46 -0800 2021-12-03 07:22:43 -0800 Patch bug-233751-20211202085745.patch text/plain 9905 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM0Y2U1Y2Y1OTJiZjkw MDM0ZGJlMzgwN2I1ZmY3OGVmYTg2MDVlMy4uNTBmMzE0OTJkMmJmOTk2MDk1NzBlZDhhNWRhMmE0 MjU4ODIyN2ZhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTEyLTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIGRpY3Rpb25h cnktYmFzZWQgRE9NUHJvbWlzZURlZmVycmVkOjpzZXR0bGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzc1MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ugc2V0dGxlIGEgdGVtcGxhdGVkIGZ1bmN0 aW9uIHNvIHRoYXQgaXQgY2FuIGFkYXB0IHRvIGFueSBFeGNlcHRpb25PciBiYXNlZCB0eXBlLgor ICAgICAgICBVcGRhdGUgY2FsbCBzaXRlcyB0aGF0IHVzZSBzZXR0bGUgZm9yIG5vbiBFeGNlcHRp b25PciB0eXBlcyBhcyB0aGV5IHNob3VsZGVpdGhlciB1c2UgcmVqZWN0IG9yIHJlc29sdmUgZGly ZWN0bHkuCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBN b2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2V0dXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw bGVQYXlTZXR1cDo6Z2V0U2V0dXBGZWF0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpBcHBsZVBh eVNldHVwOjpiZWdpbik6CisgICAgICAgIChXZWJDb3JlOjpBcHBsZVBheVNldHVwOjpzdG9wKToK KyAgICAgICAgKiBNb2R1bGVzL2ZpbGVzeXN0ZW1hY2Nlc3MvRmlsZVN5c3RlbURpcmVjdG9yeUhh bmRsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxlU3lzdGVtRGlyZWN0b3J5SGFuZGxlOjpn ZXRGaWxlSGFuZGxlKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVTeXN0ZW1EaXJlY3RvcnlIYW5k bGU6OmdldERpcmVjdG9yeUhhbmRsZSk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlU3lzdGVtRGly ZWN0b3J5SGFuZGxlOjpyZXNvbHZlKToKKyAgICAgICAgKiBNb2R1bGVzL2ZpbGVzeXN0ZW1hY2Nl c3MvRmlsZVN5c3RlbUZpbGVIYW5kbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVN5c3Rl bUZpbGVIYW5kbGU6OmNyZWF0ZVN5bmNBY2Nlc3NIYW5kbGUpOgorICAgICAgICAqIGJpbmRpbmdz L2pzL0pTRE9NUHJvbWlzZURlZmVycmVkLmg6CisgICAgICAgIChXZWJDb3JlOjpET01Qcm9taXNl RGVmZXJyZWQ6OnNldHRsZSk6CisgICAgICAgIChXZWJDb3JlOjpET01Qcm9taXNlRGVmZXJyZWQ8 SURMRGljdGlvbmFyeTxUPj46OnJlc29sdmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 RE9NUHJvbWlzZURlZmVycmVkPElETERpY3Rpb25hcnk8VD4+OjpzZXR0bGUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6RE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxUPj46OnJl c29sdmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RE9NUHJvbWlzZURlZmVycmVkPElE TEludGVyZmFjZTxUPj46OnNldHRsZSk6IERlbGV0ZWQuCisgICAgICAgICogd29ya2Vycy9zZXJ2 aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Vydmlj ZVdvcmtlckNvbnRhaW5lcjo6Z2V0TmF2aWdhdGlvblByZWxvYWRTdGF0ZSk6CisKIDIwMjEtMTIt MDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBw b3J0IGZvciBOYXZpZ2F0aW9uUHJlbG9hZE1hbmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTZXR1cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2V0dXAuY3BwCmluZGV4IGUxZjQ4NDFiMGM3OTVmY2E2 ZTk5OWYzNDYwMWM3OTIwNjVlZjdiOTEuLmRmYzZiOTU0YTVjZTZkOTc1Yzk0MzVhMDQxOGE2MmEz ZjMzMGM4NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBw bGVQYXlTZXR1cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBs ZVBheVNldHVwLmNwcApAQCAtNTMsNyArNTMsNyBAQCB2b2lkIEFwcGxlUGF5U2V0dXA6OmdldFNl dHVwRmVhdHVyZXMoRG9jdW1lbnQmIGRvY3VtZW50LCBTZXR1cEZlYXR1cmVzUHJvbWlzZSYmCiB7 CiAgICAgYXV0byBjYW5DYWxsID0gUGF5bWVudFNlc3Npb246OmNhbkNyZWF0ZVNlc3Npb24oZG9j dW1lbnQpOwogICAgIGlmIChjYW5DYWxsLmhhc0V4Y2VwdGlvbigpKSB7Ci0gICAgICAgIHByb21p c2Uuc2V0dGxlKGNhbkNhbGwucmVsZWFzZUV4Y2VwdGlvbigpKTsKKyAgICAgICAgcHJvbWlzZS5y ZWplY3QoY2FuQ2FsbC5yZWxlYXNlRXhjZXB0aW9uKCkpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCkBAIC03OCw3ICs3OCw3IEBAIHZvaWQgQXBwbGVQYXlTZXR1cDo6Z2V0U2V0dXBGZWF0dXJl cyhEb2N1bWVudCYgZG9jdW1lbnQsIFNldHVwRmVhdHVyZXNQcm9taXNlJiYKIAogICAgIHBhZ2Ut PnBheW1lbnRDb29yZGluYXRvcigpLmdldFNldHVwRmVhdHVyZXMobV9jb25maWd1cmF0aW9uLCBk b2N1bWVudC51cmwoKSwgW3RoaXMsIHBlbmRpbmdBY3Rpdml0eSA9IG1ha2VQZW5kaW5nQWN0aXZp dHkoKnRoaXMpXShWZWN0b3I8UmVmPEFwcGxlUGF5U2V0dXBGZWF0dXJlPj4mJiBzZXR1cEZlYXR1 cmVzKSB7CiAgICAgICAgIGlmIChtX3NldHVwRmVhdHVyZXNQcm9taXNlKQotICAgICAgICAgICAg c3RkOjpleGNoYW5nZShtX3NldHVwRmVhdHVyZXNQcm9taXNlLCBzdGQ6Om51bGxvcHQpLT5zZXR0 bGUoV1RGTW92ZShzZXR1cEZlYXR1cmVzKSk7CisgICAgICAgICAgICBzdGQ6OmV4Y2hhbmdlKG1f c2V0dXBGZWF0dXJlc1Byb21pc2UsIHN0ZDo6bnVsbG9wdCktPnJlc29sdmUoV1RGTW92ZShzZXR1 cEZlYXR1cmVzKSk7CiAgICAgfSk7CiB9CiAKQEAgLTg2LDcgKzg2LDcgQEAgdm9pZCBBcHBsZVBh eVNldHVwOjpiZWdpbihEb2N1bWVudCYgZG9jdW1lbnQsIFZlY3RvcjxSZWZQdHI8QXBwbGVQYXlT ZXR1cEZlYXR1cmUKIHsKICAgICBhdXRvIGNhbkNhbGwgPSBQYXltZW50U2Vzc2lvbjo6Y2FuQ3Jl YXRlU2Vzc2lvbihkb2N1bWVudCk7CiAgICAgaWYgKGNhbkNhbGwuaGFzRXhjZXB0aW9uKCkpIHsK LSAgICAgICAgcHJvbWlzZS5zZXR0bGUoY2FuQ2FsbC5yZWxlYXNlRXhjZXB0aW9uKCkpOworICAg ICAgICBwcm9taXNlLnJlamVjdChjYW5DYWxsLnJlbGVhc2VFeGNlcHRpb24oKSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIEFwcGxlUGF5U2V0dXA6 OmJlZ2luKERvY3VtZW50JiBkb2N1bWVudCwgVmVjdG9yPFJlZlB0cjxBcHBsZVBheVNldHVwRmVh dHVyZQogCiAgICAgcGFnZS0+cGF5bWVudENvb3JkaW5hdG9yKCkuYmVnaW5BcHBsZVBheVNldHVw KG1fY29uZmlndXJhdGlvbiwgZG9jdW1lbnQudXJsKCksIFdURk1vdmUoZmVhdHVyZXMpLCBbdGhp c10oYm9vbCByZXN1bHQpIHsKICAgICAgICAgaWYgKG1fYmVnaW5Qcm9taXNlKQotICAgICAgICAg ICAgc3RkOjpleGNoYW5nZShtX2JlZ2luUHJvbWlzZSwgc3RkOjpudWxsb3B0KS0+c2V0dGxlKHJl c3VsdCk7CisgICAgICAgICAgICBzdGQ6OmV4Y2hhbmdlKG1fYmVnaW5Qcm9taXNlLCBzdGQ6Om51 bGxvcHQpLT5yZXNvbHZlKHJlc3VsdCk7CiAgICAgfSk7CiB9CiAKQEAgLTEyNSwxMCArMTI1LDEw IEBAIEFwcGxlUGF5U2V0dXA6OkFwcGxlUGF5U2V0dXAoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYg Y29udGV4dCwgQXBwbGVQYXlTZXR1cENvbmZpCiB2b2lkIEFwcGxlUGF5U2V0dXA6OnN0b3AoKQog ewogICAgIGlmIChtX3NldHVwRmVhdHVyZXNQcm9taXNlKQotICAgICAgICBzdGQ6OmV4Y2hhbmdl KG1fc2V0dXBGZWF0dXJlc1Byb21pc2UsIHN0ZDo6bnVsbG9wdCktPnNldHRsZShFeGNlcHRpb24g eyBBYm9ydEVycm9yIH0pOworICAgICAgICBzdGQ6OmV4Y2hhbmdlKG1fc2V0dXBGZWF0dXJlc1By b21pc2UsIHN0ZDo6bnVsbG9wdCktPnJlamVjdChFeGNlcHRpb24geyBBYm9ydEVycm9yIH0pOwog CiAgICAgaWYgKG1fYmVnaW5Qcm9taXNlKQotICAgICAgICBzdGQ6OmV4Y2hhbmdlKG1fYmVnaW5Q cm9taXNlLCBzdGQ6Om51bGxvcHQpLT5zZXR0bGUoRXhjZXB0aW9uIHsgQWJvcnRFcnJvciB9KTsK KyAgICAgICAgc3RkOjpleGNoYW5nZShtX2JlZ2luUHJvbWlzZSwgc3RkOjpudWxsb3B0KS0+cmVq ZWN0KEV4Y2VwdGlvbiB7IEFib3J0RXJyb3IgfSk7CiAKICAgICBpZiAoYXV0byBwYWdlID0gZG93 bmNhc3Q8RG9jdW1lbnQ+KCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpLnBhZ2UoKSkKICAgICAg ICAgcGFnZS0+cGF5bWVudENvb3JkaW5hdG9yKCkuZW5kQXBwbGVQYXlTZXR1cCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtYWNjZXNzL0ZpbGVTeXN0ZW1E aXJlY3RvcnlIYW5kbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtYWNj ZXNzL0ZpbGVTeXN0ZW1EaXJlY3RvcnlIYW5kbGUuY3BwCmluZGV4IDg4NjBjYzdiMzU3YjZmOTA2 M2JlYmIwMjlmOTAzMDliYjJlY2YxYzcuLmM5N2RhOWFjYTk1NjBjMWE2OTNmODgyNjZjZDllNjA0 YTE5M2E0YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbWFj Y2Vzcy9GaWxlU3lzdGVtRGlyZWN0b3J5SGFuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2ZpbGVzeXN0ZW1hY2Nlc3MvRmlsZVN5c3RlbURpcmVjdG9yeUhhbmRsZS5jcHAKQEAg LTYzLDcgKzYzLDcgQEAgdm9pZCBGaWxlU3lzdGVtRGlyZWN0b3J5SGFuZGxlOjpnZXRGaWxlSGFu ZGxlKGNvbnN0IFN0cmluZyYgbmFtZSwgc3RkOjpvcHRpb25hbDwKICAgICAgICAgICAgIHJldHVy biBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciwgIkNvbnRleHQg aGFzIHN0b3BwZWQiX3MgfSk7CiAgICAgICAgIH0KIAotICAgICAgICBwcm9taXNlLnNldHRsZShG aWxlU3lzdGVtRmlsZUhhbmRsZTo6Y3JlYXRlKCpjb250ZXh0LCBTdHJpbmcgeyBuYW1lIH0sIHJl c3VsdC5yZXR1cm5WYWx1ZSgpLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKSk7CisgICAgICAgIHByb21p c2UucmVzb2x2ZShGaWxlU3lzdGVtRmlsZUhhbmRsZTo6Y3JlYXRlKCpjb250ZXh0LCBTdHJpbmcg eyBuYW1lIH0sIHJlc3VsdC5yZXR1cm5WYWx1ZSgpLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKSk7CiAg ICAgfSk7CiB9CiAKQEAgLTg0LDcgKzg0LDcgQEAgdm9pZCBGaWxlU3lzdGVtRGlyZWN0b3J5SGFu ZGxlOjpnZXREaXJlY3RvcnlIYW5kbGUoY29uc3QgU3RyaW5nJiBuYW1lLCBzdGQ6Om9wdGkKICAg ICAgICAgICAgIHJldHVybiBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVF cnJvciwgIkNvbnRleHQgaGFzIHN0b3BwZWQiX3MgfSk7CiAgICAgICAgIH0KIAotICAgICAgICBw cm9taXNlLnNldHRsZShGaWxlU3lzdGVtRGlyZWN0b3J5SGFuZGxlOjpjcmVhdGUoKmNvbnRleHQs IFN0cmluZyB7IG5hbWUgfSwgaWRlbnRpZmllciwgV1RGTW92ZShjb25uZWN0aW9uKSkpOworICAg ICAgICBwcm9taXNlLnJlc29sdmUoRmlsZVN5c3RlbURpcmVjdG9yeUhhbmRsZTo6Y3JlYXRlKCpj b250ZXh0LCBTdHJpbmcgeyBuYW1lIH0sIGlkZW50aWZpZXIsIFdURk1vdmUoY29ubmVjdGlvbikp KTsKICAgICB9KTsKIH0KIApAQCAtMTA1LDEwICsxMDUsNyBAQCB2b2lkIEZpbGVTeXN0ZW1EaXJl Y3RvcnlIYW5kbGU6OnJlc29sdmUoY29uc3QgRmlsZVN5c3RlbUhhbmRsZSYgaGFuZGxlLCBET01Q cm9taQogICAgICAgICByZXR1cm4gcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZFN0 YXRlRXJyb3IsICJIYW5kbGUgaXMgY2xvc2VkIl9zIH0pOwogCiAgICAgY29ubmVjdGlvbigpLnJl c29sdmUoaWRlbnRpZmllcigpLCBoYW5kbGUuaWRlbnRpZmllcigpLCBbcHJvbWlzZSA9IFdURk1v dmUocHJvbWlzZSldKGF1dG8gcmVzdWx0KSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKHJlc3VsdC5o YXNFeGNlcHRpb24oKSkKLSAgICAgICAgICAgIHJldHVybiBwcm9taXNlLnJlamVjdChyZXN1bHQu cmVsZWFzZUV4Y2VwdGlvbigpKTsKLQotICAgICAgICBwcm9taXNlLnJlc29sdmUocmVzdWx0LnJl bGVhc2VSZXR1cm5WYWx1ZSgpKTsKKyAgICAgICAgcHJvbWlzZS5zZXR0bGUoV1RGTW92ZShyZXN1 bHQpKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9m aWxlc3lzdGVtYWNjZXNzL0ZpbGVTeXN0ZW1GaWxlSGFuZGxlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvZmlsZXN5c3RlbWFjY2Vzcy9GaWxlU3lzdGVtRmlsZUhhbmRsZS5jcHAKaW5kZXgg Yjg2ODJmNzY5MTYxNmUwZGIxNGU1NDEyMmNjMTM1YjUxNDE3N2NhNy4uOGYxZmI1ZmRlNzFhMzlh NmZhMjdhNjYxZjZmZmNkMzE1NjQ5MzExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9maWxlc3lzdGVtYWNjZXNzL0ZpbGVTeXN0ZW1GaWxlSGFuZGxlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW1hY2Nlc3MvRmlsZVN5c3RlbUZpbGVIYW5kbGUu Y3BwCkBAIC04Niw3ICs4Niw3IEBAIHZvaWQgRmlsZVN5c3RlbUZpbGVIYW5kbGU6OmNyZWF0ZVN5 bmNBY2Nlc3NIYW5kbGUoRE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjCiAgICAgICAgICAg ICByZXR1cm4gcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IsICJD b250ZXh0IGhhcyBzdG9wcGVkIl9zIH0pOwogICAgICAgICB9CiAKLSAgICAgICAgcHJvbWlzZS5z ZXR0bGUoRmlsZVN5c3RlbVN5bmNBY2Nlc3NIYW5kbGU6OmNyZWF0ZSgqY29udGV4dCwgcHJvdGVj dGVkVGhpcy5nZXQoKSwgaWRlbnRpZmllciwgZmlsZSkpOworICAgICAgICBwcm9taXNlLnJlc29s dmUoRmlsZVN5c3RlbVN5bmNBY2Nlc3NIYW5kbGU6OmNyZWF0ZSgqY29udGV4dCwgcHJvdGVjdGVk VGhpcy5nZXQoKSwgaWRlbnRpZmllciwgZmlsZSkpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVByb21pc2VEZWZlcnJlZC5oIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Qcm9taXNlRGVmZXJyZWQuaAppbmRleCAxNjQy ZWY0NGE1ZDliZDRjZWUwODY3NzcyMTgxMzJjMmU3OGE5ZWUxLi5iODc0ZjJhMDQyYzk5YmRmMzlm YjgzOTEwMTFiZmIxOTI4YjEzMzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTVByb21pc2VEZWZlcnJlZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTRE9NUHJvbWlzZURlZmVycmVkLmgKQEAgLTI3NCw0MCArMjc0LDggQEAgcHVibGljOgog ICAgICAgICBtX3Byb21pc2UtPnJlc29sdmU8SURMVHlwZT4oc3RkOjpmb3J3YXJkPHR5cGVuYW1l IElETFR5cGU6OlBhcmFtZXRlclR5cGU+KHZhbHVlKSk7CiAgICAgfQogCi0gICAgdm9pZCBzZXR0 bGUoRXhjZXB0aW9uT3I8dHlwZW5hbWUgSURMVHlwZTo6UGFyYW1ldGVyVHlwZT4mJiByZXN1bHQp Ci0gICAgewotICAgICAgICBpZiAocmVzdWx0Lmhhc0V4Y2VwdGlvbigpKSB7Ci0gICAgICAgICAg ICByZWplY3QocmVzdWx0LnJlbGVhc2VFeGNlcHRpb24oKSk7Ci0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIH0KLSAgICAgICAgcmVzb2x2ZShyZXN1bHQucmVsZWFzZVJldHVyblZhbHVlKCkp OwotICAgIH0KLX07Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQ+Ci1jbGFzcyBET01Qcm9taXNlRGVm ZXJyZWQ8SURMSW50ZXJmYWNlPFQ+PiA6IHB1YmxpYyBET01Qcm9taXNlRGVmZXJyZWRCYXNlIHsK LXB1YmxpYzoKLSAgICB1c2luZyBET01Qcm9taXNlRGVmZXJyZWRCYXNlOjpET01Qcm9taXNlRGVm ZXJyZWRCYXNlOwotICAgIHVzaW5nIERPTVByb21pc2VEZWZlcnJlZEJhc2U6Om9wZXJhdG9yPTsK LSAgICB1c2luZyBET01Qcm9taXNlRGVmZXJyZWRCYXNlOjpwcm9taXNlOwotICAgIHVzaW5nIERP TVByb21pc2VEZWZlcnJlZEJhc2U6OnJlamVjdDsKLSAgICB1c2luZyBJRExUeXBlID0gSURMSW50 ZXJmYWNlPFQ+OwotCi0gICAgdm9pZCByZXNvbHZlKHR5cGVuYW1lIElETFR5cGU6OklubmVyUGFy YW1ldGVyVHlwZSB2YWx1ZSkKLSAgICB7Ci0gICAgICAgIG1fcHJvbWlzZS0+cmVzb2x2ZTxJRExU eXBlPihzdGQ6OmZvcndhcmQ8dHlwZW5hbWUgSURMVHlwZTo6UGFyYW1ldGVyVHlwZT4odmFsdWUp KTsKLSAgICB9Ci0KLSAgICB2b2lkIHNldHRsZShFeGNlcHRpb25Pcjx0eXBlbmFtZSBJRExUeXBl OjpJbm5lclBhcmFtZXRlclR5cGU+JiYgcmVzdWx0KQotICAgIHsKLSAgICAgICAgaWYgKHJlc3Vs dC5oYXNFeGNlcHRpb24oKSkgewotICAgICAgICAgICAgcmVqZWN0KHJlc3VsdC5yZWxlYXNlRXhj ZXB0aW9uKCkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIHJlc29s dmUocmVzdWx0LnJlbGVhc2VSZXR1cm5WYWx1ZSgpKTsKLSAgICB9Ci0KLSAgICB2b2lkIHNldHRs ZShFeGNlcHRpb25Pcjx0eXBlbmFtZSBJRExUeXBlOjpQYXJhbWV0ZXJUeXBlPiYmIHJlc3VsdCkK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPgorICAgIHZvaWQgc2V0dGxlKEV4Y2VwdGlvbk9yPFU+ JiYgcmVzdWx0KQogICAgIHsKICAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewog ICAgICAgICAgICAgcmVqZWN0KHJlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWlu ZXIuY3BwCmluZGV4IGI0MjI4OGNhYjNlMWM5NDBlZmQ5M2Q1Mzg3MGQ1NTkyYmE4MjhhMjguLjg5 NDYxNDA5NmYyMjk1MGQ2MTE5YTRhNzk2NzMzMmVlYzdlNjI1MDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5j cHAKQEAgLTY3MSwxMSArNjcxLDcgQEAgdm9pZCBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpzZXRO YXZpZ2F0aW9uUHJlbG9hZEhlYWRlclZhbHVlKFNlcnZpY2VXb3JrZXJSZWdpc3QKIHZvaWQgU2Vy dmljZVdvcmtlckNvbnRhaW5lcjo6Z2V0TmF2aWdhdGlvblByZWxvYWRTdGF0ZShTZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciBpZGVudGlmaWVyLCBOYXZpZ2F0aW9uUHJlbG9hZFN0 YXRlUHJvbWlzZSYmIHByb21pc2UpCiB7CiAgICAgZW5zdXJlU1dDbGllbnRDb25uZWN0aW9uKCku Z2V0TmF2aWdhdGlvblByZWxvYWRTdGF0ZShpZGVudGlmaWVyLCBbcHJvbWlzZSA9IFdURk1vdmUo cHJvbWlzZSldKGF1dG8mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBpZiAocmVzdWx0Lmhh c0V4Y2VwdGlvbigpKSB7Ci0gICAgICAgICAgICBwcm9taXNlLnJlamVjdChyZXN1bHQucmVsZWFz ZUV4Y2VwdGlvbigpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBw cm9taXNlLnJlc29sdmUocmVzdWx0LnJlbGVhc2VSZXR1cm5WYWx1ZSgpKTsKKyAgICAgICAgcHJv bWlzZS5zZXR0bGUoV1RGTW92ZShyZXN1bHQpKTsKICAgICB9KTsKIH0KIAo=