200386 2019-08-02 02:16:25 -0700 JSObject::putInlineSlow should not ignore "__proto__" for Proxy 2020-05-05 17:06:12 -0700 1 1 1 Unclassified WebKit JavaScriptCore Safari 12 All All RESOLVED FIXED InRadar P2 Normal --- 1 jundong.xjd saam bfulgham commit-queue ews-feeder ews-watchlist fpizlo hexiaoyu keith_miller mark.lam msaboff product-security saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1557913 0 jundong.xjd 2019-08-02 02:16:25 -0700 poc.js ``` let map = new Map(); function v5() { function v10() { function v11() { const v12 = v5(); return null; } const handler = { getPrototypeOf:v11 }; const p = new Proxy(map,handler); map.__proto__ = p; const v16 = v10(); } try { const v17 = v10(); } catch(e) { //print(e); } } const v19 = v5(); ``` execution result: ASSERTION FAILED: baseValue.asCell()->structure(vm) == structure ../../Source/JavaScriptCore/jit/Repatch.cpp(468) : JSC::InlineCacheAction JSC::tryCachePutByID(JSC::ExecState *, JSC::JSValue, JSC::Structure *, const JSC::Identifier &, const JSC::PutPropertySlot &, JSC::StructureStubInfo &, JSC::PutKind) [1] 17017 abort (core dumped) /media/hdd/WebKit-git/webkit_build_825bbd0_20190704/Debug/bin/jsc 1557914 1 webkit-bug-importer 2019-08-02 02:16:46 -0700 <rdar://problem/53854946> 1570435 2 saam 2019-09-12 17:20:48 -0700 patch forthcoming 1570459 3 378698 saam 2019-09-12 18:20:21 -0700 Created attachment 378698 patch 1570461 4 378698 ysuzuki 2019-09-12 18:24:29 -0700 Comment on attachment 378698 patch View in context: https://bugs.webkit.org/attachment.cgi?id=378698&action=review r=me > Source/JavaScriptCore/runtime/JSObject.cpp:841 > + if (obj->type() == ProxyObjectType) { Can you fix ordinarySetSlow too? 1570462 5 saam 2019-09-12 18:31:20 -0700 (In reply to Yusuke Suzuki from comment #4) > Comment on attachment 378698 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=378698&action=review > > r=me > > > Source/JavaScriptCore/runtime/JSObject.cpp:841 > > + if (obj->type() == ProxyObjectType) { > > Can you fix ordinarySetSlow too? Good call. Fixed and added a test 1570463 6 378700 saam 2019-09-12 18:33:31 -0700 Created attachment 378700 patch for landing 1570490 7 378700 ews-watchlist 2019-09-12 20:49:49 -0700 Comment on attachment 378700 patch for landing Attachment 378700 did not pass jsc-ews (mac): Output: https://webkit-queues.webkit.org/results/13027855 New failing tests: mozilla-tests.yaml/js1_5/Array/regress-101964.js.mozilla-ftl-eager-no-cjit-validate-phases 1571193 8 saam 2019-09-16 11:48:59 -0700 The test is flaky. It's not this patch 1571205 9 378700 commit-queue 2019-09-16 12:32:46 -0700 Comment on attachment 378700 patch for landing Clearing flags on attachment: 378700 Committed r249911: <https://trac.webkit.org/changeset/249911> 1571206 10 commit-queue 2019-09-16 12:32:48 -0700 All reviewed patches have been landed. Closing bug. 1581869 11 ysuzuki 2019-10-21 10:09:01 -0700 *** Bug 202342 has been marked as a duplicate of this bug. *** 1649438 12 ysuzuki 2020-05-05 17:06:12 -0700 *** Bug 202624 has been marked as a duplicate of this bug. *** 378698 2019-09-12 18:20:21 -0700 2019-09-12 18:33:31 -0700 patch b-backup.diff text/plain 4700 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDk4MjMpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE4IEBACisyMDE5LTA5LTEyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIEpTT2JqZWN0OjpwdXRJbmxpbmVTbG93IHNob3VsZCBub3QgaWdub3Jl ICJfX3Byb3RvX18iIGZvciBQcm94eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAwMzg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Mzg1NDk0Nj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVz cy9wcm94eS1fX3Byb3RvX18taW4tcHJvdG90eXBlLWNoYWluLmpzOiBBZGRlZC4KKyAgICAgICAg KHNldCBvYmopOgorICAgICAgICAqIHN0cmVzcy9wcm94eS1wcm9wZXJ0eS1yZXBsYWNlLXN0cnVj dHVyZS10cmFuc2l0aW9uLmpzOiBBZGRlZC4KKyAgICAgICAgKG91dGVyLmlubmVyLmdldFByb3Rv dHlwZU9mKToKKyAgICAgICAgKG91dGVyLmlubmVyKToKKyAgICAgICAgKG91dGVyKToKKwogMjAx OS0wOS0xMiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSGFyZGVu IEpTQyBhZ2FpbnN0IHRoZSBhYnVzZSBvZiBydW50aW1lIG9wdGlvbnMuCkluZGV4OiBKU1Rlc3Rz L3N0cmVzcy9wcm94eS1fX3Byb3RvX18taW4tcHJvdG90eXBlLWNoYWluLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIEpTVGVzdHMvc3RyZXNzL3Byb3h5LV9fcHJvdG9fXy1pbi1wcm90b3R5cGUtY2hhaW4uanMJ KG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9zdHJlc3MvcHJveHktX19wcm90b19fLWluLXByb3Rv dHlwZS1jaGFpbi5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDExIEBACitsZXQgY2FsbGVk ID0gZmFsc2U7CitsZXQgcCA9IG5ldyBQcm94eSh7IH0sIHsKKyAgICBzZXQob2JqLCBwcm9wLCB2 YWx1ZSkgeworICAgICAgICBjYWxsZWQgPSBwcm9wID09PSAiX19wcm90b19fIjsKKyAgICB9Cit9 KTsKK2xldCBvID0ge19fcHJvdG9fXzogcH07CitvLl9fcHJvdG9fXyA9IG51bGw7CisKK2lmICgh Y2FsbGVkKQorICAgIHRocm93IG5ldyBFcnJvcjsKSW5kZXg6IEpTVGVzdHMvc3RyZXNzL3Byb3h5 LXByb3BlcnR5LXJlcGxhY2Utc3RydWN0dXJlLXRyYW5zaXRpb24uanMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g SlNUZXN0cy9zdHJlc3MvcHJveHktcHJvcGVydHktcmVwbGFjZS1zdHJ1Y3R1cmUtdHJhbnNpdGlv bi5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9wcm94eS1wcm9wZXJ0eS1yZXBs YWNlLXN0cnVjdHVyZS10cmFuc2l0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjMg QEAKK2xldCBtYXAgPSBuZXcgTWFwKCk7CitsZXQgY291bnQgPSAwOworZnVuY3Rpb24gb3V0ZXIo KSB7CisgICAgKytjb3VudDsKKyAgICBpZiAoY291bnQgPj0gNSkKKyAgICAgICAgcmV0dXJuOwor ICAgIGZ1bmN0aW9uIGlubmVyKCkgeworICAgICAgICBmdW5jdGlvbiBnZXRQcm90b3R5cGVPZigp IHsKKyAgICAgICAgICAgIGNvbnN0IHJlc3VsdCA9IG91dGVyKCk7CisgICAgICAgICAgICByZXR1 cm4gbnVsbDsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnN0IGhhbmRsZXIgPSB7IGdldFByb3Rv dHlwZU9mOiBnZXRQcm90b3R5cGVPZiB9OworICAgICAgICBjb25zdCBwID0gbmV3IFByb3h5KG1h cCxoYW5kbGVyKTsKKworICAgICAgICBtYXAuX19wcm90b19fID0gcDsKKyAgICAgICAgY29uc3Qg cmVzdWx0ID0gaW5uZXIoKTsKKyAgICB9CisgICAgdHJ5IHsKKyAgICAgICAgY29uc3QgcmVzdWx0 ID0gaW5uZXIoKTsKKyAgICB9IGNhdGNoIHsgfQorfQorY29uc3QgcmVzdWx0ID0gb3V0ZXIoKTsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ5ODE1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE5LTA5LTEyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEpTT2JqZWN0OjpwdXRJbmxpbmVTbG93IHNob3VsZCBub3QgaWdub3JlICJfX3Byb3RvX18iIGZv ciBQcm94eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAwMzg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Mzg1NDk0Nj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSB1c2VkIHRvIGlnbm9yZSAnX19w cm90b19fJyBpbiBwdXRJbmxpbmVTbG93IHdoZW4gdGhlIG9iamVjdCBpbiBxdWVzdGlvbgorICAg ICAgICB3YXMgUHJveHkuIFRoZXJlIGlzIG5vIHJlYXNvbiBmb3IgdGhpcywgYW5kIGl0IGdvZXMg YWdhaW5zdCB0aGUgc3BlYy4gU28KKyAgICAgICAgSSd2ZSByZW1vdmVkIHRoYXQgY29uZGl0aW9u LiBUaGlzIGFsc28gaGFzIHRoZSBlZmZlY3QgdGhhdCBpdCBmaXhlcyBhbgorICAgICAgICBhc3Nl cnRpb24gZmlyaW5nIGluc2lkZSBvdXIgaW5saW5lIGNhY2hpbmcgY29kZSB3aGljaCBkaWN0YXRl cyB0aGF0IGZvciBhCisgICAgICAgIHByb3BlcnR5IHJlcGxhY2UgdGhhdCB0aGUgYmFzZSB2YWx1 ZSdzIHN0cnVjdHVyZSBtdXN0IGJlIGVxdWFsIHRvIHRoZQorICAgICAgICBzdHJ1Y3R1cmUgd2hl biB3ZSBncmFiYmVkIHRoZSBzdHJ1Y3R1cmUgcHJpb3IgdG8gdGhlIHB1dCBvcGVyYXRpb24uCisg ICAgICAgIFRoZSBvbGQgY29kZSBjYXVzZWQgYSB3ZWlyZCBlZGdlIGNhc2Ugd2hlcmUgd2UgYnJv a2UgdGhpcyBpbnZhcmlhbnQuCisKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAg ICAgICAgKEpTQzo6SlNPYmplY3Q6OnB1dElubGluZVNsb3cpOgorCiAyMDE5LTA5LTEyICBNYXJr IExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBIYXJkZW4gSlNDIGFnYWluc3Qg dGhlIGFidXNlIG9mIHJ1bnRpbWUgb3B0aW9ucy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5jcHAJKHJldmlzaW9uIDI0OTgxNSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODI4LDgg KzgyOCw4IEBAIGJvb2wgSlNPYmplY3Q6OnB1dElubGluZVNsb3coRXhlY1N0YXRlKiAKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIEFTU0VSVCghKGF0dHJpYnV0ZXMgJiBQcm9wZXJ0eUF0dHJp YnV0ZTo6QWNjZXNzb3IpKTsKIAotICAgICAgICAgICAgLy8gSWYgdGhlcmUncyBhbiBleGlzdGlu ZyBwcm9wZXJ0eSBvbiB0aGUgb2JqZWN0IG9yIG9uZSBvZiBpdHMgCi0gICAgICAgICAgICAvLyBw cm90b3R5cGVzIGl0IHNob3VsZCBiZSByZXBsYWNlZCwgc28gYnJlYWsgaGVyZS4KKyAgICAgICAg ICAgIC8vIElmIHRoZXJlJ3MgYW4gZXhpc3RpbmcgcHJvcGVydHkgb24gdGhlIGJhc2Ugb2JqZWN0 LCBvciBvbiBvbmUgb2YgaXRzIAorICAgICAgICAgICAgLy8gcHJvdG90eXBlcywgd2Ugc2hvdWxk IHN0b3JlIHRoZSBwcm9wZXJ0eSBvbiB0aGUgKmJhc2UqIG9iamVjdC4KICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CiAgICAgICAgIGlmICghb2JqLT5zdGF0aWNQcm9wZXJ0aWVzUmVpZmll ZCh2bSkpIHsKQEAgLTgzOCw3ICs4MzgsNyBAQCBib29sIEpTT2JqZWN0OjpwdXRJbmxpbmVTbG93 KEV4ZWNTdGF0ZSogCiAgICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29w ZSwgcHV0RW50cnkoZXhlYywgZW50cnktPnRhYmxlLT5jbGFzc0ZvclRoaXMsIGVudHJ5LT52YWx1 ZSwgb2JqLCB0aGlzLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90KSk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KLSAgICAgICAgaWYgKG9iai0+dHlwZSgpID09IFByb3h5T2JqZWN0VHlwZSAm JiBwcm9wZXJ0eU5hbWUgIT0gdm0ucHJvcGVydHlOYW1lcy0+dW5kZXJzY29yZVByb3RvKSB7Cisg ICAgICAgIGlmIChvYmotPnR5cGUoKSA9PSBQcm94eU9iamVjdFR5cGUpIHsKICAgICAgICAgICAg IC8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgdW5jb25kaXRpb25hbGx5IHBlcmZvcm0gW1tTZXRdXSBo ZXJlLgogICAgICAgICAgICAgLy8gV2UgbmVlZCB0byBkbyBtb3JlIGJlY2F1c2UgdGhpcyBpcyBv YnNlcnZhYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1NTAxMgo= 378700 2019-09-12 18:33:31 -0700 2019-09-16 12:32:46 -0700 patch for landing b-backup.diff text/plain 5228 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDk4MjMpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTEyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIEpTT2JqZWN0OjpwdXRJbmxpbmVTbG93IHNob3VsZCBub3QgaWdub3Jl ICJfX3Byb3RvX18iIGZvciBQcm94eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAwMzg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Mzg1NDk0Nj4K KworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgICogc3RyZXNz L3Byb3h5LV9fcHJvdG9fXy1pbi1wcm90b3R5cGUtY2hhaW4uanM6IEFkZGVkLgorICAgICAgICAq IHN0cmVzcy9wcm94eS1wcm9wZXJ0eS1yZXBsYWNlLXN0cnVjdHVyZS10cmFuc2l0aW9uLmpzOiBB ZGRlZC4KKwogMjAxOS0wOS0xMiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgSGFyZGVuIEpTQyBhZ2FpbnN0IHRoZSBhYnVzZSBvZiBydW50aW1lIG9wdGlvbnMuCklu ZGV4OiBKU1Rlc3RzL3N0cmVzcy9wcm94eS1fX3Byb3RvX18taW4tcHJvdG90eXBlLWNoYWluLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL3Byb3h5LV9fcHJvdG9fXy1pbi1wcm90b3R5 cGUtY2hhaW4uanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9zdHJlc3MvcHJveHktX19wcm90 b19fLWluLXByb3RvdHlwZS1jaGFpbi5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE2IEBA CitsZXQgY2FsbGVkID0gZmFsc2U7CitsZXQgcCA9IG5ldyBQcm94eSh7IH0sIHsKKyAgICBzZXQo b2JqLCBwcm9wLCB2YWx1ZSkgeworICAgICAgICBjYWxsZWQgPSBwcm9wID09PSAiX19wcm90b19f IjsKKyAgICB9Cit9KTsKK2xldCBvID0ge19fcHJvdG9fXzogcH07CitvLl9fcHJvdG9fXyA9IG51 bGw7CisKK2lmICghY2FsbGVkKQorICAgIHRocm93IG5ldyBFcnJvcjsKKworY2FsbGVkID0gZmFs c2U7CitSZWZsZWN0LnNldChvLCAiX19wcm90b19fIiwgbnVsbCwge30pOworaWYgKCFjYWxsZWQp CisgICAgdGhyb3cgbmV3IEVycm9yOwpJbmRleDogSlNUZXN0cy9zdHJlc3MvcHJveHktcHJvcGVy dHktcmVwbGFjZS1zdHJ1Y3R1cmUtdHJhbnNpdGlvbi5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rlc3Rz L3N0cmVzcy9wcm94eS1wcm9wZXJ0eS1yZXBsYWNlLXN0cnVjdHVyZS10cmFuc2l0aW9uLmpzCShu b25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL3Byb3h5LXByb3BlcnR5LXJlcGxhY2Utc3Ry dWN0dXJlLXRyYW5zaXRpb24uanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyMyBAQAorbGV0 IG1hcCA9IG5ldyBNYXAoKTsKK2xldCBjb3VudCA9IDA7CitmdW5jdGlvbiBvdXRlcigpIHsKKyAg ICArK2NvdW50OworICAgIGlmIChjb3VudCA+PSA1KQorICAgICAgICByZXR1cm47CisgICAgZnVu Y3Rpb24gaW5uZXIoKSB7CisgICAgICAgIGZ1bmN0aW9uIGdldFByb3RvdHlwZU9mKCkgeworICAg ICAgICAgICAgY29uc3QgcmVzdWx0ID0gb3V0ZXIoKTsKKyAgICAgICAgICAgIHJldHVybiBudWxs OworICAgICAgICB9CisKKyAgICAgICAgY29uc3QgaGFuZGxlciA9IHsgZ2V0UHJvdG90eXBlT2Y6 IGdldFByb3RvdHlwZU9mIH07CisgICAgICAgIGNvbnN0IHAgPSBuZXcgUHJveHkobWFwLGhhbmRs ZXIpOworCisgICAgICAgIG1hcC5fX3Byb3RvX18gPSBwOworICAgICAgICBjb25zdCByZXN1bHQg PSBpbm5lcigpOworICAgIH0KKyAgICB0cnkgeworICAgICAgICBjb25zdCByZXN1bHQgPSBpbm5l cigpOworICAgIH0gY2F0Y2ggeyB9Cit9Citjb25zdCByZXN1bHQgPSBvdXRlcigpOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDk4MTUpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTkt MDktMTIgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgSlNPYmpl Y3Q6OnB1dElubGluZVNsb3cgc2hvdWxkIG5vdCBpZ25vcmUgIl9fcHJvdG9fXyIgZm9yIFByb3h5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzODYK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUzODU0OTQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5 IFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgV2UgdXNlZCB0byBpZ25vcmUgJ19fcHJvdG9fXycg aW4gcHV0SW5saW5lU2xvdyB3aGVuIHRoZSBvYmplY3QgaW4gcXVlc3Rpb24KKyAgICAgICAgd2Fz IFByb3h5LiBUaGVyZSBpcyBubyByZWFzb24gZm9yIHRoaXMsIGFuZCBpdCBnb2VzIGFnYWluc3Qg dGhlIHNwZWMuIFNvCisgICAgICAgIEkndmUgcmVtb3ZlZCB0aGF0IGNvbmRpdGlvbi4gVGhpcyBh bHNvIGhhcyB0aGUgZWZmZWN0IHRoYXQgaXQgZml4ZXMgYW4KKyAgICAgICAgYXNzZXJ0aW9uIGZp cmluZyBpbnNpZGUgb3VyIGlubGluZSBjYWNoaW5nIGNvZGUgd2hpY2ggZGljdGF0ZXMgdGhhdCBm b3IgYQorICAgICAgICBwcm9wZXJ0eSByZXBsYWNlIHRoYXQgdGhlIGJhc2UgdmFsdWUncyBzdHJ1 Y3R1cmUgbXVzdCBiZSBlcXVhbCB0byB0aGUKKyAgICAgICAgc3RydWN0dXJlIHdoZW4gd2UgZ3Jh YmJlZCB0aGUgc3RydWN0dXJlIHByaW9yIHRvIHRoZSBwdXQgb3BlcmF0aW9uLgorICAgICAgICBU aGUgb2xkIGNvZGUgY2F1c2VkIGEgd2VpcmQgZWRnZSBjYXNlIHdoZXJlIHdlIGJyb2tlIHRoaXMg aW52YXJpYW50LgorCisgICAgICAgICogcnVudGltZS9KU09iamVjdC5jcHA6CisgICAgICAgIChK U0M6OkpTT2JqZWN0OjpwdXRJbmxpbmVTbG93KToKKwogMjAxOS0wOS0xMiAgTWFyayBMYW0gIDxt YXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSGFyZGVuIEpTQyBhZ2FpbnN0IHRoZSBhYnVz ZSBvZiBydW50aW1lIG9wdGlvbnMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU09iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3QuY3BwCShyZXZpc2lvbiAyNDk4MTUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4NCw3ICs2ODQsNyBA QCBib29sIG9yZGluYXJ5U2V0U2xvdyhFeGVjU3RhdGUqIGV4ZWMsIEpTCiAgICAgSlNPYmplY3Qq IGN1cnJlbnQgPSBvYmplY3Q7CiAgICAgUHJvcGVydHlEZXNjcmlwdG9yIG93bkRlc2NyaXB0b3I7 CiAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgaWYgKGN1cnJlbnQtPnR5cGUoKSA9PSBQcm94 eU9iamVjdFR5cGUgJiYgcHJvcGVydHlOYW1lICE9IHZtLnByb3BlcnR5TmFtZXMtPnVuZGVyc2Nv cmVQcm90bykgeworICAgICAgICBpZiAoY3VycmVudC0+dHlwZSgpID09IFByb3h5T2JqZWN0VHlw ZSkgewogICAgICAgICAgICAgUHJveHlPYmplY3QqIHByb3h5ID0ganNDYXN0PFByb3h5T2JqZWN0 Kj4oY3VycmVudCk7CiAgICAgICAgICAgICBQdXRQcm9wZXJ0eVNsb3Qgc2xvdChyZWNlaXZlciwg c2hvdWxkVGhyb3cpOwogICAgICAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBwcm94 eS0+UHJveHlPYmplY3Q6OnB1dChwcm94eSwgZXhlYywgcHJvcGVydHlOYW1lLCB2YWx1ZSwgc2xv dCkpOwpAQCAtODI4LDggKzgyOCw4IEBAIGJvb2wgSlNPYmplY3Q6OnB1dElubGluZVNsb3coRXhl Y1N0YXRlKiAKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIEFTU0VSVCghKGF0dHJpYnV0ZXMg JiBQcm9wZXJ0eUF0dHJpYnV0ZTo6QWNjZXNzb3IpKTsKIAotICAgICAgICAgICAgLy8gSWYgdGhl cmUncyBhbiBleGlzdGluZyBwcm9wZXJ0eSBvbiB0aGUgb2JqZWN0IG9yIG9uZSBvZiBpdHMgCi0g ICAgICAgICAgICAvLyBwcm90b3R5cGVzIGl0IHNob3VsZCBiZSByZXBsYWNlZCwgc28gYnJlYWsg aGVyZS4KKyAgICAgICAgICAgIC8vIElmIHRoZXJlJ3MgYW4gZXhpc3RpbmcgcHJvcGVydHkgb24g dGhlIGJhc2Ugb2JqZWN0LCBvciBvbiBvbmUgb2YgaXRzIAorICAgICAgICAgICAgLy8gcHJvdG90 eXBlcywgd2Ugc2hvdWxkIHN0b3JlIHRoZSBwcm9wZXJ0eSBvbiB0aGUgKmJhc2UqIG9iamVjdC4K ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGlmICghb2JqLT5zdGF0aWNQ cm9wZXJ0aWVzUmVpZmllZCh2bSkpIHsKQEAgLTgzOCw3ICs4MzgsNyBAQCBib29sIEpTT2JqZWN0 OjpwdXRJbmxpbmVTbG93KEV4ZWNTdGF0ZSogCiAgICAgICAgICAgICAgICAgICAgIFJFTEVBU0Vf QU5EX1JFVFVSTihzY29wZSwgcHV0RW50cnkoZXhlYywgZW50cnktPnRhYmxlLT5jbGFzc0ZvclRo aXMsIGVudHJ5LT52YWx1ZSwgb2JqLCB0aGlzLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90KSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgaWYgKG9iai0+dHlwZSgpID09IFBy b3h5T2JqZWN0VHlwZSAmJiBwcm9wZXJ0eU5hbWUgIT0gdm0ucHJvcGVydHlOYW1lcy0+dW5kZXJz Y29yZVByb3RvKSB7CisgICAgICAgIGlmIChvYmotPnR5cGUoKSA9PSBQcm94eU9iamVjdFR5cGUp IHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgdW5jb25kaXRpb25hbGx5IHBl cmZvcm0gW1tTZXRdXSBoZXJlLgogICAgICAgICAgICAgLy8gV2UgbmVlZCB0byBkbyBtb3JlIGJl Y2F1c2UgdGhpcyBpcyBvYnNlcnZhYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgLy8gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTAxMgo=