195127 2019-02-27 16:08:23 -0800 The parser is failing to record the token location of new in new.target. 2019-02-27 22:45:02 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1510672 0 mark.lam 2019-02-27 16:08:23 -0800 <rdar://problem/39645578> 1510680 1 363152 mark.lam 2019-02-27 16:17:59 -0800 Created attachment 363152 proposed patch. 1510717 2 363152 ysuzuki 2019-02-27 17:09:43 -0800 Comment on attachment 363152 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=363152&action=review r=me with suggestion. > Source/JavaScriptCore/parser/Parser.cpp:4678 > + JSTokenLocation lastNewTokenlocation; "l" in "location" seems lower case. > Source/JavaScriptCore/parser/Parser.cpp:4682 > + lastNewTokenlocation = currentLocation; Why not making this `lastNewTokenLocation = tokenLocation()` and remove `currentLocation`? 1510765 3 363177 mark.lam 2019-02-27 18:37:11 -0800 Created attachment 363177 proposed patch. Updated with feedback from Yusuke and Saam. Let's try this on the EWS first. 1510800 4 363177 ysuzuki 2019-02-27 20:58:03 -0800 Comment on attachment 363177 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=363177&action=review r=me > Source/JavaScriptCore/parser/Parser.cpp:-4734 > - JSTokenLocation location(tokenLocation()); If it is not difficult, can we have a test for this? 1510816 5 363177 mark.lam 2019-02-27 22:36:27 -0800 Comment on attachment 363177 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=363177&action=review Thanks for the review. >> Source/JavaScriptCore/parser/Parser.cpp:-4734 >> - JSTokenLocation location(tokenLocation()); > > If it is not difficult, can we have a test for this? I'm not sure how to check for this. So, I'll wait until we have time later to develop some infrastructure for such tests. 1510817 6 mark.lam 2019-02-27 22:45:02 -0800 Landed in r242193: <http://trac.webkit.org/r242193>. 363152 2019-02-27 16:17:59 -0800 2019-02-27 18:37:11 -0800 proposed patch. bug-195127.patch text/plain 3729 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDIxNzcpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDE5LTAyLTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBUaGUgcGFyc2VyIGlzIGZhaWxpbmcgdG8gcmVjb3JkIHRoZSB0b2tlbiBs b2NhdGlvbiBvZiBuZXcgaW4gbmV3LnRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTEyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk2 NDU1Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBzdHJlc3MvcGFyc2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9jYXRpb24tb2YtbmV3LWRvdC10 YXJnZXQuanM6IEFkZGVkLgorCiAyMDE5LTAyLTI2ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogc3RyZXNzL3JlZ3Jlc3MtMTc4Mzg2Lmpz IGlzIHRpbWluZyBvdXQgb24gSlNDIGRlYnVnIGJvdApJbmRleDogSlNUZXN0cy9zdHJlc3MvcGFy c2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9jYXRpb24tb2YtbmV3LWRvdC10YXJnZXQuanMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvcGFyc2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9j YXRpb24tb2YtbmV3LWRvdC10YXJnZXQuanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9zdHJl c3MvcGFyc2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9jYXRpb24tb2YtbmV3LWRvdC10YXJnZXQu anMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4IEBACisvL0AgcnVuRGVmYXVsdCgiLS1mb3Jj ZURlYnVnZ2VyQnl0ZWNvZGVHZW5lcmF0aW9uPXRydWUiKQorCisvLyBUaGlzIHRlc3Qgc2hvdWxk IG5vdCBjcmFzaC4KKworZnVuY3Rpb24gZm9vKCkgeworICAgIGlmIChuZXcudGFyZ2V0KSB7fQor fQorK2ZvbygpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIxNzUp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTktMDItMjcgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgor CisgICAgICAgIFRoZSBwYXJzZXIgaXMgZmFpbGluZyB0byByZWNvcmQgdGhlIHRva2VuIGxvY2F0 aW9uIG9mIG5ldyBpbiBuZXcudGFyZ2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTY0NTU3 OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBh cnNlci9QYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VN ZW1iZXJFeHByZXNzaW9uKToKKwogMjAxOS0wMi0yNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNA YXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgUG9pbnRlciBFdmVudHMgb24gbWFjT1MKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAJKHJldmlzaW9uIDI0MjEy NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMSw3ICsxLDcgQEAKIC8qCiAgKiAgQ29weXJpZ2h0IChDKSAxOTk5LTIwMDEgSGFy cmkgUG9ydGVuIChwb3J0ZW5Aa2RlLm9yZykKICAqICBDb3B5cmlnaHQgKEMpIDIwMDEgUGV0ZXIg S2VsbHkgKHBta0Bwb3N0LmNvbSkKLSAqICBDb3B5cmlnaHQgKEMpIDIwMDMsIDIwMDYtMjAxMCwg MjAxMywgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiAgQ29weXJpZ2h0 IChDKSAyMDAzLTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqICBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCiAgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2Vu ZXJhbCBQdWJsaWMKQEAgLTQ2NzUsOSArNDY3NSwxNSBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1 aWxkZXI+IFRyZWVFeHByZXNzCiAgICAgaW50IG5ld0NvdW50ID0gMDsKICAgICBKU1Rva2VuTG9j YXRpb24gc3RhcnRMb2NhdGlvbiA9IHRva2VuTG9jYXRpb24oKTsKICAgICBKU1Rva2VuTG9jYXRp b24gbG9jYXRpb247Ci0gICAgd2hpbGUgKG1hdGNoKE5FVykpIHsKLSAgICAgICAgbmV4dCgpOwot ICAgICAgICBuZXdDb3VudCsrOworICAgIEpTVG9rZW5Mb2NhdGlvbiBsYXN0TmV3VG9rZW5sb2Nh dGlvbjsKKyAgICB7CisgICAgICAgIEpTVG9rZW5Mb2NhdGlvbiBjdXJyZW50TG9jYXRpb24gPSAg c3RhcnRMb2NhdGlvbjsKKyAgICAgICAgd2hpbGUgKG1hdGNoKE5FVykpIHsKKyAgICAgICAgICAg IGxhc3ROZXdUb2tlbmxvY2F0aW9uID0gY3VycmVudExvY2F0aW9uOworICAgICAgICAgICAgbmV4 dCgpOworICAgICAgICAgICAgbmV3Q291bnQrKzsKKyAgICAgICAgICAgIGN1cnJlbnRMb2NhdGlv biA9IHRva2VuTG9jYXRpb24oKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGJvb2wgYmFzZUlz U3VwZXIgPSBtYXRjaChTVVBFUik7CkBAIC00Njk2LDcgKzQ3MDIsOCBAQCB0ZW1wbGF0ZSA8Y2xh c3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzCiAgICAgICAgICAgICAgICAgc2VtYW50aWNGYWls SWZGYWxzZSghY2xvc2VzdE9yZGluYXJ5RnVuY3Rpb25TY29wZS0+aXNHbG9iYWxDb2RlU2NvcGUo KSB8fCBjbG9zZXN0T3JkaW5hcnlGdW5jdGlvblNjb3BlLT5ldmFsQ29udGV4dFR5cGUoKSA9PSBF dmFsQ29udGV4dFR5cGU6OkZ1bmN0aW9uRXZhbENvbnRleHQsICJuZXcudGFyZ2V0IGlzIG5vdCB2 YWxpZCBpbnNpZGUgYXJyb3cgZnVuY3Rpb25zIGluIGdsb2JhbCBjb2RlIik7CiAgICAgICAgICAg ICAgICAgY3VycmVudFNjb3BlKCktPnNldElubmVyQXJyb3dGdW5jdGlvblVzZXNOZXdUYXJnZXQo KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGJhc2UgPSBjb250ZXh0LmNyZWF0ZU5ld1Rh cmdldEV4cHIobG9jYXRpb24pOworICAgICAgICAgICAgQVNTRVJUKGxhc3ROZXdUb2tlbmxvY2F0 aW9uLmxpbmUpOyAvLyBTaG91bGQgbmV2ZXIgYmUgMCBzaW5lIGxpbmVzIGFyZSBvbmVCYXNlZElu dC4KKyAgICAgICAgICAgIGJhc2UgPSBjb250ZXh0LmNyZWF0ZU5ld1RhcmdldEV4cHIobGFzdE5l d1Rva2VubG9jYXRpb24pOwogICAgICAgICAgICAgbmV3Q291bnQtLTsKICAgICAgICAgICAgIG5l eHQoKTsKICAgICAgICAgfSBlbHNlIHsK 363177 2019-02-27 18:37:11 -0800 2019-02-27 20:58:03 -0800 proposed patch. bug-195127.patch text/plain 4415 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDIxODYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDE5LTAyLTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBUaGUgcGFyc2VyIGlzIGZhaWxpbmcgdG8gcmVjb3JkIHRoZSB0b2tlbiBs b2NhdGlvbiBvZiBuZXcgaW4gbmV3LnRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTEyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk2 NDU1Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBzdHJlc3MvcGFyc2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9jYXRpb24tb2YtbmV3LWRvdC10 YXJnZXQuanM6IEFkZGVkLgorCiAyMDE5LTAyLTI2ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogc3RyZXNzL3JlZ3Jlc3MtMTc4Mzg2Lmpz IGlzIHRpbWluZyBvdXQgb24gSlNDIGRlYnVnIGJvdApJbmRleDogSlNUZXN0cy9zdHJlc3MvcGFy c2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9jYXRpb24tb2YtbmV3LWRvdC10YXJnZXQuanMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvcGFyc2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9j YXRpb24tb2YtbmV3LWRvdC10YXJnZXQuanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9zdHJl c3MvcGFyc2VyLXNob3VsZC1yZWNvcmQtdG9rZW4tbG9jYXRpb24tb2YtbmV3LWRvdC10YXJnZXQu anMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4IEBACisvL0AgcnVuRGVmYXVsdCgiLS1mb3Jj ZURlYnVnZ2VyQnl0ZWNvZGVHZW5lcmF0aW9uPXRydWUiKQorCisvLyBUaGlzIHRlc3Qgc2hvdWxk IG5vdCBjcmFzaC4KKworZnVuY3Rpb24gZm9vKCkgeworICAgIGlmIChuZXcudGFyZ2V0KSB7fQor fQorK2ZvbygpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIxODYp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTktMDItMjcgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgor CisgICAgICAgIFRoZSBwYXJzZXIgaXMgZmFpbGluZyB0byByZWNvcmQgdGhlIHRva2VuIGxvY2F0 aW9uIG9mIG5ldyBpbiBuZXcudGFyZ2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTY0NTU3 OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNv IGFkanVzdCB0aGUgdG9rZW4gbG9jYXRpb24gZm9yIHRoZSBmb2xsb3dpbmcgdG8gYmUgYXMgc2hv d246CisKKyAgICAgICAgICAgIG5ldy50YXJnZXQKKyAgICAgICAgICAgIF4KKyAgICAgICAgICAg IHN1cGVyCisgICAgICAgICAgICBeCisgICAgICAgICAgICBpbXBvcnQubWV0YQorICAgICAgICAg ICAgXgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6CisgICAgICAgIChKU0M6OlBhcnNl cjxMZXhlclR5cGU+OjpwYXJzZU1lbWJlckV4cHJlc3Npb24pOgorCiAyMDE5LTAyLTI3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBQb2ludGVy IEV2ZW50cyBvbiBtYWNPUwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJz ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2Vy LmNwcAkocmV2aXNpb24gMjQyMTg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Q YXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqICBDb3B5cmln aHQgKEMpIDE5OTktMjAwMSBIYXJyaSBQb3J0ZW4gKHBvcnRlbkBrZGUub3JnKQogICogIENvcHly aWdodCAoQykgMjAwMSBQZXRlciBLZWxseSAocG1rQHBvc3QuY29tKQotICogIENvcHlyaWdodCAo QykgMjAwMywgMjAwNi0yMDEwLCAyMDEzLCAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqICBDb3B5cmlnaHQgKEMpIDIwMDMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2Fu IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9m IHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNDY3NCwxMSArNDY3NCwxMyBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzCiAgICAgSlNUZXh0UG9zaXRp b24gZXhwcmVzc2lvblN0YXJ0ID0gdG9rZW5TdGFydFBvc2l0aW9uKCk7CiAgICAgaW50IG5ld0Nv dW50ID0gMDsKICAgICBKU1Rva2VuTG9jYXRpb24gc3RhcnRMb2NhdGlvbiA9IHRva2VuTG9jYXRp b24oKTsKLSAgICBKU1Rva2VuTG9jYXRpb24gbG9jYXRpb247CisgICAgSlNUb2tlbkxvY2F0aW9u IGxhc3ROZXdUb2tlbkxvY2F0aW9uOwogICAgIHdoaWxlIChtYXRjaChORVcpKSB7CisgICAgICAg IGxhc3ROZXdUb2tlbkxvY2F0aW9uID0gdG9rZW5Mb2NhdGlvbigpOwogICAgICAgICBuZXh0KCk7 CiAgICAgICAgIG5ld0NvdW50Kys7CiAgICAgfQorICAgIEpTVG9rZW5Mb2NhdGlvbiBsb2NhdGlv biA9IHRva2VuTG9jYXRpb24oKTsKIAogICAgIGJvb2wgYmFzZUlzU3VwZXIgPSBtYXRjaChTVVBF Uik7CiAgICAgYm9vbCBwcmV2aW91c0Jhc2VXYXNTdXBlciA9IGZhbHNlOwpAQCAtNDY5Niw3ICs0 Njk4LDggQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlRXhwcmVzcwogICAgICAg ICAgICAgICAgIHNlbWFudGljRmFpbElmRmFsc2UoIWNsb3Nlc3RPcmRpbmFyeUZ1bmN0aW9uU2Nv cGUtPmlzR2xvYmFsQ29kZVNjb3BlKCkgfHwgY2xvc2VzdE9yZGluYXJ5RnVuY3Rpb25TY29wZS0+ ZXZhbENvbnRleHRUeXBlKCkgPT0gRXZhbENvbnRleHRUeXBlOjpGdW5jdGlvbkV2YWxDb250ZXh0 LCAibmV3LnRhcmdldCBpcyBub3QgdmFsaWQgaW5zaWRlIGFycm93IGZ1bmN0aW9ucyBpbiBnbG9i YWwgY29kZSIpOwogICAgICAgICAgICAgICAgIGN1cnJlbnRTY29wZSgpLT5zZXRJbm5lckFycm93 RnVuY3Rpb25Vc2VzTmV3VGFyZ2V0KCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBiYXNl ID0gY29udGV4dC5jcmVhdGVOZXdUYXJnZXRFeHByKGxvY2F0aW9uKTsKKyAgICAgICAgICAgIEFT U0VSVChsYXN0TmV3VG9rZW5Mb2NhdGlvbi5saW5lKTsKKyAgICAgICAgICAgIGJhc2UgPSBjb250 ZXh0LmNyZWF0ZU5ld1RhcmdldEV4cHIobGFzdE5ld1Rva2VuTG9jYXRpb24pOwogICAgICAgICAg ICAgbmV3Q291bnQtLTsKICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgfSBlbHNlIHsKQEAg LTQ3MzAsOCArNDczMyw2IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUV4cHJl c3MKICAgICAgICAgaWYgKGNvbnN1bWUoRE9UKSkgewogICAgICAgICAgICAgaWYgKG1hdGNoQ29u dGV4dHVhbEtleXdvcmQobV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkubWV0YVB1 YmxpY05hbWUoKSkpIHsKICAgICAgICAgICAgICAgICBzZW1hbnRpY0ZhaWxJZkZhbHNlKG1fc2Ny aXB0TW9kZSA9PSBKU1BhcnNlclNjcmlwdE1vZGU6Ok1vZHVsZSwgImltcG9ydC5tZXRhIGlzIG9u bHkgdmFsaWQgaW5zaWRlIG1vZHVsZXMiKTsKLQotICAgICAgICAgICAgICAgIEpTVG9rZW5Mb2Nh dGlvbiBsb2NhdGlvbih0b2tlbkxvY2F0aW9uKCkpOwogICAgICAgICAgICAgICAgIGJhc2UgPSBj b250ZXh0LmNyZWF0ZUltcG9ydE1ldGFFeHByKGxvY2F0aW9uLCBjcmVhdGVSZXNvbHZlQW5kVXNl VmFyaWFibGUoY29udGV4dCwgJm1fdm0tPnByb3BlcnR5TmFtZXMtPm1ldGFQcml2YXRlTmFtZSwg ZmFsc2UsIGV4cHJlc3Npb25TdGFydCwgbG9jYXRpb24pKTsKICAgICAgICAgICAgICAgICBuZXh0 KCk7CiAgICAgICAgICAgICB9IGVsc2Ugewo=