202379 2019-09-30 16:12:06 -0700 Make assertion in JSObject::putOwnDataProperty more precise 2019-09-30 21:06:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tzagallo tzagallo commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer ysuzuki oldest_to_newest 1575357 0 tzagallo 2019-09-30 16:12:06 -0700 <rdar://problem/49515980> 1575367 1 379854 tzagallo 2019-09-30 16:34:34 -0700 Created attachment 379854 Patch 1575368 2 379855 tzagallo 2019-09-30 16:37:32 -0700 Created attachment 379855 Patch Include test 1575369 3 379855 ysuzuki 2019-09-30 16:42:12 -0700 Comment on attachment 379855 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379855&action=review > Source/JavaScriptCore/runtime/JSObjectInlines.h:482 > +#if !ASSERT_DISABLED > +#define VALIDATE_PUT_OWN_DATA_PROPERTY() \ > + do { \ > + ASSERT(value); \ > + ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this)); \ > + unsigned attributes; \ > + PropertyOffset offset = structure(vm)->get(vm, propertyName, attributes); \ > + if (isValidOffset(offset)) \ > + ASSERT(!(attributes & (PropertyAttribute::Accessor | PropertyAttribute::CustomAccessor | PropertyAttribute::ReadOnly))); \ > + else if (TypeInfo::hasStaticPropertyTable(inlineTypeFlags())) { \ > + if (auto entry = findPropertyHashEntry(vm, propertyName)) { \ > + ASSERT(!(entry->value->attributes() & (PropertyAttribute::Accessor | PropertyAttribute::CustomAccessor | PropertyAttribute::ReadOnly))); \ > + } \ > + } \ > + } while (false) > +#else > +#define VALIDATE_PUT_OWN_DATA_PROPERTY() > +#endif Why not making it as an inline function? 1575370 4 379855 tzagallo 2019-09-30 16:43:55 -0700 Comment on attachment 379855 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379855&action=review Thanks for the review. >> Source/JavaScriptCore/runtime/JSObjectInlines.h:482 >> +#endif > > Why not making it as an inline function? I just didn't want to pass all the values through, but that does seem better. I'll update. 1575382 5 379861 tzagallo 2019-09-30 17:02:00 -0700 Created attachment 379861 Patch Refactor validation into inline function 1575425 6 379861 commit-queue 2019-09-30 21:06:31 -0700 Comment on attachment 379861 Patch Clearing flags on attachment: 379861 Committed r250543: <https://trac.webkit.org/changeset/250543> 1575426 7 commit-queue 2019-09-30 21:06:33 -0700 All reviewed patches have been landed. Closing bug. 379854 2019-09-30 16:34:34 -0700 2019-09-30 16:37:31 -0700 Patch bug-202379-20190930163433.patch text/plain 4957 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZTAxM2FhM2ZiOWY1NTIxMTg5NTk0YmU2NjQwOWNhNDMwZDZiZTEyLi5mNjBmN2U1NzcwOTQ2YWI5 ZjNjMzRlZjJjNTAwMzlkZjNhZWVlOWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wOS0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBNYWtlIGFzc2VydGlvbiBpbiBKU09iamVjdDo6cHV0T3duRGF0YVByb3Bl cnR5IG1vcmUgcHJlY2lzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAyMzc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTUxNTk4MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdl IGFzc2VydCB0aGF0IHRoZSBzdHJ1Y3R1cmUgaGFzIG5vIGFjY2Vzc29ycy9jdXN0b20gYWNjZXNz b3JzLCBidXQgdGhhdCBhc3NlcnRpb24gaXMKKyAgICAgICAgdG9vIGNvbnNlcnZhdGl2ZS4gQWxs IHdlIG5lZWQgdG8gcHJvdmUgaXMgdGhhdCB0aGUgcHJvcGVydHkgYmVpbmcgaW5zZXJ0ZWQgZWl0 aGVyIGRvZXMgbm90IGV4aXN0CisgICAgICAgIGluIHRoZSB0YXJnZXQgb2JqZWN0IG9yIGlzIG5l aXRoZXIgYW4gYWNjZXNzb3Igb3IgcmVhZC1vbmx5LgorCisgICAgICAgICogcnVudGltZS9KU09i amVjdC5oOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0T3duRGF0YVByb3BlcnR5KTogRGVs ZXRlZC4KKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eU1heUJlSW5k ZXgpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAg ICAgIChKU0M6OkpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHkpOgorICAgICAgICAoSlNDOjpK U09iamVjdDo6cHV0T3duRGF0YVByb3BlcnR5TWF5QmVJbmRleCk6CisKIDIwMTktMDktMjggIEFk cmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RL XVtXUEVdIEZpeCBub24tdW5pZmllZCBidWlsZCBpc3N1ZSBjYXVzZWQgYnkgcjI1MDQ0MApkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKaW5kZXggNjkxZTgzMGIxY2U1ZWQ2 NDJjOTJlODEzZTU4NDk1Yjc2NDZjNzllZi4uZDY0YjU3MGIwMTczOTM2YmUwY2UzYzljOThjZTJj Y2M4MTFjNWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNP YmplY3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCkBA IC0xNDkzLDMwICsxNDkzLDYgQEAgaW5saW5lIEpTVmFsdWUgSlNPYmplY3Q6OmdldChFeGVjU3Rh dGUqIGV4ZWMsIHVuc2lnbmVkIHByb3BlcnR5TmFtZSkgY29uc3QKICAgICByZXR1cm4ganNVbmRl ZmluZWQoKTsKIH0KIAotaW5saW5lIGJvb2wgSlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eShW TSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFByb3Bl cnR5U2xvdCYgc2xvdCkKLXsKLSAgICBBU1NFUlQodmFsdWUpOwotICAgIEFTU0VSVCghSGVhcDo6 aGVhcCh2YWx1ZSkgfHwgSGVhcDo6aGVhcCh2YWx1ZSkgPT0gSGVhcDo6aGVhcCh0aGlzKSk7Ci0g ICAgQVNTRVJUKCFzdHJ1Y3R1cmUodm0pLT5oYXNHZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVzKCkpOwot ICAgIEFTU0VSVCghc3RydWN0dXJlKHZtKS0+aGFzQ3VzdG9tR2V0dGVyU2V0dGVyUHJvcGVydGll cygpKTsKLQotICAgIHJldHVybiBwdXREaXJlY3RJbnRlcm5hbDxQdXRNb2RlUHV0Pih2bSwgcHJv cGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCk7Ci19Ci0KLWlubGluZSBib29sIEpTT2JqZWN0Ojpw dXRPd25EYXRhUHJvcGVydHlNYXlCZUluZGV4KEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1l IHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQotewot ICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7Ci0gICAgQVNTRVJUKHZhbHVlKTsKLSAgICBBU1NFUlQo IUhlYXA6OmhlYXAodmFsdWUpIHx8IEhlYXA6OmhlYXAodmFsdWUpID09IEhlYXA6OmhlYXAodGhp cykpOwotICAgIEFTU0VSVCghc3RydWN0dXJlKHZtKS0+aGFzR2V0dGVyU2V0dGVyUHJvcGVydGll cygpKTsKLSAgICBBU1NFUlQoIXN0cnVjdHVyZSh2bSktPmhhc0N1c3RvbUdldHRlclNldHRlclBy b3BlcnRpZXMoKSk7Ci0KLSAgICBpZiAoT3B0aW9uYWw8dWludDMyX3Q+IGluZGV4ID0gcGFyc2VJ bmRleChwcm9wZXJ0eU5hbWUpKQotICAgICAgICByZXR1cm4gcHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgudmFsdWUoKSwgdmFsdWUsIDAsIFB1dERpcmVjdEluZGV4TGlrZVB1dERpcmVjdCk7Ci0K LSAgICByZXR1cm4gcHV0RGlyZWN0SW50ZXJuYWw8UHV0TW9kZVB1dD4odm0sIHByb3BlcnR5TmFt ZSwgdmFsdWUsIDAsIHNsb3QpOwotfQotCiBpbmxpbmUgYm9vbCBKU09iamVjdDo6cHV0RGlyZWN0 KFZNJiB2bSwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgdW5zaWdu ZWQgYXR0cmlidXRlcykKIHsKICAgICBBU1NFUlQoIXZhbHVlLmlzR2V0dGVyU2V0dGVyKCkgJiYg IShhdHRyaWJ1dGVzICYgUHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCmluZGV4IDI4MTgzZDQx NWZkYjk3ZjExOTExZGNlNzNhZmNhMGVlOTFhN2ZiZGEuLjIzOGMxOTA2NTA3YWJmNjhmYTc1NGVi MmRjOWQxNjQ3NzA2ODAzYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTT2JqZWN0SW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0SW5saW5lcy5oCkBAIC00NjIsNSArNDYyLDQxIEBAIGlubGluZSB2b2lkIEpTT2Jq ZWN0OjpzZXRJbmRleFF1aWNrbHlGb3JUeXBlZEFycmF5KHVuc2lnbmVkIGksIEpTVmFsdWUgdmFs dWUpCiAgICAgfQogfQogICAgIAorI2lmICFBU1NFUlRfRElTQUJMRUQKKyNkZWZpbmUgVkFMSURB VEVfUFVUX09XTl9EQVRBX1BST1BFUlRZKCkgXAorICAgIGRvIHsgXAorICAgICAgICBBU1NFUlQo dmFsdWUpOyBcCisgICAgICAgIEFTU0VSVCghSGVhcDo6aGVhcCh2YWx1ZSkgfHwgSGVhcDo6aGVh cCh2YWx1ZSkgPT0gSGVhcDo6aGVhcCh0aGlzKSk7IFwKKyAgICAgICAgdW5zaWduZWQgYXR0cmli dXRlczsgXAorICAgICAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBzdHJ1Y3R1cmUodm0pLT5n ZXQodm0sIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcyk7IFwKKyAgICAgICAgaWYgKGlzVmFsaWRP ZmZzZXQob2Zmc2V0KSkgXAorICAgICAgICAgICAgQVNTRVJUKCEoYXR0cmlidXRlcyAmIChQcm9w ZXJ0eUF0dHJpYnV0ZTo6QWNjZXNzb3IgfCBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tQWNjZXNz b3IgfCBQcm9wZXJ0eUF0dHJpYnV0ZTo6UmVhZE9ubHkpKSk7IFwKKyAgICAgICAgZWxzZSBpZiAo VHlwZUluZm86Omhhc1N0YXRpY1Byb3BlcnR5VGFibGUoaW5saW5lVHlwZUZsYWdzKCkpKSB7IFwK KyAgICAgICAgICAgIGlmIChhdXRvIGVudHJ5ID0gZmluZFByb3BlcnR5SGFzaEVudHJ5KHZtLCBw cm9wZXJ0eU5hbWUpKSB7IFwKKyAgICAgICAgICAgICAgICBBU1NFUlQoIShlbnRyeS0+dmFsdWUt PmF0dHJpYnV0ZXMoKSAmIChQcm9wZXJ0eUF0dHJpYnV0ZTo6QWNjZXNzb3IgfCBQcm9wZXJ0eUF0 dHJpYnV0ZTo6Q3VzdG9tQWNjZXNzb3IgfCBQcm9wZXJ0eUF0dHJpYnV0ZTo6UmVhZE9ubHkpKSk7 IFwKKyAgICAgICAgICAgIH0gXAorICAgICAgICB9IFwKKyAgICB9IHdoaWxlIChmYWxzZSkKKyNl bHNlCisjZGVmaW5lIFZBTElEQVRFX1BVVF9PV05fREFUQV9QUk9QRVJUWSgpCisjZW5kaWYKKwor aW5saW5lIGJvb2wgSlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eShWTSYgdm0sIFByb3BlcnR5 TmFtZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFByb3BlcnR5U2xvdCYgc2xvdCkK K3sKKyAgICBWQUxJREFURV9QVVRfT1dOX0RBVEFfUFJPUEVSVFkoKTsKKyAgICByZXR1cm4gcHV0 RGlyZWN0SW50ZXJuYWw8UHV0TW9kZVB1dD4odm0sIHByb3BlcnR5TmFtZSwgdmFsdWUsIDAsIHNs b3QpOworfQorCitpbmxpbmUgYm9vbCBKU09iamVjdDo6cHV0T3duRGF0YVByb3BlcnR5TWF5QmVJ bmRleChFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUg dmFsdWUsIFB1dFByb3BlcnR5U2xvdCYgc2xvdCkKK3sKKyAgICBWTSYgdm0gPSBleGVjLT52bSgp OworICAgIFZBTElEQVRFX1BVVF9PV05fREFUQV9QUk9QRVJUWSgpOworICAgIGlmIChPcHRpb25h bDx1aW50MzJfdD4gaW5kZXggPSBwYXJzZUluZGV4KHByb3BlcnR5TmFtZSkpCisgICAgICAgIHJl dHVybiBwdXREaXJlY3RJbmRleChleGVjLCBpbmRleC52YWx1ZSgpLCB2YWx1ZSwgMCwgUHV0RGly ZWN0SW5kZXhMaWtlUHV0RGlyZWN0KTsKKworICAgIHJldHVybiBwdXREaXJlY3RJbnRlcm5hbDxQ dXRNb2RlUHV0Pih2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCk7Cit9CisKKyN1bmRl ZiBWQUxJREFURV9QVVRfT1dOX0RBVEFfUFJPUEVSVFkKIAogfSAvLyBuYW1lc3BhY2UgSlNDCg== 379855 2019-09-30 16:37:32 -0700 2019-09-30 17:01:59 -0700 Patch bug-202379-20190930163732.patch text/plain 6078 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZTAxM2FhM2ZiOWY1NTIxMTg5NTk0YmU2NjQwOWNhNDMwZDZiZTEyLi42ZDYyYjQ2NzRlMGE3ZjA1 NzIzZjg5NjUzMzEwNDQ1NDJhYTg4YjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wOS0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBNYWtlIGFzc2VydGlvbiBpbiBKU09iamVjdDo6cHV0T3duRGF0YVByb3Bl cnR5IG1vcmUgcHJlY2lzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAyMzc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTUxNTk4MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdl IGFzc2VydCB0aGF0IHRoZSBzdHJ1Y3R1cmUgaGFzIG5vIGFjY2Vzc29ycy9jdXN0b20gYWNjZXNz b3JzLCBidXQgdGhhdCBhc3NlcnRpb24gaXMKKyAgICAgICAgdG9vIGNvbnNlcnZhdGl2ZS4gQWxs IHdlIG5lZWQgdG8gcHJvdmUgaXMgdGhhdCB0aGUgcHJvcGVydHkgYmVpbmcgaW5zZXJ0ZWQgZWl0 aGVyIGRvZXMgbm90IGV4aXN0CisgICAgICAgIGluIHRoZSB0YXJnZXQgb2JqZWN0IG9yIGlzIG5l aXRoZXIgYW4gYWNjZXNzb3Igbm9yIHJlYWQtb25seS4KKworICAgICAgICAqIHJ1bnRpbWUvSlNP YmplY3QuaDoKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eSk6IERl bGV0ZWQuCisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHlNYXlCZUlu ZGV4KTogRGVsZXRlZC4KKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oOgorICAg ICAgICAoSlNDOjpKU09iamVjdDo6cHV0T3duRGF0YVByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6 SlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eU1heUJlSW5kZXgpOgorCiAyMDE5LTA5LTI4ICBB ZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S11bV1BFXSBGaXggbm9uLXVuaWZpZWQgYnVpbGQgaXNzdWUgY2F1c2VkIGJ5IHIyNTA0NDAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCmluZGV4IDY5MWU4MzBiMWNlNWVk NjQyYzkyZTgxM2U1ODQ5NWI3NjQ2Yzc5ZWYuLmQ2NGI1NzBiMDE3MzkzNmJlMGNlM2M5Yzk4Y2Uy Y2NjODExYzVjYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT T2JqZWN0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaApA QCAtMTQ5MywzMCArMTQ5Myw2IEBAIGlubGluZSBKU1ZhbHVlIEpTT2JqZWN0OjpnZXQoRXhlY1N0 YXRlKiBleGVjLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpIGNvbnN0CiAgICAgcmV0dXJuIGpzVW5k ZWZpbmVkKCk7CiB9CiAKLWlubGluZSBib29sIEpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHko Vk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQcm9w ZXJ0eVNsb3QmIHNsb3QpCi17Ci0gICAgQVNTRVJUKHZhbHVlKTsKLSAgICBBU1NFUlQoIUhlYXA6 OmhlYXAodmFsdWUpIHx8IEhlYXA6OmhlYXAodmFsdWUpID09IEhlYXA6OmhlYXAodGhpcykpOwot ICAgIEFTU0VSVCghc3RydWN0dXJlKHZtKS0+aGFzR2V0dGVyU2V0dGVyUHJvcGVydGllcygpKTsK LSAgICBBU1NFUlQoIXN0cnVjdHVyZSh2bSktPmhhc0N1c3RvbUdldHRlclNldHRlclByb3BlcnRp ZXMoKSk7Ci0KLSAgICByZXR1cm4gcHV0RGlyZWN0SW50ZXJuYWw8UHV0TW9kZVB1dD4odm0sIHBy b3BlcnR5TmFtZSwgdmFsdWUsIDAsIHNsb3QpOwotfQotCi1pbmxpbmUgYm9vbCBKU09iamVjdDo6 cHV0T3duRGF0YVByb3BlcnR5TWF5QmVJbmRleChFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFt ZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFByb3BlcnR5U2xvdCYgc2xvdCkKLXsK LSAgICBWTSYgdm0gPSBleGVjLT52bSgpOwotICAgIEFTU0VSVCh2YWx1ZSk7Ci0gICAgQVNTRVJU KCFIZWFwOjpoZWFwKHZhbHVlKSB8fCBIZWFwOjpoZWFwKHZhbHVlKSA9PSBIZWFwOjpoZWFwKHRo aXMpKTsKLSAgICBBU1NFUlQoIXN0cnVjdHVyZSh2bSktPmhhc0dldHRlclNldHRlclByb3BlcnRp ZXMoKSk7Ci0gICAgQVNTRVJUKCFzdHJ1Y3R1cmUodm0pLT5oYXNDdXN0b21HZXR0ZXJTZXR0ZXJQ cm9wZXJ0aWVzKCkpOwotCi0gICAgaWYgKE9wdGlvbmFsPHVpbnQzMl90PiBpbmRleCA9IHBhcnNl SW5kZXgocHJvcGVydHlOYW1lKSkKLSAgICAgICAgcmV0dXJuIHB1dERpcmVjdEluZGV4KGV4ZWMs IGluZGV4LnZhbHVlKCksIHZhbHVlLCAwLCBQdXREaXJlY3RJbmRleExpa2VQdXREaXJlY3QpOwot Ci0gICAgcmV0dXJuIHB1dERpcmVjdEludGVybmFsPFB1dE1vZGVQdXQ+KHZtLCBwcm9wZXJ0eU5h bWUsIHZhbHVlLCAwLCBzbG90KTsKLX0KLQogaW5saW5lIGJvb2wgSlNPYmplY3Q6OnB1dERpcmVj dChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIHVuc2ln bmVkIGF0dHJpYnV0ZXMpCiB7CiAgICAgQVNTRVJUKCF2YWx1ZS5pc0dldHRlclNldHRlcigpICYm ICEoYXR0cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3NvcikpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAppbmRleCAyODE4M2Q0 MTVmZGI5N2YxMTkxMWRjZTczYWZjYTBlZTkxYTdmYmRhLi4yMzhjMTkwNjUwN2FiZjY4ZmE3NTRl YjJkYzlkMTY0NzcwNjgwM2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU09iamVjdElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU09iamVjdElubGluZXMuaApAQCAtNDYyLDUgKzQ2Miw0MSBAQCBpbmxpbmUgdm9pZCBKU09i amVjdDo6c2V0SW5kZXhRdWlja2x5Rm9yVHlwZWRBcnJheSh1bnNpZ25lZCBpLCBKU1ZhbHVlIHZh bHVlKQogICAgIH0KIH0KICAgICAKKyNpZiAhQVNTRVJUX0RJU0FCTEVECisjZGVmaW5lIFZBTElE QVRFX1BVVF9PV05fREFUQV9QUk9QRVJUWSgpIFwKKyAgICBkbyB7IFwKKyAgICAgICAgQVNTRVJU KHZhbHVlKTsgXAorICAgICAgICBBU1NFUlQoIUhlYXA6OmhlYXAodmFsdWUpIHx8IEhlYXA6Omhl YXAodmFsdWUpID09IEhlYXA6OmhlYXAodGhpcykpOyBcCisgICAgICAgIHVuc2lnbmVkIGF0dHJp YnV0ZXM7IFwKKyAgICAgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gc3RydWN0dXJlKHZtKS0+ Z2V0KHZtLCBwcm9wZXJ0eU5hbWUsIGF0dHJpYnV0ZXMpOyBcCisgICAgICAgIGlmIChpc1ZhbGlk T2Zmc2V0KG9mZnNldCkpIFwKKyAgICAgICAgICAgIEFTU0VSVCghKGF0dHJpYnV0ZXMgJiAoUHJv cGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yIHwgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbUFjY2Vz c29yIHwgUHJvcGVydHlBdHRyaWJ1dGU6OlJlYWRPbmx5KSkpOyBcCisgICAgICAgIGVsc2UgaWYg KFR5cGVJbmZvOjpoYXNTdGF0aWNQcm9wZXJ0eVRhYmxlKGlubGluZVR5cGVGbGFncygpKSkgeyBc CisgICAgICAgICAgICBpZiAoYXV0byBlbnRyeSA9IGZpbmRQcm9wZXJ0eUhhc2hFbnRyeSh2bSwg cHJvcGVydHlOYW1lKSkgeyBcCisgICAgICAgICAgICAgICAgQVNTRVJUKCEoZW50cnktPnZhbHVl LT5hdHRyaWJ1dGVzKCkgJiAoUHJvcGVydHlBdHRyaWJ1dGU6OkFjY2Vzc29yIHwgUHJvcGVydHlB dHRyaWJ1dGU6OkN1c3RvbUFjY2Vzc29yIHwgUHJvcGVydHlBdHRyaWJ1dGU6OlJlYWRPbmx5KSkp OyBcCisgICAgICAgICAgICB9IFwKKyAgICAgICAgfSBcCisgICAgfSB3aGlsZSAoZmFsc2UpCisj ZWxzZQorI2RlZmluZSBWQUxJREFURV9QVVRfT1dOX0RBVEFfUFJPUEVSVFkoKQorI2VuZGlmCisK K2lubGluZSBib29sIEpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHkoVk0mIHZtLCBQcm9wZXJ0 eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQcm9wZXJ0eVNsb3QmIHNsb3Qp Cit7CisgICAgVkFMSURBVEVfUFVUX09XTl9EQVRBX1BST1BFUlRZKCk7CisgICAgcmV0dXJuIHB1 dERpcmVjdEludGVybmFsPFB1dE1vZGVQdXQ+KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCAwLCBz bG90KTsKK30KKworaW5saW5lIGJvb2wgSlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eU1heUJl SW5kZXgoRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVl IHZhbHVlLCBQdXRQcm9wZXJ0eVNsb3QmIHNsb3QpCit7CisgICAgVk0mIHZtID0gZXhlYy0+dm0o KTsKKyAgICBWQUxJREFURV9QVVRfT1dOX0RBVEFfUFJPUEVSVFkoKTsKKyAgICBpZiAoT3B0aW9u YWw8dWludDMyX3Q+IGluZGV4ID0gcGFyc2VJbmRleChwcm9wZXJ0eU5hbWUpKQorICAgICAgICBy ZXR1cm4gcHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgudmFsdWUoKSwgdmFsdWUsIDAsIFB1dERp cmVjdEluZGV4TGlrZVB1dERpcmVjdCk7CisKKyAgICByZXR1cm4gcHV0RGlyZWN0SW50ZXJuYWw8 UHV0TW9kZVB1dD4odm0sIHByb3BlcnR5TmFtZSwgdmFsdWUsIDAsIHNsb3QpOworfQorCisjdW5k ZWYgVkFMSURBVEVfUFVUX09XTl9EQVRBX1BST1BFUlRZCiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpk aWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCBm Y2NjZjIzN2I4Yjg4NjMxMTAyNzUxYzAxMTk2MTlhYWExNjg4NTkzLi5lMjY2MzNjZDQ4Njg2MWE1 ZjdjOWFmYzcyYjM5YWU5ODA0YWY2YTE1IDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZwor KysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTMwICBUYWRl dSBaYWdhbGxvICA8dHphZ2FsbG9AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgYXNzZXJ0aW9u IGluIEpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHkgbW9yZSBwcmVjaXNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIzNzkKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzQ5NTE1OTgwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogc3RyZXNzL29iamVjdC1hc3NpZ24tdGFyZ2V0LXByb3RvLXNldHRl ci5qczogQWRkZWQuCisgICAgICAgIChnZXQgT2JqZWN0KToKKwogMjAxOS0wOS0yNyAgWXVzdWtl IFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEtlZXAgSlNTdHJp bmc6OnZhbHVlKEV4ZWNTdGF0ZSopJ3MgcmVzdWx0IGFzIFN0cmluZyBpbnN0ZWFkIG9mIGBjb25z dCBTdHJpbmcmYApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mvb2JqZWN0LWFzc2lnbi10YXJn ZXQtcHJvdG8tc2V0dGVyLmpzIGIvSlNUZXN0cy9zdHJlc3Mvb2JqZWN0LWFzc2lnbi10YXJnZXQt cHJvdG8tc2V0dGVyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdjZmYyY2FiNDIzNzM1ZmU1MGY4Yjg2NjY0NzU3 ZTM3YzVkNGYyYWQKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9vYmplY3QtYXNz aWduLXRhcmdldC1wcm90by1zZXR0ZXIuanMKQEAgLTAsMCArMSwzIEBACitjb25zdCB4ID0ge307 CitPYmplY3QuZGVmaW5lUHJvcGVydHkoeCwgJ19fcHJvdG9fXycsIHtnZXQ6ICgpPT57fX0pOwor T2JqZWN0LmFzc2lnbih4LCB7IGdldDogKCk9PiB7fSB9KTsK 379861 2019-09-30 17:02:00 -0700 2019-09-30 21:06:31 -0700 Patch bug-202379-20190930170159.patch text/plain 6605 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZTAxM2FhM2ZiOWY1NTIxMTg5NTk0YmU2NjQwOWNhNDMwZDZiZTEyLi4wZTUzYWJjZWJhZDJkNjNh M2MyNGJlODc4OGFmM2YzMjZhMTkwZDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxOS0wOS0zMCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBNYWtlIGFzc2VydGlvbiBpbiBKU09iamVjdDo6cHV0T3duRGF0YVByb3Bl cnR5IG1vcmUgcHJlY2lzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAyMzc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTUxNTk4MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgIEN1cnJlbnRseSwgd2Ug YXNzZXJ0IHRoYXQgdGhlIHN0cnVjdHVyZSBoYXMgbm8gYWNjZXNzb3JzL2N1c3RvbSBhY2Nlc3Nv cnMsIGJ1dCB0aGF0IGFzc2VydGlvbiBpcworICAgICAgICB0b28gY29uc2VydmF0aXZlLiBBbGwg d2UgbmVlZCB0byBwcm92ZSBpcyB0aGF0IHRoZSBwcm9wZXJ0eSBiZWluZyBpbnNlcnRlZCBlaXRo ZXIgZG9lcyBub3QgZXhpc3QKKyAgICAgICAgaW4gdGhlIHRhcmdldCBvYmplY3Qgb3IgaXMgbmVp dGhlciBhbiBhY2Nlc3NvciBub3IgcmVhZC1vbmx5LgorCisgICAgICAgICogcnVudGltZS9KU09i amVjdC5oOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0T3duRGF0YVByb3BlcnR5KTogRGVs ZXRlZC4KKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eU1heUJlSW5k ZXgpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6CisgICAg ICAgIChKU0M6OkpTT2JqZWN0Ojp2YWxpZGF0ZVB1dE93bkRhdGFQcm9wZXJ0eSk6CisgICAgICAg IChKU0M6OkpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHkpOgorICAgICAgICAoSlNDOjpKU09i amVjdDo6cHV0T3duRGF0YVByb3BlcnR5TWF5QmVJbmRleCk6CisKIDIwMTktMDktMjggIEFkcmlh biBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtX UEVdIEZpeCBub24tdW5pZmllZCBidWlsZCBpc3N1ZSBjYXVzZWQgYnkgcjI1MDQ0MApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKaW5kZXggNjkxZTgzMGIxY2U1ZWQ2NDJj OTJlODEzZTU4NDk1Yjc2NDZjNzllZi4uYWY2ZDg3YzlkZjg3ZTIzNWRjNzU0MjQwNTZhNDczZTRh NGFkMWEzZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmpl Y3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCkBAIC03 MjcsNiArNzI3LDkgQEAgcHVibGljOgogICAgIC8vIFRoaXMgaXMgdXNlZCBieSBKU0xleGljYWxF bnZpcm9ubWVudC4KICAgICBib29sIHB1dE93bkRhdGFQcm9wZXJ0eShWTSYsIFByb3BlcnR5TmFt ZSwgSlNWYWx1ZSwgUHV0UHJvcGVydHlTbG90Jik7CiAgICAgYm9vbCBwdXRPd25EYXRhUHJvcGVy dHlNYXlCZUluZGV4KEV4ZWNTdGF0ZSosIFByb3BlcnR5TmFtZSwgSlNWYWx1ZSwgUHV0UHJvcGVy dHlTbG90Jik7Citwcml2YXRlOgorICAgIHZvaWQgdmFsaWRhdGVQdXRPd25EYXRhUHJvcGVydHko Vk0mLCBQcm9wZXJ0eU5hbWUsIEpTVmFsdWUpOworcHVibGljOgogCiAgICAgLy8gRmFzdCBhY2Nl c3MgdG8ga25vd24gcHJvcGVydHkgb2Zmc2V0cy4KICAgICBBTFdBWVNfSU5MSU5FIEpTVmFsdWUg Z2V0RGlyZWN0KFByb3BlcnR5T2Zmc2V0IG9mZnNldCkgY29uc3QgeyByZXR1cm4gbG9jYXRpb25G b3JPZmZzZXQob2Zmc2V0KS0+Z2V0KCk7IH0KQEAgLTE0OTMsMzAgKzE0OTYsNiBAQCBpbmxpbmUg SlNWYWx1ZSBKU09iamVjdDo6Z2V0KEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgcHJvcGVydHlO YW1lKSBjb25zdAogICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogfQogCi1pbmxpbmUgYm9vbCBK U09iamVjdDo6cHV0T3duRGF0YVByb3BlcnR5KFZNJiB2bSwgUHJvcGVydHlOYW1lIHByb3BlcnR5 TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQotewotICAgIEFTU0VS VCh2YWx1ZSk7Ci0gICAgQVNTRVJUKCFIZWFwOjpoZWFwKHZhbHVlKSB8fCBIZWFwOjpoZWFwKHZh bHVlKSA9PSBIZWFwOjpoZWFwKHRoaXMpKTsKLSAgICBBU1NFUlQoIXN0cnVjdHVyZSh2bSktPmhh c0dldHRlclNldHRlclByb3BlcnRpZXMoKSk7Ci0gICAgQVNTRVJUKCFzdHJ1Y3R1cmUodm0pLT5o YXNDdXN0b21HZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVzKCkpOwotCi0gICAgcmV0dXJuIHB1dERpcmVj dEludGVybmFsPFB1dE1vZGVQdXQ+KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCAwLCBzbG90KTsK LX0KLQotaW5saW5lIGJvb2wgSlNPYmplY3Q6OnB1dE93bkRhdGFQcm9wZXJ0eU1heUJlSW5kZXgo RXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVl LCBQdXRQcm9wZXJ0eVNsb3QmIHNsb3QpCi17Ci0gICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKLSAg ICBBU1NFUlQodmFsdWUpOwotICAgIEFTU0VSVCghSGVhcDo6aGVhcCh2YWx1ZSkgfHwgSGVhcDo6 aGVhcCh2YWx1ZSkgPT0gSGVhcDo6aGVhcCh0aGlzKSk7Ci0gICAgQVNTRVJUKCFzdHJ1Y3R1cmUo dm0pLT5oYXNHZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVzKCkpOwotICAgIEFTU0VSVCghc3RydWN0dXJl KHZtKS0+aGFzQ3VzdG9tR2V0dGVyU2V0dGVyUHJvcGVydGllcygpKTsKLQotICAgIGlmIChPcHRp b25hbDx1aW50MzJfdD4gaW5kZXggPSBwYXJzZUluZGV4KHByb3BlcnR5TmFtZSkpCi0gICAgICAg IHJldHVybiBwdXREaXJlY3RJbmRleChleGVjLCBpbmRleC52YWx1ZSgpLCB2YWx1ZSwgMCwgUHV0 RGlyZWN0SW5kZXhMaWtlUHV0RGlyZWN0KTsKLQotICAgIHJldHVybiBwdXREaXJlY3RJbnRlcm5h bDxQdXRNb2RlUHV0Pih2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCk7Ci19Ci0KIGlu bGluZSBib29sIEpTT2JqZWN0OjpwdXREaXJlY3QoVk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVy dHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCB1bnNpZ25lZCBhdHRyaWJ1dGVzKQogewogICAgIEFTU0VS VCghdmFsdWUuaXNHZXR0ZXJTZXR0ZXIoKSAmJiAhKGF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0dHJp YnV0ZTo6QWNjZXNzb3IpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTT2JqZWN0SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNP YmplY3RJbmxpbmVzLmgKaW5kZXggMjgxODNkNDE1ZmRiOTdmMTE5MTFkY2U3M2FmY2EwZWU5MWE3 ZmJkYS4uNzlkZDM2ZWFiNTdjNjViZDU0MmYwYTViZWI1ZWM5YWM2ODY2ODkyZCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgKQEAgLTQ2Miw1 ICs0NjIsNDAgQEAgaW5saW5lIHZvaWQgSlNPYmplY3Q6OnNldEluZGV4UXVpY2tseUZvclR5cGVk QXJyYXkodW5zaWduZWQgaSwgSlNWYWx1ZSB2YWx1ZSkKICAgICB9CiB9CiAgICAgCitpbmxpbmUg dm9pZCBKU09iamVjdDo6dmFsaWRhdGVQdXRPd25EYXRhUHJvcGVydHkoVk0mIHZtLCBQcm9wZXJ0 eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlKQoreworI2lmICFBU1NFUlRfRElTQUJM RUQKKyAgICBBU1NFUlQodmFsdWUpOworICAgIEFTU0VSVCghSGVhcDo6aGVhcCh2YWx1ZSkgfHwg SGVhcDo6aGVhcCh2YWx1ZSkgPT0gSGVhcDo6aGVhcCh0aGlzKSk7CisgICAgdW5zaWduZWQgYXR0 cmlidXRlczsKKyAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBzdHJ1Y3R1cmUodm0pLT5nZXQo dm0sIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcyk7CisgICAgaWYgKGlzVmFsaWRPZmZzZXQob2Zm c2V0KSkKKyAgICAgICAgQVNTRVJUKCEoYXR0cmlidXRlcyAmIChQcm9wZXJ0eUF0dHJpYnV0ZTo6 QWNjZXNzb3IgfCBQcm9wZXJ0eUF0dHJpYnV0ZTo6Q3VzdG9tQWNjZXNzb3IgfCBQcm9wZXJ0eUF0 dHJpYnV0ZTo6UmVhZE9ubHkpKSk7CisgICAgZWxzZSBpZiAoVHlwZUluZm86Omhhc1N0YXRpY1By b3BlcnR5VGFibGUoaW5saW5lVHlwZUZsYWdzKCkpKSB7CisgICAgICAgIGlmIChhdXRvIGVudHJ5 ID0gZmluZFByb3BlcnR5SGFzaEVudHJ5KHZtLCBwcm9wZXJ0eU5hbWUpKQorICAgICAgICAgICAg QVNTRVJUKCEoZW50cnktPnZhbHVlLT5hdHRyaWJ1dGVzKCkgJiAoUHJvcGVydHlBdHRyaWJ1dGU6 OkFjY2Vzc29yIHwgUHJvcGVydHlBdHRyaWJ1dGU6OkN1c3RvbUFjY2Vzc29yIHwgUHJvcGVydHlB dHRyaWJ1dGU6OlJlYWRPbmx5KSkpOworICAgIH0KKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHZt KTsKKyAgICBVTlVTRURfUEFSQU0ocHJvcGVydHlOYW1lKTsKKyAgICBVTlVTRURfUEFSQU0odmFs dWUpOworI2VuZGlmCit9CisKK2lubGluZSBib29sIEpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVy dHkoVk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQ cm9wZXJ0eVNsb3QmIHNsb3QpCit7CisgICAgdmFsaWRhdGVQdXRPd25EYXRhUHJvcGVydHkodm0s IHByb3BlcnR5TmFtZSwgdmFsdWUpOworICAgIHJldHVybiBwdXREaXJlY3RJbnRlcm5hbDxQdXRN b2RlUHV0Pih2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCk7Cit9CisKK2lubGluZSBi b29sIEpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHlNYXlCZUluZGV4KEV4ZWNTdGF0ZSogZXhl YywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlT bG90JiBzbG90KQoreworICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAgdmFsaWRhdGVQdXRP d25EYXRhUHJvcGVydHkodm0sIHByb3BlcnR5TmFtZSwgdmFsdWUpOworICAgIGlmIChPcHRpb25h bDx1aW50MzJfdD4gaW5kZXggPSBwYXJzZUluZGV4KHByb3BlcnR5TmFtZSkpCisgICAgICAgIHJl dHVybiBwdXREaXJlY3RJbmRleChleGVjLCBpbmRleC52YWx1ZSgpLCB2YWx1ZSwgMCwgUHV0RGly ZWN0SW5kZXhMaWtlUHV0RGlyZWN0KTsKKworICAgIHJldHVybiBwdXREaXJlY3RJbnRlcm5hbDxQ dXRNb2RlUHV0Pih2bSwgcHJvcGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCk7Cit9CiAKIH0gLy8g bmFtZXNwYWNlIEpTQwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0No YW5nZUxvZwppbmRleCBmY2NjZjIzN2I4Yjg4NjMxMTAyNzUxYzAxMTk2MTlhYWExNjg4NTkzLi4w NDZjMWVmMDZkZjYxNjM1N2Y0MjAyYzczMmQ1NDAzYWI3ZTEwMDkyIDEwMDY0NAotLS0gYS9KU1Rl c3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDE5LTA5LTMwICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9AYXBwbGUuY29tPgorCisgICAgICAg IE1ha2UgYXNzZXJ0aW9uIGluIEpTT2JqZWN0OjpwdXRPd25EYXRhUHJvcGVydHkgbW9yZSBwcmVj aXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIz NzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5NTE1OTgwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgKiBzdHJlc3Mvb2JqZWN0LWFzc2lnbi10YXJn ZXQtcHJvdG8tc2V0dGVyLmpzOiBBZGRlZC4KKyAgICAgICAgKGdldCBPYmplY3QpOgorCiAyMDE5 LTA5LTI3ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pT Q10gS2VlcCBKU1N0cmluZzo6dmFsdWUoRXhlY1N0YXRlKikncyByZXN1bHQgYXMgU3RyaW5nIGlu c3RlYWQgb2YgYGNvbnN0IFN0cmluZyZgCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9vYmpl Y3QtYXNzaWduLXRhcmdldC1wcm90by1zZXR0ZXIuanMgYi9KU1Rlc3RzL3N0cmVzcy9vYmplY3Qt YXNzaWduLXRhcmdldC1wcm90by1zZXR0ZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2NmZjJjYWI0MjM3MzVm ZTUwZjhiODY2NjQ3NTdlMzdjNWQ0ZjJhZAotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3Ry ZXNzL29iamVjdC1hc3NpZ24tdGFyZ2V0LXByb3RvLXNldHRlci5qcwpAQCAtMCwwICsxLDMgQEAK K2NvbnN0IHggPSB7fTsKK09iamVjdC5kZWZpbmVQcm9wZXJ0eSh4LCAnX19wcm90b19fJywge2dl dDogKCk9Pnt9fSk7CitPYmplY3QuYXNzaWduKHgsIHsgZ2V0OiAoKT0+IHt9IH0pOwo=