203126 2019-10-17 16:46:34 -0700 Add missing checks after calls to the sameValue() JSValue comparator. 2019-10-17 21:36:45 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1581218 0 mark.lam 2019-10-17 16:46:34 -0700 <rdar://problem/56366561> 1581222 1 381250 mark.lam 2019-10-17 16:50:07 -0700 Created attachment 381250 proposed patch. 1581292 2 mark.lam 2019-10-17 21:36:45 -0700 Thanks for the review. Landed in r251274: <http://trac.webkit.org/r251274>. 381250 2019-10-17 16:50:07 -0700 2019-10-17 16:57:43 -0700 proposed patch. bug-203126.patch text/plain 12316 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTEyNjcpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDE5LTEwLTE3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgbWlzc2luZyBjaGVja3MgYWZ0ZXIgY2FsbHMgdG8gdGhlIHNhbWVW YWx1ZSgpIEpTVmFsdWUgY29tcGFyYXRvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwMzEyNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYzNjY1 NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBz dHJlc3MvdmFsaWRhdGUtZXhjZXB0aW9uLWNoZWNrLWluLXByb3h5LW9iamVjdC1wdXQuanM6IEFk ZGVkLgorCiAyMDE5LTEwLTE2ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1vdmUgYXNzZXJ0IGluIFdhc206OlBsYW46OmZhaWwuCkluZGV4OiBKU1Rl c3RzL3N0cmVzcy92YWxpZGF0ZS1leGNlcHRpb24tY2hlY2staW4tcHJveHktb2JqZWN0LXB1dC5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBKU1Rlc3RzL3N0cmVzcy92YWxpZGF0ZS1leGNlcHRpb24tY2hlY2st aW4tcHJveHktb2JqZWN0LXB1dC5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy92 YWxpZGF0ZS1leGNlcHRpb24tY2hlY2staW4tcHJveHktb2JqZWN0LXB1dC5qcwkod29ya2luZyBj b3B5KQpAQCAtMCwwICsxLDEzIEBACitjb25zdCBoID0geworICBzZXQ6ICgpPT4xLAorfTsKK2Nv bnN0IHQgPSBuZXcgU3RyaW5nKCdiJyk7Citjb25zdCBwID0gbmV3IFByb3h5KHQsIGgpOwordHJ5 IHsKKyAgICBwWzBdID0gJ2EnICsgJ2EnOworfSBjYXRjaCAoZSkgeworICAgIGV4Y2VwdGlvbiA9 IGU7Cit9CisKK2lmIChleGNlcHRpb24gIT0gIlR5cGVFcnJvcjogUHJveHkgaGFuZGxlcidzICdz ZXQnIG9uIGEgbm9uLWNvbmZpZ3VyYWJsZSBhbmQgbm9uLXdyaXRhYmxlIHByb3BlcnR5IG9uICd0 YXJnZXQnIHNob3VsZCBlaXRoZXIgcmV0dXJuIGZhbHNlIG9yIGJlIHRoZSBzYW1lIHZhbHVlIGFs cmVhZHkgb24gdGhlICd0YXJnZXQnIikKKyAgICB0aHJvdyAiRkFJTEVEIjsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjUxMjY0KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTEwLTE3 ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbWlzc2luZyBj aGVja3MgYWZ0ZXIgY2FsbHMgdG8gdGhlIHNhbWVWYWx1ZSgpIEpTVmFsdWUgY29tcGFyYXRvci4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzEyNgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYzNjY1NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL0pTRnVuY3Rpb24uY3BwOgorICAg ICAgICAoSlNDOjpKU0Z1bmN0aW9uOjpkZWZpbmVPd25Qcm9wZXJ0eSk6CisgICAgICAgICogcnVu dGltZS9KU09iamVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpkZWZpbmVPd25JbmRl eGVkUHJvcGVydHkpOgorICAgICAgICAoSlNDOjp2YWxpZGF0ZUFuZEFwcGx5UHJvcGVydHlEZXNj cmlwdG9yKToKKyAgICAgICAgKiBydW50aW1lL1Byb3BlcnR5RGVzY3JpcHRvci5jcHA6CisgICAg ICAgIChKU0M6OlByb3BlcnR5RGVzY3JpcHRvcjo6ZXF1YWxUbyBjb25zdCk6CisgICAgICAgICog cnVudGltZS9Qcm94eU9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OnBlcmZvcm1Qcm94eUdldCk6 CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpwZXJmb3JtUHV0KToKKyAgICAgICAgKEpTQzo6 UHJveHlPYmplY3Q6OnBlcmZvcm1TZXRQcm90b3R5cGUpOgorICAgICAgICAoSlNDOjpQcm94eU9i amVjdDo6cGVyZm9ybUdldFByb3RvdHlwZSk6CisgICAgICAgICogcnVudGltZS9SZWdFeHBPYmpl Y3QuY3BwOgorICAgICAgICAoSlNDOjpSZWdFeHBPYmplY3Q6OmRlZmluZU93blByb3BlcnR5KToK KwogMjAxOS0xMC0xNyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAg SGFyZGVuIGNhcGFjaXR5IGNoZWNrcyBpbiBERkc6OkxvY2FsQ1NFUGhhc2U6OlNtYWxsTWFwLgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGdW5jdGlvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGdW5jdGlvbi5jcHAJKHJl dmlzaW9uIDI1MTI2MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rp b24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OTEsMTIgKzU5MSwyMCBAQCBib29sIEpTRnVuY3Rp b246OmRlZmluZU93blByb3BlcnR5KEpTT2JqCiAgICAgICAgIGlmICghdGhpc09iamVjdC0+anNF eGVjdXRhYmxlKCktPmhhc0NhbGxlckFuZEFyZ3VtZW50c1Byb3BlcnRpZXMoKSkKICAgICAgICAg ICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29wZSwgQmFzZTo6ZGVmaW5lT3duUHJvcGVydHkob2Jq ZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUsIGRlc2NyaXB0b3IsIHRocm93RXhjZXB0aW9uKSk7CiAK LSAgICAgICAgdmFsdWVDaGVjayA9ICFkZXNjcmlwdG9yLnZhbHVlKCkgfHwgc2FtZVZhbHVlKGV4 ZWMsIGRlc2NyaXB0b3IudmFsdWUoKSwgcmV0cmlldmVBcmd1bWVudHMoZXhlYywgdGhpc09iamVj dCkpOworICAgICAgICB2YWx1ZUNoZWNrID0gIWRlc2NyaXB0b3IudmFsdWUoKTsKKyAgICAgICAg aWYgKCF2YWx1ZUNoZWNrKSB7CisgICAgICAgICAgICB2YWx1ZUNoZWNrID0gc2FtZVZhbHVlKGV4 ZWMsIGRlc2NyaXB0b3IudmFsdWUoKSwgcmV0cmlldmVBcmd1bWVudHMoZXhlYywgdGhpc09iamVj dCkpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOworICAg ICAgICB9CiAgICAgfSBlbHNlIGlmIChwcm9wZXJ0eU5hbWUgPT0gdm0ucHJvcGVydHlOYW1lcy0+ Y2FsbGVyKSB7CiAgICAgICAgIGlmICghdGhpc09iamVjdC0+anNFeGVjdXRhYmxlKCktPmhhc0Nh bGxlckFuZEFyZ3VtZW50c1Byb3BlcnRpZXMoKSkKICAgICAgICAgICAgIFJFTEVBU0VfQU5EX1JF VFVSTihzY29wZSwgQmFzZTo6ZGVmaW5lT3duUHJvcGVydHkob2JqZWN0LCBleGVjLCBwcm9wZXJ0 eU5hbWUsIGRlc2NyaXB0b3IsIHRocm93RXhjZXB0aW9uKSk7CiAKLSAgICAgICAgdmFsdWVDaGVj ayA9ICFkZXNjcmlwdG9yLnZhbHVlKCkgfHwgc2FtZVZhbHVlKGV4ZWMsIGRlc2NyaXB0b3IudmFs dWUoKSwgcmV0cmlldmVDYWxsZXJGdW5jdGlvbihleGVjLCB0aGlzT2JqZWN0KSk7CisgICAgICAg IHZhbHVlQ2hlY2sgPSAhZGVzY3JpcHRvci52YWx1ZSgpOworICAgICAgICBpZiAoIXZhbHVlQ2hl Y2spIHsKKyAgICAgICAgICAgIHZhbHVlQ2hlY2sgPSBzYW1lVmFsdWUoZXhlYywgZGVzY3JpcHRv ci52YWx1ZSgpLCByZXRyaWV2ZUNhbGxlckZ1bmN0aW9uKGV4ZWMsIHRoaXNPYmplY3QpKTsKKyAg ICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGZhbHNlKTsKKyAgICAgICAgfQog ICAgIH0gZWxzZSB7CiAgICAgICAgIHRoaXNPYmplY3QtPnJlaWZ5TGF6eVByb3BlcnR5SWZOZWVk ZWQodm0sIGV4ZWMsIHByb3BlcnR5TmFtZSk7CiAgICAgICAgIFJFTEVBU0VfQU5EX1JFVFVSTihz Y29wZSwgQmFzZTo6ZGVmaW5lT3duUHJvcGVydHkob2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUs IGRlc2NyaXB0b3IsIHRocm93RXhjZXB0aW9uKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCShyZXZpc2lvbiAyNTEyNjMpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2ODMs OCArMjY4MywxMiBAQCBib29sIEpTT2JqZWN0OjpkZWZpbmVPd25JbmRleGVkUHJvcGVydHkoCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZXhlYywgc2NvcGUsIHRocm93RXhj ZXB0aW9uLCBVbmNvbmZpZ3VyYWJsZVByb3BlcnR5Q2hhbmdlV3JpdGFiaWxpdHlFcnJvcik7CiAg ICAgICAgICAgICAgICAgLy8gMTAuYS5paS4gSWYgdGhlIFtbV3JpdGFibGVdXSBmaWVsZCBvZiBj dXJyZW50IGlzIGZhbHNlLCB0aGVuCiAgICAgICAgICAgICAgICAgLy8gMTAuYS5paS4xLiBSZWpl Y3QsIGlmIHRoZSBbW1ZhbHVlXV0gZmllbGQgb2YgRGVzYyBpcyBwcmVzZW50IGFuZCBTYW1lVmFs dWUoRGVzYy5bW1ZhbHVlXV0sIGN1cnJlbnQuW1tWYWx1ZV1dKSBpcyBmYWxzZS4KLSAgICAgICAg ICAgICAgICBpZiAoZGVzY3JpcHRvci52YWx1ZSgpICYmICFzYW1lVmFsdWUoZXhlYywgZGVzY3Jp cHRvci52YWx1ZSgpLCBjdXJyZW50LnZhbHVlKCkpKQotICAgICAgICAgICAgICAgICAgICByZXR1 cm4gdHlwZUVycm9yKGV4ZWMsIHNjb3BlLCB0aHJvd0V4Y2VwdGlvbiwgUmVhZG9ubHlQcm9wZXJ0 eUNoYW5nZUVycm9yKTsKKyAgICAgICAgICAgICAgICBpZiAoZGVzY3JpcHRvci52YWx1ZSgpKSB7 CisgICAgICAgICAgICAgICAgICAgIGJvb2wgaXNTYW1lID0gc2FtZVZhbHVlKGV4ZWMsIGRlc2Ny aXB0b3IudmFsdWUoKSwgY3VycmVudC52YWx1ZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgUkVU VVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOworICAgICAgICAgICAgICAgICAgICBpZiAo IWlzU2FtZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZXhlYywg c2NvcGUsIHRocm93RXhjZXB0aW9uLCBSZWFkb25seVByb3BlcnR5Q2hhbmdlRXJyb3IpOworICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIDEwLmIuIGVsc2Us IHRoZSBbW0NvbmZpZ3VyYWJsZV1dIGZpZWxkIG9mIGN1cnJlbnQgaXMgdHJ1ZSwgc28gYW55IGNo YW5nZSBpcyBhY2NlcHRhYmxlLgogICAgICAgICB9IGVsc2UgewpAQCAtMzY0MSw4ICszNjQ1LDEy IEBAIGJvb2wgdmFsaWRhdGVBbmRBcHBseVByb3BlcnR5RGVzY3JpcHRvcigKICAgICAgICAgICAg IGlmICghY3VycmVudC53cml0YWJsZSgpICYmIGRlc2NyaXB0b3Iud3JpdGFibGUoKSkKICAgICAg ICAgICAgICAgICByZXR1cm4gdHlwZUVycm9yKGV4ZWMsIHNjb3BlLCB0aHJvd0V4Y2VwdGlvbiwg VW5jb25maWd1cmFibGVQcm9wZXJ0eUNoYW5nZVdyaXRhYmlsaXR5RXJyb3IpOwogICAgICAgICAg ICAgaWYgKCFjdXJyZW50LndyaXRhYmxlKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoZGVzY3Jp cHRvci52YWx1ZSgpICYmICFzYW1lVmFsdWUoZXhlYywgY3VycmVudC52YWx1ZSgpLCBkZXNjcmlw dG9yLnZhbHVlKCkpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHlwZUVycm9yKGV4ZWMs IHNjb3BlLCB0aHJvd0V4Y2VwdGlvbiwgUmVhZG9ubHlQcm9wZXJ0eUNoYW5nZUVycm9yKTsKKyAg ICAgICAgICAgICAgICBpZiAoZGVzY3JpcHRvci52YWx1ZSgpKSB7CisgICAgICAgICAgICAgICAg ICAgIGJvb2wgaXNTYW1lID0gc2FtZVZhbHVlKGV4ZWMsIGN1cnJlbnQudmFsdWUoKSwgZGVzY3Jp cHRvci52YWx1ZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgZmFsc2UpOworICAgICAgICAgICAgICAgICAgICBpZiAoIWlzU2FtZSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZXhlYywgc2NvcGUsIHRocm93RXhjZXB0 aW9uLCBSZWFkb25seVByb3BlcnR5Q2hhbmdlRXJyb3IpOworICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBpZiAoY3VycmVudC5hdHRyaWJ1dGVzRXF1 YWwoZGVzY3JpcHRvcikgJiYgIWRlc2NyaXB0b3IudmFsdWUoKSkKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5RGVzY3JpcHRvci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlEZXNjcmlwdG9yLmNwcAkocmV2 aXNpb24gMjUxMjYzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlE ZXNjcmlwdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMDksIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICog Q29weXJpZ2h0IChDKSAyMDA5LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xOTUsMTIgKzE5NSwxOSBAQCB2b2lk IFByb3BlcnR5RGVzY3JpcHRvcjo6c2V0R2V0dGVyKEpTVmFsCiAKIGJvb2wgUHJvcGVydHlEZXNj cmlwdG9yOjplcXVhbFRvKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgUHJvcGVydHlEZXNjcmlwdG9y JiBvdGhlcikgY29uc3QKIHsKKyAgICBWTSYgdm0gPSBleGVjLT52bSgpOworICAgIGF1dG8gc2Nv cGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKICAgICBpZiAob3RoZXIubV92YWx1ZS5pc0Vt cHR5KCkgIT0gbV92YWx1ZS5pc0VtcHR5KCkKICAgICAgICAgfHwgb3RoZXIubV9nZXR0ZXIuaXNF bXB0eSgpICE9IG1fZ2V0dGVyLmlzRW1wdHkoKQogICAgICAgICB8fCBvdGhlci5tX3NldHRlci5p c0VtcHR5KCkgIT0gbV9zZXR0ZXIuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgcmV0dXJuICghbV92YWx1ZSB8fCBzYW1lVmFsdWUoZXhlYywgb3RoZXIubV92YWx1ZSwgbV92 YWx1ZSkpCi0gICAgICAgICYmICghbV9nZXR0ZXIgfHwgSlNWYWx1ZTo6c3RyaWN0RXF1YWwoZXhl Yywgb3RoZXIubV9nZXR0ZXIsIG1fZ2V0dGVyKSkKKyAgICBpZiAobV92YWx1ZSkgeworICAgICAg ICBib29sIGlzU2FtZSA9IHNhbWVWYWx1ZShleGVjLCBvdGhlci5tX3ZhbHVlLCBtX3ZhbHVlKTsK KyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOworICAgICAgICBpZiAo IWlzU2FtZSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuICgh bV9nZXR0ZXIgfHwgSlNWYWx1ZTo6c3RyaWN0RXF1YWwoZXhlYywgb3RoZXIubV9nZXR0ZXIsIG1f Z2V0dGVyKSkKICAgICAgICAgJiYgKCFtX3NldHRlciB8fCBKU1ZhbHVlOjpzdHJpY3RFcXVhbChl eGVjLCBvdGhlci5tX3NldHRlciwgbV9zZXR0ZXIpKQogICAgICAgICAmJiBhdHRyaWJ1dGVzRXF1 YWwob3RoZXIpOwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlP YmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1By b3h5T2JqZWN0LmNwcAkocmV2aXNpb24gMjUxMjYzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzcsNyArMTc3LDkg QEAgc3RhdGljIEpTVmFsdWUgcGVyZm9ybVByb3h5R2V0KEV4ZWNTdGF0ZQogICAgIEVYQ0VQVElP Tl9BU1NFUlQoIXNjb3BlLmV4Y2VwdGlvbigpIHx8ICFyZXN1bHQpOwogICAgIGlmIChyZXN1bHQp IHsKICAgICAgICAgaWYgKGRlc2NyaXB0b3IuaXNEYXRhRGVzY3JpcHRvcigpICYmICFkZXNjcmlw dG9yLmNvbmZpZ3VyYWJsZSgpICYmICFkZXNjcmlwdG9yLndyaXRhYmxlKCkpIHsKLSAgICAgICAg ICAgIGlmICghc2FtZVZhbHVlKGV4ZWMsIGRlc2NyaXB0b3IudmFsdWUoKSwgdHJhcFJlc3VsdCkp CisgICAgICAgICAgICBib29sIGlzU2FtZSA9IHNhbWVWYWx1ZShleGVjLCBkZXNjcmlwdG9yLnZh bHVlKCksIHRyYXBSZXN1bHQpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29w ZSwgeyB9KTsKKyAgICAgICAgICAgIGlmICghaXNTYW1lKQogICAgICAgICAgICAgICAgIHJldHVy biB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgIlByb3h5IGhhbmRsZXIncyAnZ2V0JyByZXN1 bHQgb2YgYSBub24tY29uZmlndXJhYmxlIGFuZCBub24td3JpdGFibGUgcHJvcGVydHkgc2hvdWxk IGJlIHRoZSBzYW1lIHZhbHVlIGFzIHRoZSB0YXJnZXQncyBwcm9wZXJ0eSJfcyk7CiAgICAgICAg IH0gZWxzZSBpZiAoZGVzY3JpcHRvci5pc0FjY2Vzc29yRGVzY3JpcHRvcigpICYmICFkZXNjcmlw dG9yLmNvbmZpZ3VyYWJsZSgpICYmIGRlc2NyaXB0b3IuZ2V0dGVyKCkuaXNVbmRlZmluZWQoKSkg ewogICAgICAgICAgICAgaWYgKCF0cmFwUmVzdWx0LmlzVW5kZWZpbmVkKCkpCkBAIC00NjUsNyAr NDY3LDkgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybVB1dChFeGVjU3RhdGUqIAogICAgIEVY Q0VQVElPTl9BU1NFUlQoIXNjb3BlLmV4Y2VwdGlvbigpIHx8ICFoYXNQcm9wZXJ0eSk7CiAgICAg aWYgKGhhc1Byb3BlcnR5KSB7CiAgICAgICAgIGlmIChkZXNjcmlwdG9yLmlzRGF0YURlc2NyaXB0 b3IoKSAmJiAhZGVzY3JpcHRvci5jb25maWd1cmFibGUoKSAmJiAhZGVzY3JpcHRvci53cml0YWJs ZSgpKSB7Ci0gICAgICAgICAgICBpZiAoIXNhbWVWYWx1ZShleGVjLCBkZXNjcmlwdG9yLnZhbHVl KCksIHB1dFZhbHVlKSkgeworICAgICAgICAgICAgYm9vbCBpc1NhbWUgPSBzYW1lVmFsdWUoZXhl YywgZGVzY3JpcHRvci52YWx1ZSgpLCBwdXRWYWx1ZSk7CisgICAgICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHNjb3BlLCBmYWxzZSk7CisgICAgICAgICAgICBpZiAoIWlzU2FtZSkgewogICAg ICAgICAgICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZXhlYywgc2NvcGUsICJQcm94eSBoYW5kbGVy J3MgJ3NldCcgb24gYSBub24tY29uZmlndXJhYmxlIGFuZCBub24td3JpdGFibGUgcHJvcGVydHkg b24gJ3RhcmdldCcgc2hvdWxkIGVpdGhlciByZXR1cm4gZmFsc2Ugb3IgYmUgdGhlIHNhbWUgdmFs dWUgYWxyZWFkeSBvbiB0aGUgJ3RhcmdldCciX3MpOwogICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAgICAgICAgIH0KQEAgLTExNDcsNyArMTE1MSw5IEBAIGJvb2wgUHJveHlPYmpl Y3Q6OnBlcmZvcm1TZXRQcm90b3R5cGUoRXgKIAogICAgIEpTVmFsdWUgdGFyZ2V0UHJvdG90eXBl ID0gdGFyZ2V0LT5nZXRQcm90b3R5cGUodm0sIGV4ZWMpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJ T04oc2NvcGUsIGZhbHNlKTsKLSAgICBpZiAoIXNhbWVWYWx1ZShleGVjLCBwcm90b3R5cGUsIHRh cmdldFByb3RvdHlwZSkpIHsKKyAgICBib29sIGlzU2FtZSA9IHNhbWVWYWx1ZShleGVjLCBwcm90 b3R5cGUsIHRhcmdldFByb3RvdHlwZSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZmFsc2UpOworICAgIGlmICghaXNTYW1lKSB7CiAgICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZXhl Yywgc2NvcGUsICJQcm94eSAnc2V0UHJvdG90eXBlT2YnIHRyYXAgcmV0dXJuZWQgdHJ1ZSB3aGVu IGl0cyB0YXJnZXQgaXMgbm9uLWV4dGVuc2libGUgYW5kIHRoZSBuZXcgcHJvdG90eXBlIHZhbHVl IGlzIG5vdCB0aGUgc2FtZSBhcyB0aGUgY3VycmVudCBwcm90b3R5cGUgdmFsdWUuIEl0IHNob3Vs ZCBoYXZlIHJldHVybmVkIGZhbHNlIl9zKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K QEAgLTEyMDUsNyArMTIxMSw5IEBAIEpTVmFsdWUgUHJveHlPYmplY3Q6OnBlcmZvcm1HZXRQcm90 b3R5cGUKIAogICAgIEpTVmFsdWUgdGFyZ2V0UHJvdG90eXBlID0gdGFyZ2V0LT5nZXRQcm90b3R5 cGUodm0sIGV4ZWMpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7Ci0gICAg aWYgKCFzYW1lVmFsdWUoZXhlYywgdGFyZ2V0UHJvdG90eXBlLCB0cmFwUmVzdWx0KSkgeworICAg IGJvb2wgaXNTYW1lID0gc2FtZVZhbHVlKGV4ZWMsIHRhcmdldFByb3RvdHlwZSwgdHJhcFJlc3Vs dCk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKyAgICBpZiAoIWlzU2Ft ZSkgewogICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMsIHNjb3BlLCAiUHJveHkncyAnZ2V0 UHJvdG90eXBlT2YnIHRyYXAgZm9yIGEgbm9uLWV4dGVuc2libGUgdGFyZ2V0IHNob3VsZCByZXR1 cm4gdGhlIHNhbWUgdmFsdWUgYXMgdGhlIHRhcmdldCdzIHByb3RvdHlwZSJfcyk7CiAgICAgICAg IHJldHVybiB7IH07CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv UmVnRXhwT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9SZWdFeHBPYmplY3QuY3BwCShyZXZpc2lvbiAyNTEyNjMpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9SZWdFeHBPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYg KzEsNiBAQAogLyoKICAqICBDb3B5cmlnaHQgKEMpIDE5OTktMjAwMCBIYXJyaSBQb3J0ZW4gKHBv cnRlbkBrZGUub3JnKQotICogIENvcHlyaWdodCAoQykgMjAwMy0yMDE4IEFwcGxlIEluYy4gQWxs IFJpZ2h0cyBSZXNlcnZlZC4KKyAqICBDb3B5cmlnaHQgKEMpIDIwMDMtMjAxOSBBcHBsZSBJbmMu IEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAgKgogICogIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqICBtb2RpZnkgaXQgdW5kZXIg dGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCkBAIC0xMTksOCArMTE5 LDEyIEBAIGJvb2wgUmVnRXhwT2JqZWN0OjpkZWZpbmVPd25Qcm9wZXJ0eShKU08KICAgICAgICAg aWYgKCFyZWdFeHAtPmxhc3RJbmRleElzV3JpdGFibGUoKSkgewogICAgICAgICAgICAgaWYgKGRl c2NyaXB0b3Iud3JpdGFibGVQcmVzZW50KCkgJiYgZGVzY3JpcHRvci53cml0YWJsZSgpKQogICAg ICAgICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZXhlYywgc2NvcGUsIHNob3VsZFRocm93LCBV bmNvbmZpZ3VyYWJsZVByb3BlcnR5Q2hhbmdlV3JpdGFiaWxpdHlFcnJvcik7Ci0gICAgICAgICAg ICBpZiAoZGVzY3JpcHRvci52YWx1ZSgpICYmICFzYW1lVmFsdWUoZXhlYywgcmVnRXhwLT5nZXRM YXN0SW5kZXgoKSwgZGVzY3JpcHRvci52YWx1ZSgpKSkKLSAgICAgICAgICAgICAgICByZXR1cm4g dHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBzaG91bGRUaHJvdywgUmVhZG9ubHlQcm9wZXJ0eUNoYW5n ZUVycm9yKTsKKyAgICAgICAgICAgIGlmIChkZXNjcmlwdG9yLnZhbHVlKCkpIHsKKyAgICAgICAg ICAgICAgICBib29sIGlzU2FtZSA9IHNhbWVWYWx1ZShleGVjLCByZWdFeHAtPmdldExhc3RJbmRl eCgpLCBkZXNjcmlwdG9yLnZhbHVlKCkpOworICAgICAgICAgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIGZhbHNlKTsKKyAgICAgICAgICAgICAgICBpZiAoIWlzU2FtZSkKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHR5cGVFcnJvcihleGVjLCBzY29wZSwgc2hvdWxkVGhyb3cs IFJlYWRvbmx5UHJvcGVydHlDaGFuZ2VFcnJvcik7CisgICAgICAgICAgICB9CiAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICBpZiAoZGVzY3JpcHRvci52YWx1ZSgp KSB7Cg==