205730 2020-01-03 09:54:20 -0800 [Apple Pay] Provide a better error message when Apple Pay blocks user agent script evaluation 2020-01-03 14:31:19 -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 ggaren webkit-bug-importer oldest_to_newest 1602486 0 aestes 2020-01-03 09:54:20 -0800 [Apple Pay] Provide a better error message when Apple Pay blocks user agent script evaluation 1602488 1 386692 aestes 2020-01-03 09:55:55 -0800 Created attachment 386692 Patch 1602509 2 386692 beidson 2020-01-03 10:51:12 -0800 Comment on attachment 386692 Patch Andy and I discussed some refinements to the error message text IRL. 1602510 3 386692 achristensen 2020-01-03 10:52:19 -0800 Comment on attachment 386692 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386692&action=review > Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.cpp:162 > + return "Unable to run user agent scripts because this document uses Apple Pay. Apple Pay can be disabled in this web view by injecting a WKUserScript."_s; This is confusing. It seems like it's unable to run scripts because of Apple Pay, but running scripts can disable Apple Pay. "user agent scripts" is unclear. I think what you're trying to say is that to run scripts using evaluteJavaScript on pages that try to use Apple Pay, use WKUserScripts to disable Apple Pay. Is that correct? 1602511 4 386698 aestes 2020-01-03 10:54:18 -0800 Created attachment 386698 Patch 1602512 5 aestes 2020-01-03 10:56:03 -0800 (In reply to Alex Christensen from comment #3) > Comment on attachment 386692 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=386692&action=review > > > Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.cpp:162 > > + return "Unable to run user agent scripts because this document uses Apple Pay. Apple Pay can be disabled in this web view by injecting a WKUserScript."_s; > > This is confusing. It seems like it's unable to run scripts because of > Apple Pay, but running scripts can disable Apple Pay. "user agent scripts" > is unclear. It was confusing :( > I think what you're trying to say is that to run scripts using > evaluteJavaScript on pages that try to use Apple Pay, use WKUserScripts to > disable Apple Pay. Is that correct? That's correct. 1602515 6 aestes 2020-01-03 11:01:40 -0800 Posted a new patch with the refinements Brady suggested. 1602586 7 aestes 2020-01-03 14:30:17 -0800 Committed r254015: <https://trac.webkit.org/changeset/254015> 1602587 8 webkit-bug-importer 2020-01-03 14:31:19 -0800 <rdar://problem/58307301> 386692 2020-01-03 09:55:55 -0800 2020-01-03 10:54:17 -0800 Patch bug-205730-20200103095554.patch text/plain 9087 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTY0MjE5N2Y1YmFjMDI1 MjkyZDM3YWQ3MjQ2YmQ2NGEyOGRhNThjNS4uOTMyZGU1NDZmY2Y2NDNjNDU5MWYzY2Y2YTdhNThj Nzg0MTNjZTk1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAxLTAzICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbQXBwbGUgUGF5XSBQcm92aWRl IGEgYmV0dGVyIGVycm9yIG1lc3NhZ2Ugd2hlbiBBcHBsZSBQYXkgYmxvY2tzIHVzZXIgYWdlbnQg c2NyaXB0IGV2YWx1YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNTczMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTU1NzM0ODQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRD b29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRpbmF0b3I6OnNo b3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyBjb25zdCk6CisgICAgICAgICogTW9kdWxlcy9hcHBs ZXBheS9QYXltZW50Q29vcmRpbmF0b3IuaDoKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L1Bh eW1lbnRDb29yZGluYXRvckNsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudENvb3Jk aW5hdG9yQ2xpZW50Ojp1c2VyQWdlbnRTY3JpcHRzQmxvY2tlZEVycm9yTWVzc2FnZSBjb25zdCk6 CisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpleGVjdXRlVXNlckFnZW50U2NyaXB0SW5Xb3JsZElu dGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OnNob3VsZEFsbG93 VXNlckFnZW50U2NyaXB0cyBjb25zdCk6CisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29u dHJvbGxlci5oOgorCiAyMDIwLTAxLTAzICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAK ICAgICAgICAgPGxpbms+IHdpdGggbm9uLUNTUyB0eXBlIHNob3VsZCBub3QgYmUgcmV0cmlldmVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCmluZGV4IGI3OTg1OTMzYjQyOGQxY2I0YmM1MjRmMTUzYjczMzkzNGI3ODMwODguLjA5 MDQ3OTY2ZTM0OWUzNjcwODBjYjg5OWZlMDBhYjgwM2I3YTRjNTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTUgQEAKKzIwMjAtMDEtMDMgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisg ICAgICAgIFtBcHBsZSBQYXldIFByb3ZpZGUgYSBiZXR0ZXIgZXJyb3IgbWVzc2FnZSB3aGVuIEFw cGxlIFBheSBibG9ja3MgdXNlciBhZ2VudCBzY3JpcHQgZXZhbHVhdGlvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NzMwCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81NTU3MzQ4ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9y LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGF5bWVudENvb3JkaW5hdG9yOjp1c2VyQWdlbnRT Y3JpcHRzQmxvY2tlZEVycm9yTWVzc2FnZSBjb25zdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9B cHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3IuaDoKKwogMjAyMC0wMS0wMyAgeW91ZW5uIGZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IG5vbi1saWJ3ZWJydGMgYnVp bGRzIGFmdGVyIHIyNTM5NTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBw bGVwYXkvUGF5bWVudENvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBw bGVwYXkvUGF5bWVudENvb3JkaW5hdG9yLmNwcAppbmRleCAxZTJiMjNiOTlhMDRkNmM5ZTYwMTU3 MjQwNTdmNWY4Mjg5Y2U2YjllLi45MmQ4NzNmMWQyMDcwNGJjMzQxZTUxYjc0YWY5ZmI2YzRlOTI3 MGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRD b29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXlt ZW50Q29vcmRpbmF0b3IuY3BwCkBAIC0yODksMTUgKzI4OSwxNSBAQCBib29sIFBheW1lbnRDb29y ZGluYXRvcjo6c2V0QXBwbGVQYXlJc0FjdGl2ZUlmQWxsb3dlZChEb2N1bWVudCYgZG9jdW1lbnQp IGNvbnN0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUGF5bWVudENvb3JkaW5hdG9yOjpz aG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmIGRvY3VtZW50KSBjb25zdAorRXhw ZWN0ZWQ8dm9pZCwgRXhjZXB0aW9uRGV0YWlscz4gUGF5bWVudENvb3JkaW5hdG9yOjpzaG91bGRB bGxvd1VzZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmIGRvY3VtZW50KSBjb25zdAogewogICAgIGlm IChtX2NsaWVudC5zdXBwb3J0c1VucmVzdHJpY3RlZEFwcGxlUGF5KCkgfHwgIWRvY3VtZW50Lmlz QXBwbGVQYXlBY3RpdmUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiB7 IH07CiAKICAgICBBU1NFUlQoIWRvY3VtZW50Lmhhc0V2YWx1YXRlZFVzZXJBZ2VudFNjcmlwdHMo KSk7CiAgICAgQVNTRVJUKCFkb2N1bWVudC5pc1J1bm5pbmdVc2VyU2NyaXB0cygpKTsKICAgICBS RUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJzaG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMo KSAtPiBmYWxzZSAoYWN0aXZlIHNlc3Npb24pIik7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJl dHVybiBtYWtlVW5leHBlY3RlZChFeGNlcHRpb25EZXRhaWxzIHsgbV9jbGllbnQudXNlckFnZW50 U2NyaXB0c0Jsb2NrZWRFcnJvck1lc3NhZ2UoKSB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50 Q29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENv b3JkaW5hdG9yLmgKaW5kZXggNGEwZjk2ZTc5MGJlMDFhMTdkODBiNGNkOTYxYTVlOGM3MjFjY2Ri Yi4uYmZlY2E4ZmE2ZTBmOWQ0OTI0YzM3OTg5MTU0Nzg3OWNkN2NlMDc1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3IuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvci5oCkBA IC0yOCw2ICsyOCw3IEBACiAjaWYgRU5BQkxFKEFQUExFX1BBWSkKIAogI2luY2x1ZGUgIkFwcGxl UGF5U2Vzc2lvblBheW1lbnRSZXF1ZXN0LmgiCisjaW5jbHVkZSA8d3RmL0V4cGVjdGVkLmg+CiAj aW5jbHVkZSA8d3RmL0Z1bmN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIApAQCAt NDMsNiArNDQsNyBAQCBjbGFzcyBQYXltZW50TWV0aG9kVXBkYXRlOwogY2xhc3MgUGF5bWVudFNl c3Npb247CiBjbGFzcyBQYXltZW50U2Vzc2lvbkVycm9yOwogZW51bSBjbGFzcyBQYXltZW50QXV0 aG9yaXphdGlvblN0YXR1czsKK3N0cnVjdCBFeGNlcHRpb25EZXRhaWxzOwogc3RydWN0IFBheW1l bnRBdXRob3JpemF0aW9uUmVzdWx0Owogc3RydWN0IFNoaXBwaW5nQ29udGFjdFVwZGF0ZTsKIHN0 cnVjdCBTaGlwcGluZ01ldGhvZFVwZGF0ZTsKQEAgLTgxLDcgKzgzLDcgQEAgcHVibGljOgogICAg IE9wdGlvbmFsPFN0cmluZz4gdmFsaWRhdGVkUGF5bWVudE5ldHdvcmsoRG9jdW1lbnQmLCB1bnNp Z25lZCB2ZXJzaW9uLCBjb25zdCBTdHJpbmcmKSBjb25zdDsKIAogICAgIGJvb2wgc2hvdWxkRW5h YmxlQXBwbGVQYXlBUElzKERvY3VtZW50JikgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9v bCBzaG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmKSBjb25zdDsKKyAgICBXRUJD T1JFX0VYUE9SVCBFeHBlY3RlZDx2b2lkLCBFeGNlcHRpb25EZXRhaWxzPiBzaG91bGRBbGxvd1Vz ZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBib29sIHNl dEFwcGxlUGF5SXNBY3RpdmVJZkFsbG93ZWQoRG9jdW1lbnQmKSBjb25zdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yQ2xpZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvckNs aWVudC5oCmluZGV4IDAzZjViMjg5MDkzNGY5YmIyNmM4NzExYmFjYTU5NmQyYmM3MGRkNzEuLmIw ZmY3MDYyYjQ0OGZhODcwYmUxZmY0NmYyOGNjMjgxMDRlY2E0OTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3JDbGll bnQuaApAQCAtNjQsNiArNjQsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBheW1lbnRD b29yZGluYXRvckRlc3Ryb3llZCgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNVbnJl c3RyaWN0ZWRBcHBsZVBheSgpIGNvbnN0ID0gMDsKIAorICAgIHZpcnR1YWwgU3RyaW5nIHVzZXJB Z2VudFNjcmlwdHNCbG9ja2VkRXJyb3JNZXNzYWdlKCkgY29uc3QgeyByZXR1cm4geyB9OyB9CisK ICAgICB2aXJ0dWFsIGJvb2wgaXNNb2NrUGF5bWVudENvb3JkaW5hdG9yKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNXZWJQYXltZW50Q29vcmRpbmF0b3IoKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDE5NjI3YWMwNDY2MDViNmFjODQ1MTFlYmVjMzY1 YzNjZjc4Yjg0YWUuLjFmZDM5YjFkOTRmODIzYzU5NDNlOTM0MDM4YWFlNGI5MTZkZWNlNmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCkBA IC02OTEsOCArNjkxLDkgQEAgVmFsdWVPckV4Y2VwdGlvbiBTY3JpcHRDb250cm9sbGVyOjpleGVj dXRlVXNlckFnZW50U2NyaXB0SW5Xb3JsZChET01XcmFwcGVyV29ybGQKIFZhbHVlT3JFeGNlcHRp b24gU2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZVVzZXJBZ2VudFNjcmlwdEluV29ybGRJbnRlcm5h bChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBSdW5KYXZhU2NyaXB0UGFyYW1ldGVycyYmIHBhcmFt ZXRlcnMpCiB7CiAgICAgYXV0byYgZG9jdW1lbnQgPSAqbV9mcmFtZS5kb2N1bWVudCgpOwotICAg IGlmICghc2hvdWxkQWxsb3dVc2VyQWdlbnRTY3JpcHRzKGRvY3VtZW50KSkKLSAgICAgICAgcmV0 dXJuIG1ha2VVbmV4cGVjdGVkKEV4Y2VwdGlvbkRldGFpbHMgeyAiVW5hYmxlIHRvIHJ1biB1c2Vy IGFnZW50IHNjcmlwdHMgaW4gdGhpcyBkb2N1bWVudCBmb3Igc2VjdXJpdHkgcmVhc29ucyJfcyB9 KTsKKyAgICBhdXRvIGFsbG93ZWQgPSBzaG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoZG9jdW1l bnQpOworICAgIGlmICghYWxsb3dlZCkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKGFs bG93ZWQuZXJyb3IoKSk7CiAKICAgICBkb2N1bWVudC5zZXRIYXNFdmFsdWF0ZWRVc2VyQWdlbnRT Y3JpcHRzKCk7CiAgICAgcmV0dXJuIGV4ZWN1dGVTY3JpcHRJbldvcmxkKHdvcmxkLCBXVEZNb3Zl KHBhcmFtZXRlcnMpKTsKQEAgLTcwNyw3ICs3MDgsNyBAQCB2b2lkIFNjcmlwdENvbnRyb2xsZXI6 OmV4ZWN1dGVBc3luY2hyb25vdXNVc2VyQWdlbnRTY3JpcHRJbldvcmxkKERPTVdyYXBwZXJXb3Js ZAogICAgIHJlc29sdmVGdW5jdGlvbihyZXN1bHQpOwogfQogCi1ib29sIFNjcmlwdENvbnRyb2xs ZXI6OnNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyhEb2N1bWVudCYgZG9jdW1lbnQpIGNvbnN0 CitFeHBlY3RlZDx2b2lkLCBFeGNlcHRpb25EZXRhaWxzPiBTY3JpcHRDb250cm9sbGVyOjpzaG91 bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmIGRvY3VtZW50KSBjb25zdAogewogI2lm IEVOQUJMRShBUFBMRV9QQVkpCiAgICAgaWYgKGF1dG8gcGFnZSA9IG1fZnJhbWUucGFnZSgpKQpA QCAtNzE1LDcgKzcxNiw3IEBAIGJvb2wgU2NyaXB0Q29udHJvbGxlcjo6c2hvdWxkQWxsb3dVc2Vy QWdlbnRTY3JpcHRzKERvY3VtZW50JiBkb2N1bWVudCkgY29uc3QKICNlbHNlCiAgICAgVU5VU0VE X1BBUkFNKGRvY3VtZW50KTsKICNlbmRpZgotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiB7 IH07CiB9CiAKIGJvb2wgU2NyaXB0Q29udHJvbGxlcjo6Y2FuRXhlY3V0ZVNjcmlwdHMoUmVhc29u Rm9yQ2FsbGluZ0NhbkV4ZWN1dGVTY3JpcHRzIHJlYXNvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaAppbmRleCAwMDQ5ZjQ2ZTIyYzIxN2FhNjlkYzA2 Y2MwNTYyNmQ5ZjJmMzI5MzYyLi43YTJiNGYyM2I2ZjUxODFiYmQ2OGFlNWRhOWY4MTI1NTg5MTEy YmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9s bGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5o CkBAIC0xMDYsNyArMTA2LDcgQEAgcHVibGljOgogICAgIEpTQzo6SlNWYWx1ZSBldmFsdWF0ZUln bm9yaW5nRXhjZXB0aW9uKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmKTsKICAgICBKU0M6OkpTVmFs dWUgZXZhbHVhdGVJbldvcmxkSWdub3JpbmdFeGNlcHRpb24oY29uc3QgU2NyaXB0U291cmNlQ29k ZSYsIERPTVdyYXBwZXJXb3JsZCYpOwogCi0gICAgYm9vbCBzaG91bGRBbGxvd1VzZXJBZ2VudFNj cmlwdHMoRG9jdW1lbnQmKSBjb25zdDsKKyAgICBFeHBlY3RlZDx2b2lkLCBFeGNlcHRpb25EZXRh aWxzPiBzaG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmKSBjb25zdDsKIAogICAg IC8vIFJldHVybnMgdHJ1ZSBpZiBhcmd1bWVudCBpcyBhIEphdmFTY3JpcHQgVVJMLgogICAgIGJv b2wgZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChjb25zdCBVUkwmLCBSZWZQdHI8U2VjdXJpdHlPcmln aW4+ID0gbnVsbHB0ciwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMID0gUmVw bGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5jcHAKaW5kZXgg NzEwYTkyMDZlMTM4MjZiYTRjMDA2NjBiNTJiNDA2ZDc0Y2RkZWE2MS4uMGFjMTkxZDA0ODQ3NmIw NDg3ZDYxYWY4NDZjOTQxN2JhNzg3M2U2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5jcHAKQEAgLTE1 Nyw2ICsxNTcsMTEgQEAgYm9vbCBXZWJQYXltZW50Q29vcmRpbmF0b3I6OnN1cHBvcnRzVW5yZXN0 cmljdGVkQXBwbGVQYXkoKSBjb25zdAogI2VuZGlmCiB9CiAKK1N0cmluZyBXZWJQYXltZW50Q29v cmRpbmF0b3I6OnVzZXJBZ2VudFNjcmlwdHNCbG9ja2VkRXJyb3JNZXNzYWdlKCkgY29uc3QKK3sK KyAgICByZXR1cm4gIlVuYWJsZSB0byBydW4gdXNlciBhZ2VudCBzY3JpcHRzIGJlY2F1c2UgdGhp cyBkb2N1bWVudCB1c2VzIEFwcGxlIFBheS4gQXBwbGUgUGF5IGNhbiBiZSBkaXNhYmxlZCBpbiB0 aGlzIHdlYiB2aWV3IGJ5IGluamVjdGluZyBhIFdLVXNlclNjcmlwdC4iX3M7Cit9CisKIElQQzo6 Q29ubmVjdGlvbiogV2ViUGF5bWVudENvb3JkaW5hdG9yOjptZXNzYWdlU2VuZGVyQ29ubmVjdGlv bigpIGNvbnN0CiB7CiAjaWYgRU5BQkxFKEFQUExFX1BBWV9SRU1PVEVfVUkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9y LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5h dG9yLmgKaW5kZXggZGQ4MmQ1ZDdhZDIyNmQ0OTE4Zjk1ODliZDI0OWZiNzY2MGE5M2Q5Mi4uM2Ey MTFiOGU4NTljMDc4Y2M1NzA2NDdlMmVjNGI1N2MyZmFkOTM1YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3Iu aApAQCAtODMsNiArODMsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNBbHdheXNPbkxvZ2dpbmdB bGxvd2VkKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9vbCBzdXBwb3J0c1VucmVzdHJpY3RlZEFw cGxlUGF5KCkgY29uc3Qgb3ZlcnJpZGU7CiAKKyAgICBTdHJpbmcgdXNlckFnZW50U2NyaXB0c0Js b2NrZWRFcnJvck1lc3NhZ2UoKSBjb25zdCBmaW5hbDsKKwogICAgIC8vIElQQzo6TWVzc2FnZVJl Y2VpdmVyLgogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJikgb3ZlcnJpZGU7CiAK 386698 2020-01-03 10:54:18 -0800 2020-01-03 14:30:32 -0800 Patch bug-205730-20200103105418.patch text/plain 9151 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTY0MjE5N2Y1YmFjMDI1 MjkyZDM3YWQ3MjQ2YmQ2NGEyOGRhNThjNS4uMDI0MmRkOWY4YTVjOWU0NGM5MjBlYTdiYjg0NWFm MGU2MDA1NWNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAxLTAzICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbQXBwbGUgUGF5XSBQcm92aWRl IGEgYmV0dGVyIGVycm9yIG1lc3NhZ2Ugd2hlbiBBcHBsZSBQYXkgYmxvY2tzIHVzZXIgYWdlbnQg c2NyaXB0IGV2YWx1YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNTczMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTU1NzM0ODQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhp c3RpbmcgQVBJIHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29v cmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudENvb3JkaW5hdG9yOjpzaG91 bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMgY29uc3QpOgorICAgICAgICAqIE1vZHVsZXMvYXBwbGVw YXkvUGF5bWVudENvb3JkaW5hdG9yLmg6CisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9QYXlt ZW50Q29vcmRpbmF0b3JDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRDb29yZGlu YXRvckNsaWVudDo6dXNlckFnZW50U2NyaXB0c0Jsb2NrZWRFcnJvck1lc3NhZ2UgY29uc3QpOgor ICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZVVzZXJBZ2VudFNjcmlwdEluV29ybGRJbnRl cm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpzaG91bGRBbGxvd1Vz ZXJBZ2VudFNjcmlwdHMgY29uc3QpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENvbnRy b2xsZXIuaDoKKwogMjAyMC0wMS0wMyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIDxsaW5rPiB3aXRoIG5vbi1DU1MgdHlwZSBzaG91bGQgbm90IGJlIHJldHJpZXZlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCBiNzk4NTkzM2I0MjhkMWNiNGJjNTI0ZjE1M2I3MzM5MzRiNzgzMDg4Li4xZWJm ZDIzZmNlOTU3MDFmNGRlMzI1YjE2MjA1YjQ4YjkzYjgzMGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDIwLTAxLTAzICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBbQXBwbGUgUGF5XSBQcm92aWRlIGEgYmV0dGVyIGVycm9yIG1lc3NhZ2Ugd2hlbiBBcHBs ZSBQYXkgYmxvY2tzIHVzZXIgYWdlbnQgc2NyaXB0IGV2YWx1YXRpb24KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTczMAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTU1NzM0ODQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3IuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0b3I6OnVzZXJBZ2VudFNjcmlw dHNCbG9ja2VkRXJyb3JNZXNzYWdlIGNvbnN0KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0FwcGxl UGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5oOgorCiAyMDIwLTAxLTAzICB5b3Vlbm4gZmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggbm9uLWxpYndlYnJ0YyBidWlsZHMg YWZ0ZXIgcjI1Mzk1NwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBh eS9QYXltZW50Q29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBh eS9QYXltZW50Q29vcmRpbmF0b3IuY3BwCmluZGV4IDFlMmIyM2I5OWEwNGQ2YzllNjAxNTcyNDA1 N2Y1ZjgyODljZTZiOWUuLjkyZDg3M2YxZDIwNzA0YmMzNDFlNTFiNzRhZjlmYjZjNGU5MjcwYWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3Jk aW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRD b29yZGluYXRvci5jcHAKQEAgLTI4OSwxNSArMjg5LDE1IEBAIGJvb2wgUGF5bWVudENvb3JkaW5h dG9yOjpzZXRBcHBsZVBheUlzQWN0aXZlSWZBbGxvd2VkKERvY3VtZW50JiBkb2N1bWVudCkgY29u c3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBQYXltZW50Q29vcmRpbmF0b3I6OnNob3Vs ZEFsbG93VXNlckFnZW50U2NyaXB0cyhEb2N1bWVudCYgZG9jdW1lbnQpIGNvbnN0CitFeHBlY3Rl ZDx2b2lkLCBFeGNlcHRpb25EZXRhaWxzPiBQYXltZW50Q29vcmRpbmF0b3I6OnNob3VsZEFsbG93 VXNlckFnZW50U2NyaXB0cyhEb2N1bWVudCYgZG9jdW1lbnQpIGNvbnN0CiB7CiAgICAgaWYgKG1f Y2xpZW50LnN1cHBvcnRzVW5yZXN0cmljdGVkQXBwbGVQYXkoKSB8fCAhZG9jdW1lbnQuaXNBcHBs ZVBheUFjdGl2ZSgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIHsgfTsK IAogICAgIEFTU0VSVCghZG9jdW1lbnQuaGFzRXZhbHVhdGVkVXNlckFnZW50U2NyaXB0cygpKTsK ICAgICBBU1NFUlQoIWRvY3VtZW50LmlzUnVubmluZ1VzZXJTY3JpcHRzKCkpOwogICAgIFJFTEVB U0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoInNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0cygpIC0+ IGZhbHNlIChhY3RpdmUgc2Vzc2lvbikiKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJu IG1ha2VVbmV4cGVjdGVkKEV4Y2VwdGlvbkRldGFpbHMgeyBtX2NsaWVudC51c2VyQWdlbnRTY3Jp cHRzQmxvY2tlZEVycm9yTWVzc2FnZSgpIH0pOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29y ZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRp bmF0b3IuaAppbmRleCA0YTBmOTZlNzkwYmUwMWExN2Q4MGI0Y2Q5NjFhNWU4YzcyMWNjZGJiLi5i ZmVjYThmYTZlMGY5ZDQ5MjRjMzc5ODkxNTQ3ODc5Y2Q3Y2UwNzVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yLmgKQEAgLTI4 LDYgKzI4LDcgQEAKICNpZiBFTkFCTEUoQVBQTEVfUEFZKQogCiAjaW5jbHVkZSAiQXBwbGVQYXlT ZXNzaW9uUGF5bWVudFJlcXVlc3QuaCIKKyNpbmNsdWRlIDx3dGYvRXhwZWN0ZWQuaD4KICNpbmNs dWRlIDx3dGYvRnVuY3Rpb24uaD4KICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCkBAIC00Myw2 ICs0NCw3IEBAIGNsYXNzIFBheW1lbnRNZXRob2RVcGRhdGU7CiBjbGFzcyBQYXltZW50U2Vzc2lv bjsKIGNsYXNzIFBheW1lbnRTZXNzaW9uRXJyb3I7CiBlbnVtIGNsYXNzIFBheW1lbnRBdXRob3Jp emF0aW9uU3RhdHVzOworc3RydWN0IEV4Y2VwdGlvbkRldGFpbHM7CiBzdHJ1Y3QgUGF5bWVudEF1 dGhvcml6YXRpb25SZXN1bHQ7CiBzdHJ1Y3QgU2hpcHBpbmdDb250YWN0VXBkYXRlOwogc3RydWN0 IFNoaXBwaW5nTWV0aG9kVXBkYXRlOwpAQCAtODEsNyArODMsNyBAQCBwdWJsaWM6CiAgICAgT3B0 aW9uYWw8U3RyaW5nPiB2YWxpZGF0ZWRQYXltZW50TmV0d29yayhEb2N1bWVudCYsIHVuc2lnbmVk IHZlcnNpb24sIGNvbnN0IFN0cmluZyYpIGNvbnN0OwogCiAgICAgYm9vbCBzaG91bGRFbmFibGVB cHBsZVBheUFQSXMoRG9jdW1lbnQmKSBjb25zdDsKLSAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNo b3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyhEb2N1bWVudCYpIGNvbnN0OworICAgIFdFQkNPUkVf RVhQT1JUIEV4cGVjdGVkPHZvaWQsIEV4Y2VwdGlvbkRldGFpbHM+IHNob3VsZEFsbG93VXNlckFn ZW50U2NyaXB0cyhEb2N1bWVudCYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGJvb2wgc2V0QXBw bGVQYXlJc0FjdGl2ZUlmQWxsb3dlZChEb2N1bWVudCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3JDbGllbnQuaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yQ2xpZW50 LmgKaW5kZXggMDNmNWIyODkwOTM0ZjliYjI2Yzg3MTFiYWNhNTk2ZDJiYzcwZGQ3MS4uYjBmZjcw NjJiNDQ4ZmE4NzBiZTFmZjQ2ZjI4Y2MyODEwNGVjYTQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3JDbGllbnQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvckNsaWVudC5o CkBAIC02NCw2ICs2NCw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGF5bWVudENvb3Jk aW5hdG9yRGVzdHJveWVkKCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c1VucmVzdHJp Y3RlZEFwcGxlUGF5KCkgY29uc3QgPSAwOwogCisgICAgdmlydHVhbCBTdHJpbmcgdXNlckFnZW50 U2NyaXB0c0Jsb2NrZWRFcnJvck1lc3NhZ2UoKSBjb25zdCB7IHJldHVybiB7IH07IH0KKwogICAg IHZpcnR1YWwgYm9vbCBpc01vY2tQYXltZW50Q29vcmRpbmF0b3IoKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1dlYlBheW1lbnRDb29yZGluYXRvcigpIGNvbnN0 IHsgcmV0dXJuIGZhbHNlOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0Q29udHJvbGxlci5jcHAKaW5kZXggMTk2MjdhYzA0NjYwNWI2YWM4NDUxMWViZWMzNjVjM2Nm NzhiODRhZS4uMWZkMzliMWQ5NGY4MjNjNTk0M2U5MzQwMzhhYWU0YjkxNmRlY2U2YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAKQEAgLTY5 MSw4ICs2OTEsOSBAQCBWYWx1ZU9yRXhjZXB0aW9uIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVV c2VyQWdlbnRTY3JpcHRJbldvcmxkKERPTVdyYXBwZXJXb3JsZAogVmFsdWVPckV4Y2VwdGlvbiBT Y3JpcHRDb250cm9sbGVyOjpleGVjdXRlVXNlckFnZW50U2NyaXB0SW5Xb3JsZEludGVybmFsKERP TVdyYXBwZXJXb3JsZCYgd29ybGQsIFJ1bkphdmFTY3JpcHRQYXJhbWV0ZXJzJiYgcGFyYW1ldGVy cykKIHsKICAgICBhdXRvJiBkb2N1bWVudCA9ICptX2ZyYW1lLmRvY3VtZW50KCk7Ci0gICAgaWYg KCFzaG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoZG9jdW1lbnQpKQotICAgICAgICByZXR1cm4g bWFrZVVuZXhwZWN0ZWQoRXhjZXB0aW9uRGV0YWlscyB7ICJVbmFibGUgdG8gcnVuIHVzZXIgYWdl bnQgc2NyaXB0cyBpbiB0aGlzIGRvY3VtZW50IGZvciBzZWN1cml0eSByZWFzb25zIl9zIH0pOwor ICAgIGF1dG8gYWxsb3dlZCA9IHNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyhkb2N1bWVudCk7 CisgICAgaWYgKCFhbGxvd2VkKQorICAgICAgICByZXR1cm4gbWFrZVVuZXhwZWN0ZWQoYWxsb3dl ZC5lcnJvcigpKTsKIAogICAgIGRvY3VtZW50LnNldEhhc0V2YWx1YXRlZFVzZXJBZ2VudFNjcmlw dHMoKTsKICAgICByZXR1cm4gZXhlY3V0ZVNjcmlwdEluV29ybGQod29ybGQsIFdURk1vdmUocGFy YW1ldGVycykpOwpAQCAtNzA3LDcgKzcwOCw3IEBAIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZXhl Y3V0ZUFzeW5jaHJvbm91c1VzZXJBZ2VudFNjcmlwdEluV29ybGQoRE9NV3JhcHBlcldvcmxkCiAg ICAgcmVzb2x2ZUZ1bmN0aW9uKHJlc3VsdCk7CiB9CiAKLWJvb2wgU2NyaXB0Q29udHJvbGxlcjo6 c2hvdWxkQWxsb3dVc2VyQWdlbnRTY3JpcHRzKERvY3VtZW50JiBkb2N1bWVudCkgY29uc3QKK0V4 cGVjdGVkPHZvaWQsIEV4Y2VwdGlvbkRldGFpbHM+IFNjcmlwdENvbnRyb2xsZXI6OnNob3VsZEFs bG93VXNlckFnZW50U2NyaXB0cyhEb2N1bWVudCYgZG9jdW1lbnQpIGNvbnN0CiB7CiAjaWYgRU5B QkxFKEFQUExFX1BBWSkKICAgICBpZiAoYXV0byBwYWdlID0gbV9mcmFtZS5wYWdlKCkpCkBAIC03 MTUsNyArNzE2LDcgQEAgYm9vbCBTY3JpcHRDb250cm9sbGVyOjpzaG91bGRBbGxvd1VzZXJBZ2Vu dFNjcmlwdHMoRG9jdW1lbnQmIGRvY3VtZW50KSBjb25zdAogI2Vsc2UKICAgICBVTlVTRURfUEFS QU0oZG9jdW1lbnQpOwogI2VuZGlmCi0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIHsgfTsK IH0KIAogYm9vbCBTY3JpcHRDb250cm9sbGVyOjpjYW5FeGVjdXRlU2NyaXB0cyhSZWFzb25Gb3JD YWxsaW5nQ2FuRXhlY3V0ZVNjcmlwdHMgcmVhc29uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvU2NyaXB0Q29udHJvbGxlci5oCmluZGV4IDAwNDlmNDZlMjJjMjE3YWE2OWRjMDZjYzA1 NjI2ZDlmMmYzMjkzNjIuLjdhMmI0ZjIzYjZmNTE4MWJiZDY4YWU1ZGE5ZjgxMjU1ODkxMTJiZDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmgKQEAg LTEwNiw3ICsxMDYsNyBAQCBwdWJsaWM6CiAgICAgSlNDOjpKU1ZhbHVlIGV2YWx1YXRlSWdub3Jp bmdFeGNlcHRpb24oY29uc3QgU2NyaXB0U291cmNlQ29kZSYpOwogICAgIEpTQzo6SlNWYWx1ZSBl dmFsdWF0ZUluV29ybGRJZ25vcmluZ0V4Y2VwdGlvbihjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiwg RE9NV3JhcHBlcldvcmxkJik7CiAKLSAgICBib29sIHNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0 cyhEb2N1bWVudCYpIGNvbnN0OworICAgIEV4cGVjdGVkPHZvaWQsIEV4Y2VwdGlvbkRldGFpbHM+ IHNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyhEb2N1bWVudCYpIGNvbnN0OwogCiAgICAgLy8g UmV0dXJucyB0cnVlIGlmIGFyZ3VtZW50IGlzIGEgSmF2YVNjcmlwdCBVUkwuCiAgICAgYm9vbCBl eGVjdXRlSWZKYXZhU2NyaXB0VVJMKGNvbnN0IFVSTCYsIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4g PSBudWxscHRyLCBTaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgPSBSZXBsYWNl RG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yLmNwcAppbmRleCA3MTBh OTIwNmUxMzgyNmJhNGMwMDY2MGI1MmI0MDZkNzRjZGRlYTYxLi4zNzBlYmUxODgyZTIyOWYxOWY2 MTFjNWUzYjkyMzZhYmY0MTZlOTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yLmNwcApAQCAtMTU3LDYg KzE1NywxMSBAQCBib29sIFdlYlBheW1lbnRDb29yZGluYXRvcjo6c3VwcG9ydHNVbnJlc3RyaWN0 ZWRBcHBsZVBheSgpIGNvbnN0CiAjZW5kaWYKIH0KIAorU3RyaW5nIFdlYlBheW1lbnRDb29yZGlu YXRvcjo6dXNlckFnZW50U2NyaXB0c0Jsb2NrZWRFcnJvck1lc3NhZ2UoKSBjb25zdAoreworICAg IHJldHVybiAiVW5hYmxlIHRvIHJ1biB1c2VyIGFnZW50IHNjcmlwdHMgYmVjYXVzZSB0aGlzIGRv Y3VtZW50IGhhcyBwcmV2aW91c2x5IGFjY2Vzc2VkIEFwcGxlIFBheS4gRG9jdW1lbnRzIGNhbiBi ZSBwcmV2ZW50ZWQgZnJvbSBhY2Nlc3NpbmcgQXBwbGUgUGF5IGJ5IGFkZGluZyBhIFdLVXNlclNj cmlwdCB0byB0aGUgV0tXZWJWaWV3J3MgV0tVc2VyQ29udGVudENvbnRyb2xsZXIuIl9zOworfQor CiBJUEM6OkNvbm5lY3Rpb24qIFdlYlBheW1lbnRDb29yZGluYXRvcjo6bWVzc2FnZVNlbmRlckNv bm5lY3Rpb24oKSBjb25zdAogewogI2lmIEVOQUJMRShBUFBMRV9QQVlfUkVNT1RFX1VJKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29y ZGluYXRvci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRD b29yZGluYXRvci5oCmluZGV4IGRkODJkNWQ3YWQyMjZkNDkxOGY5NTg5YmQyNDlmYjc2NjBhOTNk OTIuLjNhMjExYjhlODU5YzA3OGNjNTcwNjQ3ZTJlYzRiNTdjMmZhZDkzNWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3Iu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3Jk aW5hdG9yLmgKQEAgLTgzLDYgKzgzLDggQEAgcHJpdmF0ZToKICAgICBib29sIGlzQWx3YXlzT25M b2dnaW5nQWxsb3dlZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgc3VwcG9ydHNVbnJlc3Ry aWN0ZWRBcHBsZVBheSgpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgU3RyaW5nIHVzZXJBZ2VudFNj cmlwdHNCbG9ja2VkRXJyb3JNZXNzYWdlKCkgY29uc3QgZmluYWw7CisKICAgICAvLyBJUEM6Ok1l c3NhZ2VSZWNlaXZlci4KICAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlv biYsIElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOwogCg==