224610 2021-04-15 08:16:16 -0700 HashMapImpl::rehash() should use a version of jsMapHash that cannot throw. 2021-04-15 19:08:35 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224616 224619 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1750615 0 mark.lam 2021-04-15 08:16:16 -0700 rdar://76698910 1750623 1 426109 mark.lam 2021-04-15 08:38:30 -0700 Created attachment 426109 proposed patch. 1750758 2 426133 mark.lam 2021-04-15 13:42:02 -0700 Created attachment 426133 proposed patch. 1750777 3 426133 ysuzuki 2021-04-15 14:12:22 -0700 Comment on attachment 426133 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=426133&action=review > Source/JavaScriptCore/runtime/HashMapImplInlines.h:426 > EXCEPTION_ASSERT_WITH_MESSAGE(!scope.exception(), "All keys should already be hashed before, so this should not throw because it won't resolve ropes."); Why don't we just ignore terminated exception in this assertion? DeferTermination scope inserts two function calls, so this is not a zero-cost. While this function is anyway taking some time, if we replace EXCEPTION_ASSERT with the above idiom, we will see a bad case. Now, pure EXCEPTION_ASSERT is almost meaningless since TerminatedExcecution exception can be thrown almost at any time. So, I propose that just ignoring TerminatedExcution in EXCEPTION_ASSERT etc. code, if it is used to ensure that there is not exception, so, 1. Let's replace EXCEPTION_ASSERT with scope.assertNoException if it is used to ensure there is no exceptions. 2. And let's ignore TerminatedExecution exception in assertNoException. So, we can keep these handling nop in Release build. 1750830 4 mark.lam 2021-04-15 16:21:59 -0700 (In reply to Yusuke Suzuki from comment #3) > So, I propose that just ignoring TerminatedExcution in EXCEPTION_ASSERT etc. > code, if it is used to ensure that there is not exception, so, > > 1. Let's replace EXCEPTION_ASSERT with scope.assertNoException if it is used > to ensure there is no exceptions. > 2. And let's ignore TerminatedExecution exception in assertNoException. > > So, we can keep these handling nop in Release build. For the record, Yusuke and I discussed this offline: the EXCEPTION_ASSERT_WITH_MESSAGE in HashMapImpl::rehash() is not where the TerminationException gets thrown. Instead, it is thrown from the RETURN_IF_EXCEPTION in jsMapHash(). Yusuke suggested that I add a jsMapHashForAlreadyHashedValue() function that doesn't have this RETURN_IF_EXCEPTION. I will go with that solution. 1750853 5 426158 mark.lam 2021-04-15 17:08:43 -0700 Created attachment 426158 proposed patch. 1750861 6 426158 ysuzuki 2021-04-15 17:38:08 -0700 Comment on attachment 426158 proposed patch. r=me 1750894 7 mark.lam 2021-04-15 19:08:35 -0700 Thanks for the reviews. Landed in r276106: <http://trac.webkit.org/r276106>. 426109 2021-04-15 08:38:30 -0700 2021-04-15 13:42:02 -0700 proposed patch. bug-224610.patch text/plain 3382 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNzYwMjApCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIxLTA0LTE1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBIYXNoTWFwSW1wbDo6cmVoYXNoKCkgc2hvdWxkIGRlZmVyIHRlcm1pbmF0 aW9uIGFyb3VuZCB0aGUgcmVoYXNoIG9wZXJhdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDYxMAorICAgICAgICByZGFyOi8vNzY2OTg5MTAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVz cy9zdXBwcmVzcy1UZXJtaW5hdGlvbkV4Y2VwdGlvbi1pbi1IYXNoTWFwSW1wbC1yZWhhc2guanM6 IEFkZGVkLgorCiAyMDIxLTA0LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgbWlzc2luZyBleGNlcHRpb24gY2hlY2sgaW4gb3BlcmF0aW9uR2V0UHJpdmF0 ZU5hbWVPcHRpbWl6ZSgpLgpJbmRleDogSlNUZXN0cy9zdHJlc3Mvc3VwcHJlc3MtVGVybWluYXRp b25FeGNlcHRpb24taW4tSGFzaE1hcEltcGwtcmVoYXNoLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVz dHMvc3RyZXNzL3N1cHByZXNzLVRlcm1pbmF0aW9uRXhjZXB0aW9uLWluLUhhc2hNYXBJbXBsLXJl aGFzaC5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9zdXBwcmVzcy1UZXJtaW5h dGlvbkV4Y2VwdGlvbi1pbi1IYXNoTWFwSW1wbC1yZWhhc2guanMJKHdvcmtpbmcgY29weSkKQEAg LTAsMCArMSw1IEBACisvL0AgcnVuRGVmYXVsdCgiLS13YXRjaGRvZz0xMDAiLCAiLS13YXRjaGRv Zy1leGNlcHRpb24tb2siKQorCitmb3IgKGxldCBpPTA7IGk8MTAwMDsgaSsrKSB7CisgIG5ldyBT ZXQoJ2FiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6Jyk7Cit9CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cJKHJldmlzaW9uIDI3NjAyMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAyMS0wNC0xNSAgTWFyayBM YW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisKKyAgICAgICAgSGFzaE1hcEltcGw6OnJlaGFzaCgp IHNob3VsZCBkZWZlciB0ZXJtaW5hdGlvbiBhcm91bmQgdGhlIHJlaGFzaCBvcGVyYXRpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ2MTAKKyAg ICAgICAgcmRhcjovLzc2Njk4OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRm9yIGNvbnRleHQsIEhhc2hNYXBJbXBsOjpyZWhhc2goKSdzIHJlaGFz aCBvcGVyYXRpb24gcmVseSBvbiBqc01hcEhhc2goKS4KKyAgICAgICAganNNYXBIYXNoKCkgY2Fu IGJlIGludGVycnVwdGVkIGJ5IGEgVGVybWluYXRpb25FeGNlcHRpb24sIGFuZCBhcyBhIHJlc3Vs dCwgbWF5CisgICAgICAgIG5vdCByZXR1cm4gdGhlIHN0cmluZyBoYXNoIHdlIGFyZSBleHBlY3Rp bmcuICBUaGlzIGluIHR1cm4gY2FuIGxlYWQgdG8gdGhlCisgICAgICAgIHJlaGFzaCBvcGVyYXRp b24gaGFzaGluZyB3aXRoIHdyb25nIGtleXMuCisKKyAgICAgICAgUmVtZW1iZXIsIHRoZSBUZXJt aW5hdGlvbkV4Y2VwdGlvbiBvbmx5IHRlcm1pbmF0ZXMgdGhlIGN1cnJlbnQgZXhlY3V0aW9uIHN0 YWNrLgorICAgICAgICBJdCBpcyBub3QgYSBwZXJtYW5lbnQgdGVybWluYXRpb24gb2YgdGhlIFZN LiAgSGVuY2UsIHRoZSBjbGllbnQgbWF5IHJlLWVudGVyIHRoZQorICAgICAgICBWTSBhZ2Fpbi4g IEhlbmNlLCB3ZSBzaG91bGQgcHJldmVudCB0aGUgVGVybWluYXRpb25FeGNlcHRpb24gZnJvbSBp bnRlcnJ1cHRpbmcKKyAgICAgICAgYSByZWhhc2ggb3BlcmF0aW9uIGFuZCBsZWF2aW5nIHRoZSBI YXNoTWFwSW1wbCBpbiBhbiBpbmNvbnNpc3RlbnQgc3RhdGUuCisKKyAgICAgICAgKiBydW50aW1l L0hhc2hNYXBJbXBsLmg6CisgICAgICAgIChKU0M6Okhhc2hNYXBJbXBsOjpyZWhhc2gpOgorCiAy MDIxLTA0LTE1ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAg W0pTQ10gQ2hhbmdlIFZlY3Rvcjw+IHRvIEZpeGVkVmVjdG9yPD4gaW4gREZHOjpDb21tb25EYXRh IGlmIHBvc3NpYmxlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IYXNoTWFw SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hN YXBJbXBsLmgJKHJldmlzaW9uIDI3NTk5OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0hhc2hNYXBJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTcwMiw2ICs3MDIsMTAgQEAgcHJp dmF0ZToKICAgICAgICAgY29uc3QgdWludDMyX3QgbWFzayA9IG1fY2FwYWNpdHkgLSAxOwogICAg ICAgICBSRUxFQVNFX0FTU0VSVCghKG1fY2FwYWNpdHkgJiAobV9jYXBhY2l0eSAtIDEpKSk7CiAg ICAgICAgIEhhc2hNYXBCdWNrZXRUeXBlKiogYnVmZmVyID0gdGhpcy0+YnVmZmVyKCk7CisKKyAg ICAgICAgLy8gV2UgZG9uJ3Qgd2FudCBhIFRlcm1pbmF0aW9uRXhjZXB0aW9uIHNob3dpbmcgdXAg aW4gdGhlIG1pZGRsZSBvZiBqc01hcEhhc2guCisgICAgICAgIC8vIFRoYXQgY291bGQgbGVhdmUg dGhpcyBIYXNoTWFwSW1wbCBpbiBhbiBpbmNvbnNpc3RlbnQgc3RhdGUuCisgICAgICAgIERlZmVy VGVybWluYXRpb24gZGVmZXJTY29wZSh2bSk7CiAgICAgICAgIHdoaWxlIChpdGVyICE9IGVuZCkg ewogICAgICAgICAgICAgdWludDMyX3QgaW5kZXggPSBqc01hcEhhc2goZ2xvYmFsT2JqZWN0LCB2 bSwgaXRlci0+a2V5KCkpICYgbWFzazsKICAgICAgICAgICAgIEVYQ0VQVElPTl9BU1NFUlRfV0lU SF9NRVNTQUdFKCFzY29wZS5leGNlcHRpb24oKSwgIkFsbCBrZXlzIHNob3VsZCBhbHJlYWR5IGJl IGhhc2hlZCBiZWZvcmUsIHNvIHRoaXMgc2hvdWxkIG5vdCB0aHJvdyBiZWNhdXNlIGl0IHdvbid0 IHJlc29sdmUgcm9wZXMuIik7Cg== 426133 2021-04-15 13:42:02 -0700 2021-04-15 17:08:43 -0700 proposed patch. bug-224610.patch text/plain 3585 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNzYwNzApCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIxLTA0LTE1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBIYXNoTWFwSW1wbDo6cmVoYXNoKCkgc2hvdWxkIGRlZmVyIHRlcm1pbmF0 aW9uIGFyb3VuZCB0aGUgcmVoYXNoIG9wZXJhdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDYxMAorICAgICAgICByZGFyOi8vNzY2OTg5MTAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVz cy9zdXBwcmVzcy1UZXJtaW5hdGlvbkV4Y2VwdGlvbi1pbi1IYXNoTWFwSW1wbC1yZWhhc2guanM6 IEFkZGVkLgorCiAyMDIxLTA0LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgbWlzc2luZyBleGNlcHRpb24gY2hlY2sgaW4gb3BlcmF0aW9uR2V0UHJpdmF0 ZU5hbWVPcHRpbWl6ZSgpLgpJbmRleDogSlNUZXN0cy9zdHJlc3Mvc3VwcHJlc3MtVGVybWluYXRp b25FeGNlcHRpb24taW4tSGFzaE1hcEltcGwtcmVoYXNoLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVz dHMvc3RyZXNzL3N1cHByZXNzLVRlcm1pbmF0aW9uRXhjZXB0aW9uLWluLUhhc2hNYXBJbXBsLXJl aGFzaC5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9zdXBwcmVzcy1UZXJtaW5h dGlvbkV4Y2VwdGlvbi1pbi1IYXNoTWFwSW1wbC1yZWhhc2guanMJKHdvcmtpbmcgY29weSkKQEAg LTAsMCArMSw1IEBACisvL0AgcnVuRGVmYXVsdCgiLS13YXRjaGRvZz0xMDAiLCAiLS13YXRjaGRv Zy1leGNlcHRpb24tb2siKQorCitmb3IgKGxldCBpPTA7IGk8MTAwMDsgaSsrKSB7CisgIG5ldyBT ZXQoJ2FiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6Jyk7Cit9CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cJKHJldmlzaW9uIDI3NjA2OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAyMS0wNC0xNSAgTWFyayBM YW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisKKyAgICAgICAgSGFzaE1hcEltcGw6OnJlaGFzaCgp IHNob3VsZCBkZWZlciB0ZXJtaW5hdGlvbiBhcm91bmQgdGhlIHJlaGFzaCBvcGVyYXRpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ2MTAKKyAg ICAgICAgcmRhcjovLzc2Njk4OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRm9yIGNvbnRleHQsIEhhc2hNYXBJbXBsOjpyZWhhc2goKSdzIHJlaGFz aCBvcGVyYXRpb24gcmVseSBvbiBqc01hcEhhc2goKS4KKyAgICAgICAganNNYXBIYXNoKCkgY2Fu IGJlIGludGVycnVwdGVkIGJ5IGEgVGVybWluYXRpb25FeGNlcHRpb24sIGFuZCBhcyBhIHJlc3Vs dCwgbWF5CisgICAgICAgIG5vdCByZXR1cm4gdGhlIHN0cmluZyBoYXNoIHdlIGFyZSBleHBlY3Rp bmcuICBUaGlzIGluIHR1cm4gY2FuIGxlYWQgdG8gdGhlCisgICAgICAgIHJlaGFzaCBvcGVyYXRp b24gaGFzaGluZyB3aXRoIHdyb25nIGtleXMuCisKKyAgICAgICAgUmVtZW1iZXIsIHRoZSBUZXJt aW5hdGlvbkV4Y2VwdGlvbiBvbmx5IHRlcm1pbmF0ZXMgdGhlIGN1cnJlbnQgZXhlY3V0aW9uIHN0 YWNrLgorICAgICAgICBJdCBpcyBub3QgYSBwZXJtYW5lbnQgdGVybWluYXRpb24gb2YgdGhlIFZN LiAgSGVuY2UsIHRoZSBjbGllbnQgbWF5IHJlLWVudGVyIHRoZQorICAgICAgICBWTSBhZ2Fpbi4g IEhlbmNlLCB3ZSBzaG91bGQgcHJldmVudCB0aGUgVGVybWluYXRpb25FeGNlcHRpb24gZnJvbSBp bnRlcnJ1cHRpbmcKKyAgICAgICAgYSByZWhhc2ggb3BlcmF0aW9uIGFuZCBsZWF2aW5nIHRoZSBI YXNoTWFwSW1wbCBpbiBhbiBpbmNvbnNpc3RlbnQgc3RhdGUuCisKKyAgICAgICAgKiBydW50aW1l L0hhc2hNYXBJbXBsSW5saW5lcy5oOgorICAgICAgICAoSlNDOjpIYXNoTWFwSW1wbDxIYXNoTWFw QnVja2V0VHlwZT46OnJlaGFzaCk6CisKIDIwMjEtMDQtMTUgIE1hcmsgTGFtICA8bWFyay5sYW1A YXBwbGUuY29tPgogCiAgICAgICAgIE9wdGltaXplIHRoZSBEZWZlclRlcm1pbmF0aW9uIHNjb3Bl IHRvIGJlIG1vcmUgZWZmaWNpZW50LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSGFzaE1hcEltcGxJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSGFzaE1hcEltcGxJbmxpbmVzLmgJKHJldmlzaW9uIDI3NjA2OCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hNYXBJbXBsSW5saW5lcy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNSw4ICsyNSwxMCBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkRl ZmVyVGVybWluYXRpb24uaCIKICNpbmNsdWRlICJIYXNoTWFwSW1wbC5oIgogI2luY2x1ZGUgIkpT Q0pTVmFsdWVJbmxpbmVzLmgiCisjaW5jbHVkZSAiVk1UcmFwc0lubGluZXMuaCIKIAogbmFtZXNw YWNlIEpTQyB7CiAKQEAgLTQxNSw2ICs0MTcsMTAgQEAgdm9pZCBIYXNoTWFwSW1wbDxIYXNoTWFw QnVja2V0VHlwZT46OnJlaAogICAgIGNvbnN0IHVpbnQzMl90IG1hc2sgPSBtX2NhcGFjaXR5IC0g MTsKICAgICBSRUxFQVNFX0FTU0VSVCghKG1fY2FwYWNpdHkgJiAobV9jYXBhY2l0eSAtIDEpKSk7 CiAgICAgSGFzaE1hcEJ1Y2tldFR5cGUqKiBidWZmZXIgPSB0aGlzLT5idWZmZXIoKTsKKworICAg IC8vIFdlIGRvbid0IHdhbnQgYSBUZXJtaW5hdGlvbkV4Y2VwdGlvbiBzaG93aW5nIHVwIGluIHRo ZSBtaWRkbGUgb2YganNNYXBIYXNoLgorICAgIC8vIFRoYXQgY291bGQgbGVhdmUgdGhpcyBIYXNo TWFwSW1wbCBpbiBhbiBpbmNvbnNpc3RlbnQgc3RhdGUuCisgICAgRGVmZXJUZXJtaW5hdGlvbiBk ZWZlclNjb3BlKHZtKTsKICAgICB3aGlsZSAoaXRlciAhPSBlbmQpIHsKICAgICAgICAgdWludDMy X3QgaW5kZXggPSBqc01hcEhhc2goZ2xvYmFsT2JqZWN0LCB2bSwgaXRlci0+a2V5KCkpICYgbWFz azsKICAgICAgICAgRVhDRVBUSU9OX0FTU0VSVF9XSVRIX01FU1NBR0UoIXNjb3BlLmV4Y2VwdGlv bigpLCAiQWxsIGtleXMgc2hvdWxkIGFscmVhZHkgYmUgaGFzaGVkIGJlZm9yZSwgc28gdGhpcyBz aG91bGQgbm90IHRocm93IGJlY2F1c2UgaXQgd29uJ3QgcmVzb2x2ZSByb3Blcy4iKTsK 426158 2021-04-15 17:08:43 -0700 2021-04-15 17:38:08 -0700 proposed patch. bug-224610.patch text/plain 5558 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNzYwNzApCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIxLTA0LTE1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBIYXNoTWFwSW1wbDo6cmVoYXNoKCkgc2hvdWxkIHVzZSBhIHZlcnNpb24g b2YganNNYXBIYXNoIHRoYXQgY2Fubm90IHRocm93LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjEwCisgICAgICAgIHJkYXI6Ly83NjY5ODkxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNz L3N1cHByZXNzLVRlcm1pbmF0aW9uRXhjZXB0aW9uLWluLUhhc2hNYXBJbXBsLXJlaGFzaC5qczog QWRkZWQuCisKIDIwMjEtMDQtMTQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCBtaXNzaW5nIGV4Y2VwdGlvbiBjaGVjayBpbiBvcGVyYXRpb25HZXRQcml2YXRl TmFtZU9wdGltaXplKCkuCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9zdXBwcmVzcy1UZXJtaW5hdGlv bkV4Y2VwdGlvbi1pbi1IYXNoTWFwSW1wbC1yZWhhc2guanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0 cy9zdHJlc3Mvc3VwcHJlc3MtVGVybWluYXRpb25FeGNlcHRpb24taW4tSGFzaE1hcEltcGwtcmVo YXNoLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL3N1cHByZXNzLVRlcm1pbmF0 aW9uRXhjZXB0aW9uLWluLUhhc2hNYXBJbXBsLXJlaGFzaC5qcwkod29ya2luZyBjb3B5KQpAQCAt MCwwICsxLDUgQEAKKy8vQCBydW5EZWZhdWx0KCItLXdhdGNoZG9nPTEwMCIsICItLXdhdGNoZG9n LWV4Y2VwdGlvbi1vayIpCisKK2ZvciAobGV0IGk9MDsgaTwxMDAwOyBpKyspIHsKKyAgbmV3IFNl dCgnYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXonKTsKK30KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwkocmV2aXNpb24gMjc2MDg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA0LTE1ICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBIYXNoTWFwSW1wbDo6cmVoYXNoKCkg c2hvdWxkIHVzZSBhIHZlcnNpb24gb2YganNNYXBIYXNoIHRoYXQgY2Fubm90IHRocm93LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjEwCisgICAg ICAgIHJkYXI6Ly83NjY5ODkxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZvciBjb250ZXh0LCBIYXNoTWFwSW1wbDo6cmVoYXNoKCkncyByZWhhc2gg b3BlcmF0aW9uIHJlbGllcyBvbiBqc01hcEhhc2goKS4KKyAgICAgICAganNNYXBIYXNoKCkgY2Fu IGJlIGludGVycnVwdGVkIGJ5IGEgVGVybWluYXRpb25FeGNlcHRpb24sIGFuZCBhcyBhIHJlc3Vs dCwgbWF5CisgICAgICAgIG5vdCByZXR1cm4gdGhlIHN0cmluZyBoYXNoIHdlIGFyZSBleHBlY3Rp bmcuICBUaGlzIGluIHR1cm4gY2FuIGxlYWQgdG8gdGhlCisgICAgICAgIHJlaGFzaCBvcGVyYXRp b24gaGFzaGluZyB3aXRoIHdyb25nIGtleXMuCisKKyAgICAgICAgSG93ZXZlciwgYWxsIHRoZSBr ZXlzIHNob3VsZCBoYXZlIGFscmVhZHkgYmVlbiBoYXNoZWQuICBIZW5jZSwgcmVoYXNoKCkgc2hv dWxkCisgICAgICAgIG5ldmVyIHNlZSBhbiBleGNlcHRpb24gdGhyb3duIHRoZXJlLiAgV2UgY2Fu IGF2b2lkIHRoaXMgY29tcGxpY2F0aW9uIHdpdGggdGhlCisgICAgICAgIFRlcm1pbmF0aW9uRXhj ZXB0aW9uIGJ5IHNpbXBseSBjYWxsaW5nIGFuIGFsdGVybmF0ZSB2ZXJzaW9uIG9mIGpzTWFwSGFz aCgpIHRoYXQKKyAgICAgICAgaXMgZ3VhcmFudGVlZCB0byBuZXZlciB0aHJvdyBlLmcuIGEganNN YXBIYXNoRm9yQWxyZWFkeUhhc2hlZFZhbHVlKCkgZnVuY3Rpb24uCisKKyAgICAgICAgKiBydW50 aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaDoKKyAgICAgICAgKiBydW50aW1lL0hhc2hNYXBJbXBsSW5s aW5lcy5oOgorICAgICAgICAoSlNDOjpqc01hcEhhc2hJbXBsKToKKyAgICAgICAgKEpTQzo6anNN YXBIYXNoKToKKyAgICAgICAgKEpTQzo6anNNYXBIYXNoRm9yQWxyZWFkeUhhc2hlZFZhbHVlKToK KyAgICAgICAgKEpTQzo6SGFzaE1hcEltcGw8SGFzaE1hcEJ1Y2tldFR5cGU+OjpyZWhhc2gpOgor CiAyMDIxLTA0LTE1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBP cHRpbWl6ZSB0aGUgRGVmZXJUZXJtaW5hdGlvbiBzY29wZSB0byBiZSBtb3JlIGVmZmljaWVudC4K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbkhlbHBlcnMuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb25IZWxw ZXJzLmgJKHJldmlzaW9uIDI3NjA2OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0V4Y2VwdGlvbkhlbHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsMTEgQEAKIAog bmFtZXNwYWNlIEpTQyB7CiAKK2VudW0gY2xhc3MgRXhjZXB0aW9uRXhwZWN0YXRpb24geworICAg IENhblRocm93LAorICAgIFNob3VsZE5vdFRocm93Cit9OworCiB0eXBlZGVmIEpTT2JqZWN0KiAo KkVycm9yRmFjdG9yeSkoSlNHbG9iYWxPYmplY3QqLCBjb25zdCBTdHJpbmcmLCBFcnJvckluc3Rh bmNlOjpTb3VyY2VBcHBlbmRlcik7CiAKIFN0cmluZyBkZWZhdWx0U291cmNlQXBwZW5kZXIoY29u c3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgUnVudGltZVR5cGUsIEVycm9ySW5zdGFuY2U6OlNv dXJjZVRleHRXaGVyZUVycm9yT2NjdXJyZWQpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSGFzaE1hcEltcGxJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSGFzaE1hcEltcGxJbmxpbmVzLmgJKHJldmlzaW9uIDI3NjA2OCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hNYXBJbXBsSW5saW5lcy5oCSh3 b3JraW5nIGNvcHkpCkBAIC04NCwxNCArODQsMTggQEAgQUxXQVlTX0lOTElORSB1aW50MzJfdCBq c01hcEhhc2goSlNCaWdJbgogICAgIHJldHVybiBiaWdJbnQtPmhhc2goKTsKIH0KIAotQUxXQVlT X0lOTElORSB1aW50MzJfdCBqc01hcEhhc2goSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwg Vk0mIHZtLCBKU1ZhbHVlIHZhbHVlKQordGVtcGxhdGU8RXhjZXB0aW9uRXhwZWN0YXRpb24gZXhw ZWN0aW9uPgorQUxXQVlTX0lOTElORSB1aW50MzJfdCBqc01hcEhhc2hJbXBsKEpTR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QsIFZNJiB2bSwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBBU1NFUlRf V0lUSF9NRVNTQUdFKG5vcm1hbGl6ZU1hcEtleSh2YWx1ZSkgPT0gdmFsdWUsICJXZSBleHBlY3Qg bm9ybWFsaXplZCB2YWx1ZXMgZmxvd2luZyBpbnRvIHRoaXMgZnVuY3Rpb24uIik7CiAKICAgICBp ZiAodmFsdWUuaXNTdHJpbmcoKSkgewogICAgICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJP V19TQ09QRSh2bSk7CiAgICAgICAgIGNvbnN0IFN0cmluZyYgd3RmU3RyaW5nID0gYXNTdHJpbmco dmFsdWUpLT52YWx1ZShnbG9iYWxPYmplY3QpOwotICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBVSU5UX01BWCk7CisgICAgICAgIGlmIGNvbnN0ZXhwciAoZXhwZWN0aW9uID09IEV4 Y2VwdGlvbkV4cGVjdGF0aW9uOjpDYW5UaHJvdykKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIFVJTlRfTUFYKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgRVhDRVBU SU9OX0FTU0VSVCghc2NvcGUuZXhjZXB0aW9uKCkpOwogICAgICAgICByZXR1cm4gd3RmU3RyaW5n LmltcGwoKS0+aGFzaCgpOwogICAgIH0KIApAQCAtMTAxLDYgKzEwNSwxNiBAQCBBTFdBWVNfSU5M SU5FIHVpbnQzMl90IGpzTWFwSGFzaChKU0dsb2JhCiAgICAgcmV0dXJuIHdhbmdzSW50NjRIYXNo KEpTVmFsdWU6OmVuY29kZSh2YWx1ZSkpOwogfQogCitBTFdBWVNfSU5MSU5FIHVpbnQzMl90IGpz TWFwSGFzaChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBWTSYgdm0sIEpTVmFsdWUgdmFs dWUpCit7CisgICAgcmV0dXJuIGpzTWFwSGFzaEltcGw8RXhjZXB0aW9uRXhwZWN0YXRpb246OkNh blRocm93PihnbG9iYWxPYmplY3QsIHZtLCB2YWx1ZSk7Cit9CisKK0FMV0FZU19JTkxJTkUgdWlu dDMyX3QganNNYXBIYXNoRm9yQWxyZWFkeUhhc2hlZFZhbHVlKEpTR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplY3QsIFZNJiB2bSwgSlNWYWx1ZSB2YWx1ZSkKK3sKKyAgICByZXR1cm4ganNNYXBIYXNo SW1wbDxFeGNlcHRpb25FeHBlY3RhdGlvbjo6U2hvdWxkTm90VGhyb3c+KGdsb2JhbE9iamVjdCwg dm0sIHZhbHVlKTsKK30KKwogQUxXQVlTX0lOTElORSBPcHRpb25hbDx1aW50MzJfdD4gY29uY3Vy cmVudEpTTWFwSGFzaChKU1ZhbHVlIGtleSkKIHsKICAgICBrZXkgPSBub3JtYWxpemVNYXBLZXko a2V5KTsKQEAgLTQxNiw3ICs0MzAsNyBAQCB2b2lkIEhhc2hNYXBJbXBsPEhhc2hNYXBCdWNrZXRU eXBlPjo6cmVoCiAgICAgUkVMRUFTRV9BU1NFUlQoIShtX2NhcGFjaXR5ICYgKG1fY2FwYWNpdHkg LSAxKSkpOwogICAgIEhhc2hNYXBCdWNrZXRUeXBlKiogYnVmZmVyID0gdGhpcy0+YnVmZmVyKCk7 CiAgICAgd2hpbGUgKGl0ZXIgIT0gZW5kKSB7Ci0gICAgICAgIHVpbnQzMl90IGluZGV4ID0ganNN YXBIYXNoKGdsb2JhbE9iamVjdCwgdm0sIGl0ZXItPmtleSgpKSAmIG1hc2s7CisgICAgICAgIHVp bnQzMl90IGluZGV4ID0ganNNYXBIYXNoRm9yQWxyZWFkeUhhc2hlZFZhbHVlKGdsb2JhbE9iamVj dCwgdm0sIGl0ZXItPmtleSgpKSAmIG1hc2s7CiAgICAgICAgIEVYQ0VQVElPTl9BU1NFUlRfV0lU SF9NRVNTQUdFKCFzY29wZS5leGNlcHRpb24oKSwgIkFsbCBrZXlzIHNob3VsZCBhbHJlYWR5IGJl IGhhc2hlZCBiZWZvcmUsIHNvIHRoaXMgc2hvdWxkIG5vdCB0aHJvdyBiZWNhdXNlIGl0IHdvbid0 IHJlc29sdmUgcm9wZXMuIik7CiAgICAgICAgIHsKICAgICAgICAgICAgIEhhc2hNYXBCdWNrZXRU eXBlKiBidWNrZXQgPSBidWZmZXJbaW5kZXhdOwo=