182631 2018-02-08 17:01:14 -0800 [Payment Request] Crash in PaymentRequest::canMakePayment() when Apple Pay payment method data is missing required fields 2018-02-09 11:09:33 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes achristensen beidson commit-queue mark.lam sam thorton webkit-bug-importer youennf oldest_to_newest 1397766 0 aestes 2018-02-08 17:01:14 -0800 [Payment Request] Crash in PaymentRequest::canMakePayment() when Apple Pay payment method data is missing required fields 1397774 1 333435 aestes 2018-02-08 17:15:18 -0800 Created attachment 333435 Patch 1397775 2 333435 mark.lam 2018-02-08 17:20:50 -0800 Comment on attachment 333435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333435&action=review r=me with suggestions. > Source/WebCore/ChangeLog:16 > + release assertion is raised about there being an unexpected exception in the VM. I suggest /being/seeing/. > Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp:493 > + auto scope = DECLARE_CATCH_SCOPE(document.execState()->vm()); Is there a reason to put the CatchScope in here instead of at the top of the function? As a convention, the only time we should declare it in this local scope is if there are parts of this function outside of this scope that can throw exceptions. Is that true? If not, I suggest moving this declaration to the top of the function. 1397778 3 aestes 2018-02-08 17:24:49 -0800 (In reply to Mark Lam from comment #2) > Comment on attachment 333435 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=333435&action=review > > Is there a reason to put the CatchScope in here instead of at the top of the > function? As a convention, the only time we should declare it in this local > scope is if there are parts of this function outside of this scope that can > throw exceptions. Is that true? If not, I suggest moving this declaration > to the top of the function. I was just being conservative. I wasn't sure if it was ok to call clearException() more than once on the same CatchScope. Now that I look more closely, I see that clearException() just calls through to the VM, so this must be ok. I'll move the scope outside the loop. Thanks for reviewing! 1397779 4 aestes 2018-02-08 17:27:01 -0800 (And no, nothing outside the loop throws) 1397985 5 333497 aestes 2018-02-09 09:59:23 -0800 Created attachment 333497 Patch 1398023 6 333497 commit-queue 2018-02-09 11:07:34 -0800 Comment on attachment 333497 Patch Clearing flags on attachment: 333497 Committed r228331: <https://trac.webkit.org/changeset/228331> 1398024 7 commit-queue 2018-02-09 11:07:35 -0800 All reviewed patches have been landed. Closing bug. 1398025 8 webkit-bug-importer 2018-02-09 11:09:33 -0800 <rdar://problem/37398029> 333435 2018-02-08 17:15:18 -0800 2018-02-09 09:59:21 -0800 Patch bug-182631-20180208171518.patch text/plain 7014 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE0YjlmODg1MTBmMzUx MDBmMjcwNmZiMDM3NzE5Mjc3ZTQ4Zjg4Ny4uMjRjODZjYTE2OGI4MDIxZjZmNDBlNjljZDM5YTdm NTcwMjUzZjE5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTA4ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBD cmFzaCBpbiBQYXltZW50UmVxdWVzdDo6Y2FuTWFrZVBheW1lbnQoKSB3aGVuIEFwcGxlIFBheSBw YXltZW50IG1ldGhvZCBkYXRhIGlzIG1pc3NpbmcgcmVxdWlyZWQgZmllbGRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI2MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXltZW50UmVxdWVzdDo6Y2Fu TWFrZVBheW1lbnQoKSBuZWVkcyB0byBwYXJzZSBlYWNoIHBheW1lbnQgbWV0aG9kJ3Mgc2VyaWFs aXplZCBkYXRhIHRvCisgICAgICAgIGRldGVybWluZSBpZiBpdCBpcyBhIHN1cHBvcnRlZCBwYXlt ZW50IG1ldGhvZC4gSWYgcGFyc2luZyBmYWlscyBieSByYWlzaW5nIGFuIGV4Y2VwdGlvbiwgd2UK KyAgICAgICAgaW50ZW5kIHRvIHNraXAgb3ZlciB0aGF0IHBheW1lbnQgbWV0aG9kIGFuZCB0cnkg dGhlIG5leHQgb25lLiBJZiBhbGwgcGF5bWVudCBtZXRob2QgZGF0YQorICAgICAgICBmYWlsIHRv IHBhcnNlLCB3ZSByZXNvbHZlIHRoZSByZXR1cm5lZCBwcm9taXNlIHdpdGggZmFsc2UuIEF0IG5v IHBvaW50IGRvIHdlIGludGVuZCB0bworICAgICAgICBwcm9wYWdhdGUgdGhlIHBhcnNpbmcgZXhj ZXB0aW9uIHVwIHRvIHRoZSBjYWxsaW5nIHNjcmlwdCwgaG93ZXZlci4KKworICAgICAgICBFdmVu IHRob3VnaCB3ZSBpbnRlbmQgdG8gc3dhbGxvdyBhbnkgZXhjZXB0aW9ucyBmcm9tIHBhcnNpbmcs IHdlIGZhaWxlZCB0byBjbGVhciB0aGUKKyAgICAgICAgSmF2YVNjcmlwdCBWTSdzIGV4Y2VwdGlv biBzdGF0ZS4gVGhlIG5leHQgdGltZSBXZWJDb3JlIHRyaWVzIHRvIGV4ZWN1dGUgSmF2YVNjcmlw dCwgYQorICAgICAgICByZWxlYXNlIGFzc2VydGlvbiBpcyByYWlzZWQgYWJvdXQgdGhlcmUgYmVp bmcgYW4gdW5leHBlY3RlZCBleGNlcHRpb24gaW4gdGhlIFZNLgorCisgICAgICAgIEZpeCB0aGlz IGJ5IHVzaW5nIGEgQ2F0Y2hTY29wZSBpbiBQYXltZW50UmVxdWVzdDo6Y2FuTWFrZVBheW1lbnQo KSwgYW5kIGNhbGxpbmcKKyAgICAgICAgQ2F0Y2hTY29wZTo6Y2xlYXJFeGNlcHRpb24oKSBpbiB0 aGUgcGxhY2VzIHdlIGludGVuZCB0byBzd2FsbG93IGV4Y2VwdGlvbnMuCisKKyAgICAgICAgQWRk ZWQgYSB0ZXN0IGNhc2UgdG8gaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVl c3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLmh0bWwuCisKKyAgICAgICAgKiBNb2R1bGVz L3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBh eW1lbnRSZXF1ZXN0OjpjYW5NYWtlUGF5bWVudCk6CisKIDIwMTgtMDItMDggIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBGb3JtIHN1Ym1pc3Npb24gYWZ0ZXIgbmF2 aWdhdGlvbiBmYWlscyB3aGVuIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gaXMgYXN5 bmMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGF5bWVudHJlcXVlc3QvUGF5 bWVudFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9Q YXltZW50UmVxdWVzdC5jcHAKaW5kZXggYTA2MTc2ZDQ1MzE0ZTUwZWNkOWM3MWE2YWUzYzU0YzVl ZDgyY2E3ZS4uNGY1NjBjYjQ4NDgzZGU4MDgyOGVkYzkzNTNkZDA2NWYwNmI3Yzk5ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVz dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50 UmVxdWVzdC5jcHAKQEAgLTQ5MCwxNyArNDkwLDI1IEBAIHZvaWQgUGF5bWVudFJlcXVlc3Q6OmNh bk1ha2VQYXltZW50KERvY3VtZW50JiBkb2N1bWVudCwgQ2FuTWFrZVBheW1lbnRQcm9taXNlJiYK ICAgICB9CiAKICAgICBmb3IgKGF1dG8mIHBheW1lbnRNZXRob2QgOiBtX3NlcmlhbGl6ZWRNZXRo b2REYXRhKSB7CisgICAgICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX0NBVENIX1NDT1BFKGRvY3Vt ZW50LmV4ZWNTdGF0ZSgpLT52bSgpKTsKKwogICAgICAgICBhdXRvIGRhdGEgPSBwYXJzZShkb2N1 bWVudCwgcGF5bWVudE1ldGhvZC5zZXJpYWxpemVkRGF0YSk7Ci0gICAgICAgIGlmIChkYXRhLmhh c0V4Y2VwdGlvbigpKQorICAgICAgICBBU1NFUlQoISFzY29wZS5leGNlcHRpb24oKSA9PSBkYXRh Lmhhc0V4Y2VwdGlvbigpKTsKKyAgICAgICAgaWYgKGRhdGEuaGFzRXhjZXB0aW9uKCkpIHsKKyAg ICAgICAgICAgIHNjb3BlLmNsZWFyRXhjZXB0aW9uKCk7CiAgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgfQogCiAgICAgICAgIGF1dG8gaGFuZGxlciA9IFBheW1lbnRIYW5kbGVyOjpjcmVh dGUoZG9jdW1lbnQsICp0aGlzLCBwYXltZW50TWV0aG9kLmlkZW50aWZpZXIpOwogICAgICAgICBp ZiAoIWhhbmRsZXIpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRvIGV4Y2Vw dGlvbiA9IGhhbmRsZXItPmNvbnZlcnREYXRhKGRhdGEucmVsZWFzZVJldHVyblZhbHVlKCkpOwot ICAgICAgICBpZiAoZXhjZXB0aW9uLmhhc0V4Y2VwdGlvbigpKQorICAgICAgICBBU1NFUlQoISFz Y29wZS5leGNlcHRpb24oKSA9PSBleGNlcHRpb24uaGFzRXhjZXB0aW9uKCkpOworICAgICAgICBp ZiAoZXhjZXB0aW9uLmhhc0V4Y2VwdGlvbigpKSB7CisgICAgICAgICAgICBzY29wZS5jbGVhckV4 Y2VwdGlvbigpOwogICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KIAogICAgICAgICBo YW5kbGVyLT5jYW5NYWtlUGF5bWVudChbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldKGJvb2wg Y2FuTWFrZVBheW1lbnQpIG11dGFibGUgewogICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKGNh bk1ha2VQYXltZW50KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiNWNkM2I4N2ZhYmEzMDhiYjgwNTFlNWZmNTZkNDYwMmNl OTZkMmFmLi5kZDgyOWQwNDMxNjllMDA3YTliOTliNDA0OWI0ODY0YzJmZmUyNGRjIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTgtMDItMDggIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgorCisgICAgICAgIFtQYXltZW50IFJlcXVlc3RdIENyYXNoIGluIFBheW1lbnRSZXF1ZXN0Ojpj YW5NYWtlUGF5bWVudCgpIHdoZW4gQXBwbGUgUGF5IHBheW1lbnQgbWV0aG9kIGRhdGEgaXMgbWlz c2luZyByZXF1aXJlZCBmaWVsZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4MjYzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3Qt Y2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBodHRw L3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVudC1tZXRo b2QuaHR0cHMuaHRtbDoKKwogMjAxOC0wMi0wOCAgTWF0dCBMZXdpcyAgPGpsZXdpczNAYXBwbGUu Y29tPgogCiAgICAgICAgIE1hcmtlZCBtZWRpYS9XM0MvdmlkZW8vZXZlbnRzL2V2ZW50X3Byb2dy ZXNzX21hbnVhbC5odG1sIGFzIGZsYWt5IG9uIG1hY09TIFdLMi4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWNhbm1ha2Vw YXltZW50LW1ldGhvZC5odHRwcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVudC1tZXRob2QuaHR0 cHMtZXhwZWN0ZWQudHh0CmluZGV4IDkwMDE0MTZiZTdlMmExYjk4NjdhYTJiZmE4NzkyMGRjMjFi ZjhiYWEuLmRmNmZiODVmMmE3ZDU2MDhkNzQ5MmZhYzM0M2I1ZDQ1MGZhOTdlM2YgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0 LWNhbm1ha2VwYXltZW50LW1ldGhvZC5odHRwcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtY2FubWFrZXBheW1l bnQtbWV0aG9kLmh0dHBzLWV4cGVjdGVkLnR4dApAQCAtMyw2ICszLDcgQEAgUEFTUyBJZiByZXF1 ZXN0Lltbc3RhdGVdXSBpcyAiY3JlYXRlZCIsIHRoZW4gcmV0dXJuIGEgcHJvbWlzZSB0aGF0IHJl c29sdmVzIHRvIHQKIFBBU1MgSWYgcmVxdWVzdC5bW3N0YXRlXV0gaXMgImludGVyYWN0aXZlIiwg dGhlbiByZXR1cm4gYSBwcm9taXNlIHJlamVjdGVkIHdpdGggYW4gIkludmFsaWRTdGF0ZUVycm9y IiBET01FeGNlcHRpb24uIAogUEFTUyBJZiByZXF1ZXN0Lltbc3RhdGVdXSBpcyAiY2xvc2VkIiwg dGhlbiByZXR1cm4gYSBwcm9taXNlIHJlamVjdGVkIHdpdGggYW4gIkludmFsaWRTdGF0ZUVycm9y IiBET01FeGNlcHRpb24uIAogUEFTUyBJZiBwYXltZW50IG1ldGhvZCBpZGVudGlmaWVyIGFuZCBz ZXJpYWxpemVkIHBhcnRzIGFyZSBzdXBwb3J0ZWQsIHJlc29sdmUgcHJvbWlzZSB3aXRoIHRydWUu IAorUEFTUyBJZiBhIHBheW1lbnQgbWV0aG9kIGlkZW50aWZpZXIgaXMgc3VwcG9ydGVkIGJ1dCBp dHMgc2VyaWFsaXplZCBwYXJ0cyBhcmUgbm90LCByZXNvbHZlIHByb21pc2Ugd2l0aCBmYWxzZS4g CiBQQVNTIElmIHBheW1lbnQgbWV0aG9kIGlkZW50aWZpZXIgaXMgdW5rbm93biwgcmVzb2x2ZSBw cm9taXNlIHdpdGggZmFsc2UuIAogUEFTUyBPcHRpb25hbGx5LCBhdCB0aGUgdXNlciBhZ2VudCdz IGRpc2NyZXRpb24sIHJldHVybiBhIHByb21pc2UgcmVqZWN0ZWQgd2l0aCBhICJOb3RBbGxvd2Vk RXJyb3IiIERPTUV4Y2VwdGlvbi4gCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWNhbm1ha2VwYXltZW50LW1ldGhvZC5o dHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50 LXJlcXVlc3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLmh0bWwKaW5kZXggNzQ3OTFjNGYx ZDIzZjBlYTM4MzI4YjY5YWNhMzNmZTI1ZGFiZDJiYi4uNmY0ZTg4N2UwYTI2OWU4MTNhZjM0MmZl NTAyODY1MWE5ZWFkNjg1MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXlt ZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJl cXVlc3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLmh0bWwKQEAgLTEwLDcgKzEwLDcgQEAK IDxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KIDxzY3Jp cHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KIDxzY3Jp cHQ+Ci0gICAgY29uc3QgYXBwbGVQYXkgPSBPYmplY3QuZnJlZXplKHsKK2NvbnN0IGFwcGxlUGF5 ID0gT2JqZWN0LmZyZWV6ZSh7CiAgICAgc3VwcG9ydGVkTWV0aG9kczogImh0dHBzOi8vYXBwbGUu Y29tL2FwcGxlLXBheSIsCiAgICAgZGF0YTogewogICAgICAgICB2ZXJzaW9uOiAyLApAQCAtMjAs NiArMjAsMTEgQEAKICAgICAgICAgY291bnRyeUNvZGU6ICJVUyIsCiAgICAgfQogfSk7Citjb25z dCBpbnZhbGlkQXBwbGVQYXkgPSBPYmplY3QuZnJlZXplKHsKKyAgICBzdXBwb3J0ZWRNZXRob2Rz OiAiaHR0cHM6Ly9hcHBsZS5jb20vYXBwbGUtcGF5IiwKKyAgICBkYXRhOiB7CisgICAgfQorfSk7 CiBjb25zdCBkZWZhdWx0TWV0aG9kcyA9IE9iamVjdC5mcmVlemUoW2FwcGxlUGF5XSk7CiBjb25z dCBkZWZhdWx0RGV0YWlscyA9IE9iamVjdC5mcmVlemUoewogICB0b3RhbDogewpAQCAtOTcsNiAr MTAyLDExIEBAIHByb21pc2VfdGVzdChhc3luYyB0ID0+IHsKICAgYXNzZXJ0X3RydWUoYXdhaXQg cmVxdWVzdC5jYW5NYWtlUGF5bWVudCgpLCAiYmFzaWMtY2FyZCBzaG91bGQgYmUgc3VwcG9ydGVk Iik7CiB9LCBgSWYgcGF5bWVudCBtZXRob2QgaWRlbnRpZmllciBhbmQgc2VyaWFsaXplZCBwYXJ0 cyBhcmUgc3VwcG9ydGVkLCByZXNvbHZlIHByb21pc2Ugd2l0aCB0cnVlLmApOwogCitwcm9taXNl X3Rlc3QoYXN5bmMgdCA9PiB7CisgIGNvbnN0IHJlcXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3Qo W2ludmFsaWRBcHBsZVBheV0sIGRlZmF1bHREZXRhaWxzKTsKKyAgYXNzZXJ0X2ZhbHNlKGF3YWl0 IHJlcXVlc3QuY2FuTWFrZVBheW1lbnQoKSwgIkFwcGxlIFBheSB3aXRoIGludmFsaWQgZGF0YSBz aG91bGQgbm90IGJlIHN1cHBvcnRlZCIpOworfSwgYElmIGEgcGF5bWVudCBtZXRob2QgaWRlbnRp ZmllciBpcyBzdXBwb3J0ZWQgYnV0IGl0cyBzZXJpYWxpemVkIHBhcnRzIGFyZSBub3QsIHJlc29s dmUgcHJvbWlzZSB3aXRoIGZhbHNlLmApOworCiBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAg IGNvbnN0IHVuc3VwcG9ydGVkTWV0aG9kcyA9IFsKICAgICAidGhpcy1pcy1ub3Qtc3VwcG9ydGVk IiwK 333497 2018-02-09 09:59:23 -0800 2018-02-09 11:07:34 -0800 Patch bug-182631-20180209095922.patch text/plain 7009 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE0YjlmODg1MTBmMzUx MDBmMjcwNmZiMDM3NzE5Mjc3ZTQ4Zjg4Ny4uMTBkYmIzZmRkZDEyYmQwY2VjODdmYTE1ZjMzOWY1 ZjNiZDgyMTFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTA4ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBD cmFzaCBpbiBQYXltZW50UmVxdWVzdDo6Y2FuTWFrZVBheW1lbnQoKSB3aGVuIEFwcGxlIFBheSBw YXltZW50IG1ldGhvZCBkYXRhIGlzIG1pc3NpbmcgcmVxdWlyZWQgZmllbGRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI2MzEKKworICAgICAgICBS ZXZpZXdlZCBieSBNYXJrIExhbS4KKworICAgICAgICBQYXltZW50UmVxdWVzdDo6Y2FuTWFrZVBh eW1lbnQoKSBuZWVkcyB0byBwYXJzZSBlYWNoIHBheW1lbnQgbWV0aG9kJ3Mgc2VyaWFsaXplZCBk YXRhIHRvCisgICAgICAgIGRldGVybWluZSBpZiBpdCBpcyBhIHN1cHBvcnRlZCBwYXltZW50IG1l dGhvZC4gSWYgcGFyc2luZyBmYWlscyBieSByYWlzaW5nIGFuIGV4Y2VwdGlvbiwgd2UKKyAgICAg ICAgaW50ZW5kIHRvIHNraXAgb3ZlciB0aGF0IHBheW1lbnQgbWV0aG9kIGFuZCB0cnkgdGhlIG5l eHQgb25lLiBJZiBhbGwgcGF5bWVudCBtZXRob2QgZGF0YQorICAgICAgICBmYWlsIHRvIHBhcnNl LCB3ZSByZXNvbHZlIHRoZSByZXR1cm5lZCBwcm9taXNlIHdpdGggZmFsc2UuIEF0IG5vIHBvaW50 IGRvIHdlIGludGVuZCB0bworICAgICAgICBwcm9wYWdhdGUgdGhlIHBhcnNpbmcgZXhjZXB0aW9u IHVwIHRvIHRoZSBjYWxsaW5nIHNjcmlwdCwgaG93ZXZlci4KKworICAgICAgICBFdmVuIHRob3Vn aCB3ZSBpbnRlbmQgdG8gc3dhbGxvdyBhbnkgZXhjZXB0aW9ucyBmcm9tIHBhcnNpbmcsIHdlIGZh aWxlZCB0byBjbGVhciB0aGUKKyAgICAgICAgSmF2YVNjcmlwdCBWTSdzIGV4Y2VwdGlvbiBzdGF0 ZS4gVGhlIG5leHQgdGltZSBXZWJDb3JlIHRyaWVzIHRvIGV4ZWN1dGUgSmF2YVNjcmlwdCwgYQor ICAgICAgICByZWxlYXNlIGFzc2VydGlvbiBpcyByYWlzZWQgZHVlIHRvIHNlZWluZyBhbiB1bmV4 cGVjdGVkIGV4Y2VwdGlvbiBpbiB0aGUgVk0uCisKKyAgICAgICAgRml4IHRoaXMgYnkgdXNpbmcg YSBDYXRjaFNjb3BlIGluIFBheW1lbnRSZXF1ZXN0OjpjYW5NYWtlUGF5bWVudCgpLCBhbmQgY2Fs bGluZworICAgICAgICBDYXRjaFNjb3BlOjpjbGVhckV4Y2VwdGlvbigpIGluIHRoZSBwbGFjZXMg d2UgaW50ZW5kIHRvIHN3YWxsb3cgZXhjZXB0aW9ucy4KKworICAgICAgICBBZGRlZCBhIHRlc3Qg Y2FzZSB0byBodHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtl cGF5bWVudC1tZXRob2QuaHR0cHMuaHRtbC4KKworICAgICAgICAqIE1vZHVsZXMvcGF5bWVudHJl cXVlc3QvUGF5bWVudFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudFJlcXVl c3Q6OmNhbk1ha2VQYXltZW50KToKKwogMjAxOC0wMi0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIEZvcm0gc3VibWlzc2lvbiBhZnRlciBuYXZpZ2F0aW9uIGZh aWxzIHdoZW4gZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiBpcyBhc3luYwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVz dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1 ZXN0LmNwcAppbmRleCBhMDYxNzZkNDUzMTRlNTBlY2Q5YzcxYTZhZTNjNTRjNWVkODJjYTdlLi5m MTExNzhmNWRiY2JjMWYxN2MzNGM5MWE4NmVlYzgxYTk0OWMwYTYzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNw cApAQCAtNDg5LDE4ICs0ODksMjUgQEAgdm9pZCBQYXltZW50UmVxdWVzdDo6Y2FuTWFrZVBheW1l bnQoRG9jdW1lbnQmIGRvY3VtZW50LCBDYW5NYWtlUGF5bWVudFByb21pc2UmJgogICAgICAgICBy ZXR1cm47CiAgICAgfQogCisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfQ0FUQ0hfU0NPUEUoZG9j dW1lbnQuZXhlY1N0YXRlKCktPnZtKCkpOwogICAgIGZvciAoYXV0byYgcGF5bWVudE1ldGhvZCA6 IG1fc2VyaWFsaXplZE1ldGhvZERhdGEpIHsKICAgICAgICAgYXV0byBkYXRhID0gcGFyc2UoZG9j dW1lbnQsIHBheW1lbnRNZXRob2Quc2VyaWFsaXplZERhdGEpOwotICAgICAgICBpZiAoZGF0YS5o YXNFeGNlcHRpb24oKSkKKyAgICAgICAgQVNTRVJUKCEhc2NvcGUuZXhjZXB0aW9uKCkgPT0gZGF0 YS5oYXNFeGNlcHRpb24oKSk7CisgICAgICAgIGlmIChkYXRhLmhhc0V4Y2VwdGlvbigpKSB7Cisg ICAgICAgICAgICBzY29wZS5jbGVhckV4Y2VwdGlvbigpOwogICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIH0KIAogICAgICAgICBhdXRvIGhhbmRsZXIgPSBQYXltZW50SGFuZGxlcjo6Y3Jl YXRlKGRvY3VtZW50LCAqdGhpcywgcGF5bWVudE1ldGhvZC5pZGVudGlmaWVyKTsKICAgICAgICAg aWYgKCFoYW5kbGVyKQogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgYXV0byBleGNl cHRpb24gPSBoYW5kbGVyLT5jb252ZXJ0RGF0YShkYXRhLnJlbGVhc2VSZXR1cm5WYWx1ZSgpKTsK LSAgICAgICAgaWYgKGV4Y2VwdGlvbi5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAgQVNTRVJUKCEh c2NvcGUuZXhjZXB0aW9uKCkgPT0gZXhjZXB0aW9uLmhhc0V4Y2VwdGlvbigpKTsKKyAgICAgICAg aWYgKGV4Y2VwdGlvbi5oYXNFeGNlcHRpb24oKSkgeworICAgICAgICAgICAgc2NvcGUuY2xlYXJF eGNlcHRpb24oKTsKICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAKICAgICAgICAg aGFuZGxlci0+Y2FuTWFrZVBheW1lbnQoW3Byb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXShib29s IGNhbk1ha2VQYXltZW50KSBtdXRhYmxlIHsKICAgICAgICAgICAgIHByb21pc2UucmVzb2x2ZShj YW5NYWtlUGF5bWVudCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjVjZDNiODdmYWJhMzA4YmI4MDUxZTVmZjU2ZDQ2MDJj ZTk2ZDJhZi4uNDhjM2FiOTI0MWRiM2VkMmU3MDU2MDc3MzkyYjI4MDZlN2Q1YzMyYSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDE4LTAyLTA4ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNv bT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBDcmFzaCBpbiBQYXltZW50UmVxdWVzdDo6 Y2FuTWFrZVBheW1lbnQoKSB3aGVuIEFwcGxlIFBheSBwYXltZW50IG1ldGhvZCBkYXRhIGlzIG1p c3NpbmcgcmVxdWlyZWQgZmllbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODI2MzEKKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKwor ICAgICAgICAqIGh0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWNhbm1h a2VwYXltZW50LW1ldGhvZC5odHRwcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0 cy9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0 dHBzLmh0bWw6CisKIDIwMTgtMDItMDggIE1hdHQgTGV3aXMgIDxqbGV3aXMzQGFwcGxlLmNvbT4K IAogICAgICAgICBNYXJrZWQgbWVkaWEvVzNDL3ZpZGVvL2V2ZW50cy9ldmVudF9wcm9ncmVzc19t YW51YWwuaHRtbCBhcyBmbGFreSBvbiBtYWNPUyBXSzIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVu dC1tZXRob2QuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXlt ZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtY2FubWFrZXBheW1lbnQtbWV0aG9kLmh0dHBzLWV4 cGVjdGVkLnR4dAppbmRleCA5MDAxNDE2YmU3ZTJhMWI5ODY3YWEyYmZhODc5MjBkYzIxYmY4YmFh Li5kZjZmYjg1ZjJhN2Q1NjA4ZDc0OTJmYWMzNDNiNWQ0NTBmYTk3ZTNmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5t YWtlcGF5bWVudC1tZXRob2QuaHR0cHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWNhbm1ha2VwYXltZW50LW1l dGhvZC5odHRwcy1leHBlY3RlZC50eHQKQEAgLTMsNiArMyw3IEBAIFBBU1MgSWYgcmVxdWVzdC5b W3N0YXRlXV0gaXMgImNyZWF0ZWQiLCB0aGVuIHJldHVybiBhIHByb21pc2UgdGhhdCByZXNvbHZl cyB0byB0CiBQQVNTIElmIHJlcXVlc3QuW1tzdGF0ZV1dIGlzICJpbnRlcmFjdGl2ZSIsIHRoZW4g cmV0dXJuIGEgcHJvbWlzZSByZWplY3RlZCB3aXRoIGFuICJJbnZhbGlkU3RhdGVFcnJvciIgRE9N RXhjZXB0aW9uLiAKIFBBU1MgSWYgcmVxdWVzdC5bW3N0YXRlXV0gaXMgImNsb3NlZCIsIHRoZW4g cmV0dXJuIGEgcHJvbWlzZSByZWplY3RlZCB3aXRoIGFuICJJbnZhbGlkU3RhdGVFcnJvciIgRE9N RXhjZXB0aW9uLiAKIFBBU1MgSWYgcGF5bWVudCBtZXRob2QgaWRlbnRpZmllciBhbmQgc2VyaWFs aXplZCBwYXJ0cyBhcmUgc3VwcG9ydGVkLCByZXNvbHZlIHByb21pc2Ugd2l0aCB0cnVlLiAKK1BB U1MgSWYgYSBwYXltZW50IG1ldGhvZCBpZGVudGlmaWVyIGlzIHN1cHBvcnRlZCBidXQgaXRzIHNl cmlhbGl6ZWQgcGFydHMgYXJlIG5vdCwgcmVzb2x2ZSBwcm9taXNlIHdpdGggZmFsc2UuIAogUEFT UyBJZiBwYXltZW50IG1ldGhvZCBpZGVudGlmaWVyIGlzIHVua25vd24sIHJlc29sdmUgcHJvbWlz ZSB3aXRoIGZhbHNlLiAKIFBBU1MgT3B0aW9uYWxseSwgYXQgdGhlIHVzZXIgYWdlbnQncyBkaXNj cmV0aW9uLCByZXR1cm4gYSBwcm9taXNlIHJlamVjdGVkIHdpdGggYSAiTm90QWxsb3dlZEVycm9y IiBET01FeGNlcHRpb24uIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Bh eW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1jYW5tYWtlcGF5bWVudC1tZXRob2QuaHR0cHMu aHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1 ZXN0LWNhbm1ha2VwYXltZW50LW1ldGhvZC5odHRwcy5odG1sCmluZGV4IDc0NzkxYzRmMWQyM2Yw ZWEzODMyOGI2OWFjYTMzZmUyNWRhYmQyYmIuLjZmNGU4ODdlMGEyNjllODEzYWYzNDJmZTUwMjg2 NTFhOWVhZDY4NTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJl cXVlc3QvcGF5bWVudC1yZXF1ZXN0LWNhbm1ha2VwYXltZW50LW1ldGhvZC5odHRwcy5odG1sCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0 LWNhbm1ha2VwYXltZW50LW1ldGhvZC5odHRwcy5odG1sCkBAIC0xMCw3ICsxMCw3IEBACiA8c2Ny aXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNy Yz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0Pgot ICAgIGNvbnN0IGFwcGxlUGF5ID0gT2JqZWN0LmZyZWV6ZSh7Citjb25zdCBhcHBsZVBheSA9IE9i amVjdC5mcmVlemUoewogICAgIHN1cHBvcnRlZE1ldGhvZHM6ICJodHRwczovL2FwcGxlLmNvbS9h cHBsZS1wYXkiLAogICAgIGRhdGE6IHsKICAgICAgICAgdmVyc2lvbjogMiwKQEAgLTIwLDYgKzIw LDExIEBACiAgICAgICAgIGNvdW50cnlDb2RlOiAiVVMiLAogICAgIH0KIH0pOworY29uc3QgaW52 YWxpZEFwcGxlUGF5ID0gT2JqZWN0LmZyZWV6ZSh7CisgICAgc3VwcG9ydGVkTWV0aG9kczogImh0 dHBzOi8vYXBwbGUuY29tL2FwcGxlLXBheSIsCisgICAgZGF0YTogeworICAgIH0KK30pOwogY29u c3QgZGVmYXVsdE1ldGhvZHMgPSBPYmplY3QuZnJlZXplKFthcHBsZVBheV0pOwogY29uc3QgZGVm YXVsdERldGFpbHMgPSBPYmplY3QuZnJlZXplKHsKICAgdG90YWw6IHsKQEAgLTk3LDYgKzEwMiwx MSBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAgIGFzc2VydF90cnVlKGF3YWl0IHJlcXVl c3QuY2FuTWFrZVBheW1lbnQoKSwgImJhc2ljLWNhcmQgc2hvdWxkIGJlIHN1cHBvcnRlZCIpOwog fSwgYElmIHBheW1lbnQgbWV0aG9kIGlkZW50aWZpZXIgYW5kIHNlcmlhbGl6ZWQgcGFydHMgYXJl IHN1cHBvcnRlZCwgcmVzb2x2ZSBwcm9taXNlIHdpdGggdHJ1ZS5gKTsKIAorcHJvbWlzZV90ZXN0 KGFzeW5jIHQgPT4geworICBjb25zdCByZXF1ZXN0ID0gbmV3IFBheW1lbnRSZXF1ZXN0KFtpbnZh bGlkQXBwbGVQYXldLCBkZWZhdWx0RGV0YWlscyk7CisgIGFzc2VydF9mYWxzZShhd2FpdCByZXF1 ZXN0LmNhbk1ha2VQYXltZW50KCksICJBcHBsZSBQYXkgd2l0aCBpbnZhbGlkIGRhdGEgc2hvdWxk IG5vdCBiZSBzdXBwb3J0ZWQiKTsKK30sIGBJZiBhIHBheW1lbnQgbWV0aG9kIGlkZW50aWZpZXIg aXMgc3VwcG9ydGVkIGJ1dCBpdHMgc2VyaWFsaXplZCBwYXJ0cyBhcmUgbm90LCByZXNvbHZlIHBy b21pc2Ugd2l0aCBmYWxzZS5gKTsKKwogcHJvbWlzZV90ZXN0KGFzeW5jIHQgPT4gewogICBjb25z dCB1bnN1cHBvcnRlZE1ldGhvZHMgPSBbCiAgICAgInRoaXMtaXMtbm90LXN1cHBvcnRlZCIsCg==