214365 2020-07-15 11:23:07 -0700 Improve handling of invalid ChangeLog by webkit-patch 2020-07-16 09:07:57 -0700 1 1 1 Unclassified WebKit Tools / Tests Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=213609 InRadar P2 Normal --- 1 simon.fraser aakash_jain aakash_jain ap ews-watchlist glenn jbedard simon.fraser webkit-bug-importer oldest_to_newest 1671822 0 simon.fraser 2020-07-15 11:23:07 -0700 OpenSource % wkpatch upload -g HEAD.... --no-review --no-obsolete Total errors found: 0 in 13 files Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 80, in <module> main() File "Tools/Scripts/webkit-patch", line 75, in main WebKitPatch(os.path.abspath(__file__)).main() File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 305, in main result = command.check_arguments_and_execute(options, args, self) File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 123, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py", line 106, in run self._ensure_bug_url(state) File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py", line 58, in _ensure_bug_url if not changelog.latest_entry().bug_id(): AttributeError: 'NoneType' object has no attribute 'bug_id' Will attach my local diff. 1671825 1 404360 simon.fraser 2020-07-15 11:23:42 -0700 Created attachment 404360 My cached changes 1671880 2 simon.fraser 2020-07-15 13:00:20 -0700 The WebKit/Changelog file has a space at the start of the date line. 1672111 3 404441 aakash_jain 2020-07-16 08:08:01 -0700 Created attachment 404441 Patch 1672124 4 ews-feeder 2020-07-16 09:06:08 -0700 Committed r264455: <https://trac.webkit.org/changeset/264455> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404441. 1672127 5 webkit-bug-importer 2020-07-16 09:07:57 -0700 <rdar://problem/65669064> 404360 2020-07-15 11:23:42 -0700 2020-07-16 08:07:57 -0700 My cached changes git-index.patch text/plain 19420 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NWUxNzQ4YmNlNzguLjFmZTllNzE5MjRhZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDIwLTA3LTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisg ICAgICAgIGl0c25pY2V0aGF0LmNvbSBwYWdlIGlzIHNvbWV0aW1lcyBub24tc2Nyb2xsYWJsZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MzYyCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NTQzMTEyNz4KKworICAgICAgICBSZXZpZXdlZCBieSBU aW0gSG9ydG9uLgorCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvaW9zL2NsaXAtcGF0aC1oaXQt dGVzdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL2lvcy9j bGlwLXBhdGgtaGl0LXRlc3QuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcv bWFjL2NsaXAtcGF0aC1oaXQtdGVzdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3Qvc2Nyb2xsaW5nL21hYy9jbGlwLXBhdGgtaGl0LXRlc3QuaHRtbDogQWRkZWQuCisKIDIwMjAt MDctMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg Rmxhc2hlcyBvZiBpbmNvcnJlY3Qgc2Nyb2xsIHBvc2l0aW9uIHdoZW4gem9vbWluZyBvbiBxdWlw CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9pb3MvY2xpcC1wYXRoLWhp dC10ZXN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2lvcy9jbGlw LXBhdGgtaGl0LXRlc3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMC4uYjI5OWRkMDA4MTkzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zY3JvbGxpbmcvaW9zL2NsaXAtcGF0aC1oaXQtdGVzdC1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwxNiBAQAorCitUZXN0IHNjcm9sbCBvdmVyIGNvbnRlbnQKK1BBU1Mgb3ZlcmZsb3dTY3Jv bGxFdmVudENvdW50ID4gMCBpcyB0cnVlCitQQVNTIHdpbmRvd1Njcm9sbEV2ZW50Q291bnQgaXMg MAorCitUZXN0IHNjcm9sbCBvdmVyIGNvbnRlbnQKK1BBU1Mgb3ZlcmZsb3dTY3JvbGxFdmVudENv dW50IGlzIDAKK1BBU1Mgd2luZG93U2Nyb2xsRXZlbnRDb3VudCA+IDAgaXMgdHJ1ZQorCitUZXN0 IHNjcm9sbCBvdmVyIGNvbnRlbnQKK1BBU1Mgb3ZlcmZsb3dTY3JvbGxFdmVudENvdW50IGlzIDAK K1BBU1Mgd2luZG93U2Nyb2xsRXZlbnRDb3VudCA+IDAgaXMgdHJ1ZQorUEFTUyBzdWNjZXNzZnVs bHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2Nyb2xsaW5nL2lvcy9jbGlwLXBhdGgtaGl0LXRlc3QuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3Qvc2Nyb2xsaW5nL2lvcy9jbGlwLXBhdGgtaGl0LXRlc3QuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjNmZmQwM2M2YzU1YwotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2lvcy9jbGlwLXBhdGgtaGl0LXRlc3Qu aHRtbApAQCAtMCwwICsxLDExNyBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3Qt cnVubmVyIFsgaW50ZXJuYWw6QXN5bmNPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0t PgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIGJvZHkgeworICAgICAgICAg ICAgaGVpZ2h0OiAyMDAwcHg7CisgICAgICAgIH0KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAg ICAgICAgICBjbGlwLXBhdGg6IGNpcmNsZSgxMDBweCBhdCAxMjBweCAxMjBweCk7CisgICAgICAg IH0KKyAgICAgICAgLnNjcm9sbGVyIHsKKyAgICAgICAgICAgIGhlaWdodDogMzAwcHg7CisgICAg ICAgICAgICB3aWR0aDogMzAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFj azsKKyAgICAgICAgICAgIHBhZGRpbmc6IDVweDsKKyAgICAgICAgICAgIG92ZXJmbG93OiBzY3Jv bGw7CisgICAgICAgIH0KKyAgICAgICAgLmNvbnRlbnQgeworICAgICAgICAgICAgd2lkdGg6IDIw MCU7CisgICAgICAgICAgICBoZWlnaHQ6IDMwMCU7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWlt YWdlOiByZXBlYXRpbmctbGluZWFyLWdyYWRpZW50KHdoaXRlLCBzaWx2ZXIgMjAwcHgpOworICAg ICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgdmFy IGpzVGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgICAgIHZhciBzY3JvbGxlcjsKKyAgICAgICAg dmFyIG92ZXJmbG93U2Nyb2xsRXZlbnRDb3VudCA9IDA7CisgICAgICAgIHZhciB3aW5kb3dTY3Jv bGxFdmVudENvdW50ID0gMDsKKworICAgICAgICBhc3luYyBmdW5jdGlvbiByZXNldFNjcm9sbFBv c2l0aW9ucygpCisgICAgICAgIHsKKyAgICAgICAgICAgIHdpbmRvdy5zY3JvbGxUbygwLCAwKTsK KyAgICAgICAgICAgIHNjcm9sbGVyLnNjcm9sbFRvcCA9IDA7CisgICAgICAgICAgICAKKyAgICAg ICAgICAgIC8vIFdhaXQgZm9yIHNjcm9sbCBldmVudHMgdG8gZmlyZS4KKyAgICAgICAgICAgIGF3 YWl0IFVJSGVscGVyLmFuaW1hdGlvbkZyYW1lKCk7CisKKyAgICAgICAgICAgIG92ZXJmbG93U2Ny b2xsRXZlbnRDb3VudCA9IDA7CisgICAgICAgICAgICB3aW5kb3dTY3JvbGxFdmVudENvdW50ID0g MDsKKyAgICAgICAgfQorCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHZlcnRpY2FsU3dpcGVHZXN0 dXJlQXQoeCwgeSkKKyAgICAgICAgeworICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2FsbEZ1 bmN0aW9uQW5kV2FpdEZvclNjcm9sbFRvRmluaXNoKGFzeW5jICgpID0+IHsKKyAgICAgICAgICAg ICAgICBhd2FpdCBVSUhlbHBlci5kcmFnRnJvbVBvaW50VG9Qb2ludCh4LCB5LCB4LCB5IC0gMzAs IDAuMjUpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGFz eW5jIGZ1bmN0aW9uIHRlc3RTY3JvbGxJbkNlbnRlcigpCisgICAgICAgIHsKKyAgICAgICAgICAg IGRlYnVnKCcnKTsKKyAgICAgICAgICAgIGRlYnVnKCdUZXN0IHNjcm9sbCBvdmVyIGNvbnRlbnQn KTsKKyAgICAgICAgICAgIGF3YWl0IHJlc2V0U2Nyb2xsUG9zaXRpb25zKCk7CisgICAgICAgICAg ICBhd2FpdCB2ZXJ0aWNhbFN3aXBlR2VzdHVyZUF0KDE1MCwgMTUwKTsKKworICAgICAgICAgICAg c2hvdWxkQmUoJ292ZXJmbG93U2Nyb2xsRXZlbnRDb3VudCA+IDAnLCAndHJ1ZScpOworICAgICAg ICAgICAgc2hvdWxkQmUoJ3dpbmRvd1Njcm9sbEV2ZW50Q291bnQnLCAnMCcpOworICAgICAgICB9 CisKKyAgICAgICAgYXN5bmMgZnVuY3Rpb24gdGVzdFNjcm9sbEluVXBwZXJMZWZ0KCkKKyAgICAg ICAgeworICAgICAgICAgICAgZGVidWcoJycpOworICAgICAgICAgICAgZGVidWcoJ1Rlc3Qgc2Ny b2xsIG92ZXIgY29udGVudCcpOworICAgICAgICAgICAgYXdhaXQgcmVzZXRTY3JvbGxQb3NpdGlv bnMoKTsKKyAgICAgICAgICAgIGF3YWl0IHZlcnRpY2FsU3dpcGVHZXN0dXJlQXQoNTAsIDUwKTsK KworICAgICAgICAgICAgc2hvdWxkQmUoJ292ZXJmbG93U2Nyb2xsRXZlbnRDb3VudCcsICcwJyk7 CisgICAgICAgICAgICBzaG91bGRCZSgnd2luZG93U2Nyb2xsRXZlbnRDb3VudCA+IDAnLCAndHJ1 ZScpOworICAgICAgICB9CisKKyAgICAgICAgYXN5bmMgZnVuY3Rpb24gdGVzdFNjcm9sbEluTG93 ZXJSaWdodCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGRlYnVnKCcnKTsKKyAgICAgICAgICAg IGRlYnVnKCdUZXN0IHNjcm9sbCBvdmVyIGNvbnRlbnQnKTsKKyAgICAgICAgICAgIGF3YWl0IHJl c2V0U2Nyb2xsUG9zaXRpb25zKCk7CisgICAgICAgICAgICBhd2FpdCB2ZXJ0aWNhbFN3aXBlR2Vz dHVyZUF0KDIwMCwgMjAwKTsKKworICAgICAgICAgICAgc2hvdWxkQmUoJ292ZXJmbG93U2Nyb2xs RXZlbnRDb3VudCcsICcwJyk7CisgICAgICAgICAgICBzaG91bGRCZSgnd2luZG93U2Nyb2xsRXZl bnRDb3VudCA+IDAnLCAndHJ1ZScpOworICAgICAgICB9CisKKyAgICAgICAgYXN5bmMgZnVuY3Rp b24gc2Nyb2xsVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGF3YWl0IHRlc3RTY3JvbGxJ bkNlbnRlcigpOworICAgICAgICAgICAgYXdhaXQgdGVzdFNjcm9sbEluVXBwZXJMZWZ0KCk7Cisg ICAgICAgICAgICBhd2FpdCB0ZXN0U2Nyb2xsSW5Mb3dlclJpZ2h0KCk7CisKKyAgICAgICAgICAg IGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9CisKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlz dGVuZXIoJ2xvYWQnLCAoKSA9PiB7CisgICAgICAgICAgICBzY3JvbGxlciA9IGRvY3VtZW50LnF1 ZXJ5U2VsZWN0b3IoJy5zY3JvbGxlcicpOworICAgICAgICAgICAgc2Nyb2xsZXIuYWRkRXZlbnRM aXN0ZW5lcignc2Nyb2xsJywgKCkgPT4geworICAgICAgICAgICAgICAgICsrb3ZlcmZsb3dTY3Jv bGxFdmVudENvdW50OworICAgICAgICAgICAgfSwgZmFsc2UpOworCisgICAgICAgICAgICB3aW5k b3cuYWRkRXZlbnRMaXN0ZW5lcignc2Nyb2xsJywgKCkgPT4geworICAgICAgICAgICAgICAgICsr d2luZG93U2Nyb2xsRXZlbnRDb3VudDsKKyAgICAgICAgICAgIH0sIGZhbHNlKTsKKworICAgICAg ICAgICAgc2V0VGltZW91dChzY3JvbGxUZXN0LCAwKTsKKyAgICAgICAgfSwgZmFsc2UpOworICAg IDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIj4K KyAgICAgICAgPGRpdiBjbGFzcz0ic2Nyb2xsZXIiPgorICAgICAgICAgICAgPGRpdiBjbGFzcz0i Y29udGVudCI+PC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorICAgIDxkaXYgaWQ9 ImNvbnNvbGUiPjwvZGl2PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9jbGlwLXBhdGgtaGl0LXRlc3QtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2NsaXAtcGF0aC1oaXQtdGVzdC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5iMjk5 ZGQwMDgxOTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9t YWMvY2xpcC1wYXRoLWhpdC10ZXN0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE2IEBACisKK1Rl c3Qgc2Nyb2xsIG92ZXIgY29udGVudAorUEFTUyBvdmVyZmxvd1Njcm9sbEV2ZW50Q291bnQgPiAw IGlzIHRydWUKK1BBU1Mgd2luZG93U2Nyb2xsRXZlbnRDb3VudCBpcyAwCisKK1Rlc3Qgc2Nyb2xs IG92ZXIgY29udGVudAorUEFTUyBvdmVyZmxvd1Njcm9sbEV2ZW50Q291bnQgaXMgMAorUEFTUyB3 aW5kb3dTY3JvbGxFdmVudENvdW50ID4gMCBpcyB0cnVlCisKK1Rlc3Qgc2Nyb2xsIG92ZXIgY29u dGVudAorUEFTUyBvdmVyZmxvd1Njcm9sbEV2ZW50Q291bnQgaXMgMAorUEFTUyB3aW5kb3dTY3Jv bGxFdmVudENvdW50ID4gMCBpcyB0cnVlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxp bmcvbWFjL2NsaXAtcGF0aC1oaXQtdGVzdC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxp bmcvbWFjL2NsaXAtcGF0aC1oaXQtdGVzdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMC4uOTQ0OWNkNDUxNzQxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9zY3JvbGxpbmcvbWFjL2NsaXAtcGF0aC1oaXQtdGVzdC5odG1sCkBAIC0wLDAgKzEs MTEwIEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5h bDpBc3luY092ZXJmbG93U2Nyb2xsaW5nRW5hYmxlZD10cnVlIF0gLS0+Cis8aHRtbD4KKzxoZWFk PgorICAgIDxzdHlsZT4KKyAgICAgICAgYm9keSB7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMDBw eDsKKyAgICAgICAgfQorICAgICAgICAuY29udGFpbmVyIHsKKyAgICAgICAgICAgIGNsaXAtcGF0 aDogY2lyY2xlKDEwMHB4IGF0IDEyMHB4IDEyMHB4KTsKKyAgICAgICAgfQorICAgICAgICAuc2Ny b2xsZXIgeworICAgICAgICAgICAgaGVpZ2h0OiAzMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAz MDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAgICAgICAgICAg cGFkZGluZzogNXB4OworICAgICAgICAgICAgb3ZlcmZsb3c6IHNjcm9sbDsKKyAgICAgICAgfQor ICAgICAgICAuY29udGVudCB7CisgICAgICAgICAgICB3aWR0aDogMjAwJTsKKyAgICAgICAgICAg IGhlaWdodDogMzAwJTsKKyAgICAgICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IHJlcGVhdGluZy1s aW5lYXItZ3JhZGllbnQod2hpdGUsIHNpbHZlciAyMDBweCk7CisgICAgICAgIH0KKyAgICA8L3N0 eWxlPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgICAgICB2YXIganNUZXN0SXNBc3luYyA9 IHRydWU7CisKKyAgICAgICAgdmFyIHNjcm9sbGVyOworICAgICAgICB2YXIgb3ZlcmZsb3dTY3Jv bGxFdmVudENvdW50ID0gMDsKKyAgICAgICAgdmFyIHdpbmRvd1Njcm9sbEV2ZW50Q291bnQgPSAw OworCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHJlc2V0U2Nyb2xsUG9zaXRpb25zKCkKKyAgICAg ICAgeworICAgICAgICAgICAgd2luZG93LnNjcm9sbFRvKDAsIDApOworICAgICAgICAgICAgc2Ny b2xsZXIuc2Nyb2xsVG9wID0gMDsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgLy8gV2FpdCBm b3Igc2Nyb2xsIGV2ZW50cyB0byBmaXJlLgorICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuYW5p bWF0aW9uRnJhbWUoKTsKKworICAgICAgICAgICAgb3ZlcmZsb3dTY3JvbGxFdmVudENvdW50ID0g MDsKKyAgICAgICAgICAgIHdpbmRvd1Njcm9sbEV2ZW50Q291bnQgPSAwOworICAgICAgICB9Cisg ICAgICAgIAorICAgICAgICBhc3luYyBmdW5jdGlvbiB0ZXN0U2Nyb2xsSW5DZW50ZXIoKQorICAg ICAgICB7CisgICAgICAgICAgICBkZWJ1ZygnJyk7CisgICAgICAgICAgICBkZWJ1ZygnVGVzdCBz Y3JvbGwgb3ZlciBjb250ZW50Jyk7CisgICAgICAgICAgICBhd2FpdCByZXNldFNjcm9sbFBvc2l0 aW9ucygpOworICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNjcm9sbEF0KDE1 MCwgMTUwKTsKKworICAgICAgICAgICAgc2hvdWxkQmUoJ292ZXJmbG93U2Nyb2xsRXZlbnRDb3Vu dCA+IDAnLCAndHJ1ZScpOworICAgICAgICAgICAgc2hvdWxkQmUoJ3dpbmRvd1Njcm9sbEV2ZW50 Q291bnQnLCAnMCcpOworICAgICAgICB9CisKKyAgICAgICAgYXN5bmMgZnVuY3Rpb24gdGVzdFNj cm9sbEluVXBwZXJMZWZ0KCkKKyAgICAgICAgeworICAgICAgICAgICAgZGVidWcoJycpOworICAg ICAgICAgICAgZGVidWcoJ1Rlc3Qgc2Nyb2xsIG92ZXIgY29udGVudCcpOworICAgICAgICAgICAg YXdhaXQgcmVzZXRTY3JvbGxQb3NpdGlvbnMoKTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVy Lm1vdXNlV2hlZWxTY3JvbGxBdCg1MCwgNTApOworCisgICAgICAgICAgICBzaG91bGRCZSgnb3Zl cmZsb3dTY3JvbGxFdmVudENvdW50JywgJzAnKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCd3aW5k b3dTY3JvbGxFdmVudENvdW50ID4gMCcsICd0cnVlJyk7CisgICAgICAgIH0KKworICAgICAgICBh c3luYyBmdW5jdGlvbiB0ZXN0U2Nyb2xsSW5Mb3dlclJpZ2h0KCkKKyAgICAgICAgeworICAgICAg ICAgICAgZGVidWcoJycpOworICAgICAgICAgICAgZGVidWcoJ1Rlc3Qgc2Nyb2xsIG92ZXIgY29u dGVudCcpOworICAgICAgICAgICAgYXdhaXQgcmVzZXRTY3JvbGxQb3NpdGlvbnMoKTsKKyAgICAg ICAgICAgIGF3YWl0IFVJSGVscGVyLm1vdXNlV2hlZWxTY3JvbGxBdCgyMDAsIDIwMCk7CisKKyAg ICAgICAgICAgIHNob3VsZEJlKCdvdmVyZmxvd1Njcm9sbEV2ZW50Q291bnQnLCAnMCcpOworICAg ICAgICAgICAgc2hvdWxkQmUoJ3dpbmRvd1Njcm9sbEV2ZW50Q291bnQgPiAwJywgJ3RydWUnKTsK KyAgICAgICAgfQorCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHNjcm9sbFRlc3QoKQorICAgICAg ICB7CisgICAgICAgICAgICBhd2FpdCB0ZXN0U2Nyb2xsSW5DZW50ZXIoKTsKKyAgICAgICAgICAg IGF3YWl0IHRlc3RTY3JvbGxJblVwcGVyTGVmdCgpOworICAgICAgICAgICAgYXdhaXQgdGVzdFNj cm9sbEluTG93ZXJSaWdodCgpOworCisgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAg ICAgfQorCisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgKCkgPT4gewor ICAgICAgICAgICAgc2Nyb2xsZXIgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcuc2Nyb2xsZXIn KTsKKyAgICAgICAgICAgIHNjcm9sbGVyLmFkZEV2ZW50TGlzdGVuZXIoJ3Njcm9sbCcsICgpID0+ IHsKKyAgICAgICAgICAgICAgICArK292ZXJmbG93U2Nyb2xsRXZlbnRDb3VudDsKKyAgICAgICAg ICAgIH0sIGZhbHNlKTsKKworICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ3Nj cm9sbCcsICgpID0+IHsKKyAgICAgICAgICAgICAgICArK3dpbmRvd1Njcm9sbEV2ZW50Q291bnQ7 CisgICAgICAgICAgICB9LCBmYWxzZSk7CisKKyAgICAgICAgICAgIHNldFRpbWVvdXQoc2Nyb2xs VGVzdCwgMCk7CisgICAgICAgIH0sIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgICAgIDxkaXYgY2xhc3M9InNj cm9sbGVyIj4KKyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPjwvZGl2PgorICAgICAg ICA8L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgICA8 c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+ Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWIwY2ZlOGVjNTI1Li5iODU2YjkyODVl Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAyMC0wNy0xNSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBpdHNuaWNldGhhdC5jb20gcGFn ZSBpcyBzb21ldGltZXMgbm9uLXNjcm9sbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDM2MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjU0 MzExMjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBUaGlz IHBhZ2UgdXNlcyAnY2xpcC1wYXRoOiBpbnNldCgxcHgpOyBvbiBhIDFweCB4IDFweCBlbGVtZW50 IHRvIGhpdCBkZXNjZW5kYW50cyBmcm9tCisgICAgICAgIGhpdC10ZXN0aW5nIGFuZCBjb21wb3Np dGluZyBjb2RlIHR1cm5zIHRoaXMgaW50byBhIGxheWVyIG1hc2sgdXNpbmcgYSBDQVNoYXBlTGF5 ZXIuCisgICAgICAgIE91ciBsYXllci92aWV3IGhpdC10ZXN0aW5nIGNvZGUgZmFpbGVkIHRvIGNo ZWNrIGZvciBtYXNraW5nOyBpZiBhIGxheWVyIGhhcyBhIG1hc2ssCisgICAgICAgIGl0IG5lZWRz IHRvIGJlIGhhbmRsZWQgbGlrZSAtbWFza3NUb0JvdW5kcywgaW4gdGhhdCBwb2ludHMgb3V0c2lk ZSB0aGUgbWFzayBzaG91bGQKKyAgICAgICAgbmV2ZXIgaGl0IGRlc2NlbmRhbnQgbGF5ZXJzLgor CisgICAgICAgIE1ha2UgYSAtX3dlYl9tYXNrQ29udGFpbnNQb2ludDogdG8gdGVzdCB3aGV0aGVy IHRoZSBwb2ludCBpcyBpbnNpZGUgdGhlIG1hc2sgbGF5ZXIsCisgICAgICAgIGFuZCBfd2ViX21h c2tNYXlJbnRlcnNlY3RSZWN0OiB3aGljaCBkb2VzIGFwcHJveGltYXRlIHRlc3RpbmcgdXNpbmcg cGF0aCBib3VuZHMKKyAgICAgICAgaW50ZXJzZWN0aW9uICh0aGlzIGlzIHVzZWQgZm9yIGVkaXRh YmxlIHJlZ2lvbnMpLgorCisgICAgICAgIEFsc28gY29udmVydCBzb21lIGhhcmQtY29kZWQgd2lu ZGluZyBydWxlIHN0cmluZ3MgdG8gdXNlIHRoZSBDQSBjb25zdGFudHMuCisKKyAgICAgICAgVGVz dHM6IGZhc3Qvc2Nyb2xsaW5nL2lvcy9jbGlwLXBhdGgtaGl0LXRlc3QuaHRtbAorICAgICAgICAg ICAgICAgZmFzdC9zY3JvbGxpbmcvbWFjL2NsaXAtcGF0aC1oaXQtdGVzdC5odG1sCisKKyAgICAg ICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZU1hYy5tbToKKyAgICAgICAgKGNv bGxlY3REZXNjZW5kYW50TGF5ZXJzQXRQb2ludCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpQ bGF0Zm9ybUNBTGF5ZXJDb2NvYTo6c2hhcGVXaW5kUnVsZSBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6c2V0U2hhcGVXaW5kUnVsZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZUNBTGF5ZXJFeHRyYXMuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9XZWJDb3JlQ0FMYXllckV4dHJhcy5tbToKKyAgICAg ICAgKC1bQ0FMYXllciBfd2ViX21hc2tDb250YWluc1BvaW50Ol0pOgorICAgICAgICAoLVtDQUxh eWVyIF93ZWJfbWFza01heUludGVyc2VjdFJlY3Q6XSk6CisKIDIwMjAtMDctMTQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRmxpcCB0aGUgc2Vuc2Ug b2YgdGhlIHJldHVybiB2YWx1ZSBmb3IgcHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxTbmFwKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdU cmVlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1Ry ZWVNYWMubW0KaW5kZXggNTUyZTBjMjRhODkzLi5lYjQzN2E2MmIxMjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTWFjLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTWFjLm1tCkBA IC0zNSw2ICszNSw3IEBACiAjaW1wb3J0ICJTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdO b2RlTWFjLmgiCiAjaW1wb3J0ICJTY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGUuaCIKICNpbXBv cnQgIlNjcm9sbGluZ1RyZWVTdGlja3lOb2RlLmgiCisjaW1wb3J0ICJXZWJDb3JlQ0FMYXllckV4 dHJhcy5oIgogI2ltcG9ydCAiV2ViTGF5ZXIuaCIKICNpbXBvcnQgIldoZWVsRXZlbnRUZXN0TW9u aXRvci5oIgogI2ltcG9ydCA8d3RmL3RleHQvVGV4dFN0cmVhbS5oPgpAQCAtODMsNiArODQsOSBA QCBzdGF0aWMgdm9pZCBjb2xsZWN0RGVzY2VuZGFudExheWVyc0F0UG9pbnQoVmVjdG9yPExheWVy QW5kUG9pbnQsIDE2PiYgbGF5ZXJzQXRQbwogICAgIGlmIChwYXJlbnQubWFza3NUb0JvdW5kcyAm JiAhW3BhcmVudCBjb250YWluc1BvaW50OnBvaW50XSkKICAgICAgICAgcmV0dXJuOwogCisgICAg aWYgKHBhcmVudC5tYXNrICYmICFbcGFyZW50IF93ZWJfbWFza0NvbnRhaW5zUG9pbnQ6cG9pbnRd KQorICAgICAgICByZXR1cm47CisKICAgICBmb3IgKENBTGF5ZXIgKmxheWVyIGluIFtwYXJlbnQg c3VibGF5ZXJzXSkgewogICAgICAgICBDQUxheWVyICpsYXllcldpdGhSZXNvbHZlZEFuaW1hdGlv bnMgPSBsYXllcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQppbmRleCBhYjFm NzY3YzJlYmYuLjg4YzVhMzNkODY3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2Eu bW0KQEAgLTk2Niw3ICs5NjYsNyBAQCBXaW5kUnVsZSBQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6c2hh cGVXaW5kUnVsZSgpIGNvbnN0CiAgICAgQVNTRVJUKG1fbGF5ZXJUeXBlID09IExheWVyVHlwZVNo YXBlTGF5ZXIpOwogCiAgICAgTlNTdHJpbmcgKmZpbGxSdWxlID0gWyhDQVNoYXBlTGF5ZXIgKilt X2xheWVyIGZpbGxSdWxlXTsKLSAgICBpZiAoW2ZpbGxSdWxlIGlzRXF1YWxUb1N0cmluZzpAImV2 ZW4tb2RkIl0pCisgICAgaWYgKFtmaWxsUnVsZSBpc0VxdWFsVG9TdHJpbmc6a0NBRmlsbFJ1bGVF dmVuT2RkXSkKICAgICAgICAgcmV0dXJuIFdpbmRSdWxlOjpFdmVuT2RkOwogCiAgICAgcmV0dXJu IFdpbmRSdWxlOjpOb25aZXJvOwpAQCAtOTc4LDEwICs5NzgsMTAgQEAgdm9pZCBQbGF0Zm9ybUNB TGF5ZXJDb2NvYTo6c2V0U2hhcGVXaW5kUnVsZShXaW5kUnVsZSB3aW5kUnVsZSkKIAogICAgIHN3 aXRjaCAod2luZFJ1bGUpIHsKICAgICBjYXNlIFdpbmRSdWxlOjpOb25aZXJvOgotICAgICAgICBb KENBU2hhcGVMYXllciAqKW1fbGF5ZXIgc2V0RmlsbFJ1bGU6QCJub24temVybyJdOworICAgICAg ICBbKENBU2hhcGVMYXllciAqKW1fbGF5ZXIgc2V0RmlsbFJ1bGU6a0NBRmlsbFJ1bGVOb25aZXJv XTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXaW5kUnVsZTo6RXZlbk9kZDoKLSAgICAgICAg WyhDQVNoYXBlTGF5ZXIgKiltX2xheWVyIHNldEZpbGxSdWxlOkAiZXZlbi1vZGQiXTsKKyAgICAg ICAgWyhDQVNoYXBlTGF5ZXIgKiltX2xheWVyIHNldEZpbGxSdWxlOmtDQUZpbGxSdWxlRXZlbk9k ZF07CiAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVDQUxheWVyRXh0cmFzLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9XZWJDb3JlQ0FMYXllckV4dHJhcy5oCmlu ZGV4IGY2NTZlZGEyZDM4ZC4uZjRjOWRjZWRmYWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9XZWJDb3JlQ0FMYXllckV4dHJhcy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVDQUxheWVyRXh0cmFz LmgKQEAgLTI3LDkgKzI3LDEyIEBACiAKIEBpbnRlcmZhY2UgQ0FMYXllciAoV2ViQ29yZUNBTGF5 ZXJFeHRyYXMpCiAKKysgKENBTGF5ZXIgKilfd2ViX3JlbmRlckxheWVyV2l0aENvbnRleHRJRDoo dWludDMyX3QpY29udGV4dElEOworCiAtICh2b2lkKXdlYl9kaXNhYmxlQWxsQWN0aW9uczsKIC0g KHZvaWQpX3dlYl9zZXRMYXllckJvdW5kc09yaWdpbjooQ0dQb2ludClvcmlnaW47CiAtICh2b2lk KV93ZWJfc2V0TGF5ZXJUb3BMZWZ0UG9zaXRpb246KENHUG9pbnQpcG9zaXRpb247Ci0rIChDQUxh eWVyICopX3dlYl9yZW5kZXJMYXllcldpdGhDb250ZXh0SUQ6KHVpbnQzMl90KWNvbnRleHRJRDsK Ky0gKEJPT0wpX3dlYl9tYXNrQ29udGFpbnNQb2ludDooQ0dQb2ludClwb2ludDsKKy0gKEJPT0wp X3dlYl9tYXNrTWF5SW50ZXJzZWN0UmVjdDooQ0dSZWN0KXJlY3Q7CiAKIEBlbmQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVDQUxheWVy RXh0cmFzLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29y ZUNBTGF5ZXJFeHRyYXMubW0KaW5kZXggZjEwMjc0NDlmYmQ4Li5hMThiN2M5NzkxNmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVDQUxh eWVyRXh0cmFzLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L1dlYkNvcmVDQUxheWVyRXh0cmFzLm1tCkBAIC04OCw0ICs4OCwzMiBAQCArIChDQUxheWVyICop X3dlYl9yZW5kZXJMYXllcldpdGhDb250ZXh0SUQ6KHVpbnQzMl90KWNvbnRleHRJRAogICAgIHJl dHVybiBsYXllckhvc3Q7CiB9CiAKKy0gKEJPT0wpX3dlYl9tYXNrQ29udGFpbnNQb2ludDooQ0dQ b2ludClwb2ludAoreworICAgIGlmICghc2VsZi5tYXNrKQorICAgICAgICByZXR1cm4gTk87CisK KyAgICBDR1BvaW50IHBvaW50SW5NYXNrID0gW3NlbGYubWFzayBjb252ZXJ0UG9pbnQ6cG9pbnQg ZnJvbUxheWVyOnNlbGZdOworICAgIGlmIChhdXRvICpzaGFwZU1hc2sgPSBkeW5hbWljX29iamNf Y2FzdDxDQVNoYXBlTGF5ZXI+KHNlbGYubWFzaykpIHsKKyAgICAgICAgYm9vbCBpc0V2ZW5PZGRG aWxsID0gW3NoYXBlTWFzay5maWxsUnVsZSBpc0VxdWFsVG9TdHJpbmc6a0NBRmlsbFJ1bGVFdmVu T2RkXTsKKyAgICAgICAgcmV0dXJuIENHUGF0aENvbnRhaW5zUG9pbnQoc2hhcGVNYXNrLnBhdGgs IG51bGxwdHIsIHBvaW50SW5NYXNrLCBpc0V2ZW5PZGRGaWxsKTsKKyAgICB9CisKKyAgICByZXR1 cm4gW3NlbGYubWFzayBjb250YWluc1BvaW50OnBvaW50SW5NYXNrXTsKK30KKworLSAoQk9PTClf d2ViX21hc2tNYXlJbnRlcnNlY3RSZWN0OihDR1JlY3QpcmVjdAoreworICAgIGlmICghc2VsZi5t YXNrKQorICAgICAgICByZXR1cm4gTk87CisKKyAgICBDR1JlY3QgcmVjdEluTWFzayA9IFtzZWxm Lm1hc2sgY29udmVydFJlY3Q6cmVjdCBmcm9tTGF5ZXI6c2VsZl07CisgICAgaWYgKGF1dG8gKnNo YXBlTWFzayA9IGR5bmFtaWNfb2JqY19jYXN0PENBU2hhcGVMYXllcj4oc2VsZi5tYXNrKSkgewor ICAgICAgICBDR1JlY3QgcGF0aEJvdW5kcyA9IENHUGF0aEdldFBhdGhCb3VuZGluZ0JveChzaGFw ZU1hc2sucGF0aCk7CisgICAgICAgIHJldHVybiBDR1JlY3RJbnRlcnNlY3RzUmVjdChwYXRoQm91 bmRzLCByZWN0SW5NYXNrKTsKKyAgICB9CisKKyAgICByZXR1cm4gQ0dSZWN0SW50ZXJzZWN0c1Jl Y3Qoc2VsZi5tYXNrLmJvdW5kcywgcmVjdEluTWFzayk7Cit9CisKIEBlbmQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg NzdkOTMxOWM5NjUzLi4zOWY0MzIzOTM1ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKyAy MDIwLTA3LTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAg ICAgIGl0c25pY2V0aGF0LmNvbSBwYWdlIGlzIHNvbWV0aW1lcyBub24tc2Nyb2xsYWJsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MzYyCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82NTQzMTEyNz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIFRoaXMgcGFnZSB1c2VzICdjbGlwLXBhdGg6IGluc2V0KDFweCk7 IG9uIGEgMXB4IHggMXB4IGVsZW1lbnQgdG8gaGl0IGRlc2NlbmRhbnRzIGZyb20KKyAgICAgICAg aGl0LXRlc3RpbmcgYW5kIGNvbXBvc2l0aW5nIGNvZGUgdHVybnMgdGhpcyBpbnRvIGEgbGF5ZXIg bWFzayB1c2luZyBhIENBU2hhcGVMYXllci4KKyAgICAgICAgT3VyIGxheWVyL3ZpZXcgaGl0LXRl c3RpbmcgY29kZSBmYWlsZWQgdG8gY2hlY2sgZm9yIG1hc2tpbmc7IGlmIGEgbGF5ZXIgaGFzIGEg bWFzaywKKyAgICAgICAgaXQgbmVlZHMgdG8gYmUgaGFuZGxlZCBsaWtlIC1tYXNrc1RvQm91bmRz LCBpbiB0aGF0IHBvaW50cyBvdXRzaWRlIHRoZSBtYXNrIHNob3VsZAorICAgICAgICBuZXZlciBo aXQgZGVzY2VuZGFudCBsYXllcnMuCisKKyAgICAgICAgTWFrZSBhIC1fd2ViX21hc2tDb250YWlu c1BvaW50OiB0byB0ZXN0IHdoZXRoZXIgdGhlIHBvaW50IGlzIGluc2lkZSB0aGUgbWFzayBsYXll ciwKKyAgICAgICAgYW5kIF93ZWJfbWFza01heUludGVyc2VjdFJlY3Q6IHdoaWNoIGRvZXMgYXBw cm94aW1hdGUgdGVzdGluZyB1c2luZyBwYXRoIGJvdW5kcworICAgICAgICBpbnRlcnNlY3Rpb24g KHRoaXMgaXMgdXNlZCBmb3IgZWRpdGFibGUgcmVnaW9ucykuCisKKyAgICAgICAgQWxzbyBjb252 ZXJ0IHNvbWUgaGFyZC1jb2RlZCB3aW5kaW5nIHJ1bGUgc3RyaW5ncyB0byB1c2UgdGhlIENBIGNv bnN0YW50cy4KKworICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJU cmVlUHJvcGVydHlBcHBsaWVyLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVQ cm9wZXJ0eUFwcGxpZXI6OmFwcGx5UHJvcGVydGllc1RvTGF5ZXIpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLm1tOgorICAgICAg ICAoV2ViS2l0Ojpjb2xsZWN0RGVzY2VuZGFudFZpZXdzQXRQb2ludCk6CisgICAgICAgIChXZWJL aXQ6OmNvbGxlY3REZXNjZW5kYW50Vmlld3NJblJlY3QpOgorCiAyMDIwLTA3LTE0ICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZsYXNoZXMgb2YgaW5j b3JyZWN0IHNjcm9sbCBwb3NpdGlvbiB3aGVuIHpvb21pbmcgb24gcXVpcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3Bl cnR5QXBwbGllci5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1v dGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0KaW5kZXggYTVmZjg3Y2QxZGVhLi40NzJmYmYw ZmQzNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9S ZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5tbQpAQCAt MjMwLDEwICsyMzAsMTAgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXI6OmFw cGx5UHJvcGVydGllc1RvTGF5ZXIoQ0FMYXllciAqbGF5ZXIsIFJlbW8KICAgICAgICAgQ0FTaGFw ZUxheWVyICpzaGFwZUxheWVyID0gKENBU2hhcGVMYXllciAqKWxheWVyOwogICAgICAgICBzd2l0 Y2ggKHByb3BlcnRpZXMud2luZFJ1bGUpIHsKICAgICAgICAgY2FzZSBXaW5kUnVsZTo6Tm9uWmVy bzoKLSAgICAgICAgICAgIHNoYXBlTGF5ZXIuZmlsbFJ1bGUgPSBAIm5vbi16ZXJvIjsKKyAgICAg ICAgICAgIHNoYXBlTGF5ZXIuZmlsbFJ1bGUgPSBrQ0FGaWxsUnVsZU5vblplcm87CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgY2FzZSBXaW5kUnVsZTo6RXZlbk9kZDoKLSAgICAgICAgICAg IHNoYXBlTGF5ZXIuZmlsbFJ1bGUgPSBAImV2ZW4tb2RkIjsKKyAgICAgICAgICAgIHNoYXBlTGF5 ZXIuZmlsbFJ1bGUgPSBrQ0FGaWxsUnVsZUV2ZW5PZGQ7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLm1tCmluZGV4 IGYxYmJkMjVkNTUyMy4uNjk2NGE3NWQ3NjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJU cmVlVmlld3MubW0KQEAgLTM2LDYgKzM2LDcgQEAKICNpbXBvcnQgIldLRHJhd2luZ1ZpZXcuaCIK ICNpbXBvcnQgPFdlYkNvcmUvUmVnaW9uLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1RyYW5zZm9ybWF0 aW9uTWF0cml4Lmg+CisjaW1wb3J0IDxXZWJDb3JlL1dlYkNvcmVDQUxheWVyRXh0cmFzLmg+CiAj aW1wb3J0IDxwYWwvc3BpL2NvY29hL1F1YXJ0ekNvcmVTUEkuaD4KICNpbXBvcnQgPHd0Zi9Tb2Z0 TGlua2luZy5oPgogCkBAIC00Niw2ICs0Nyw5IEBAIHN0YXRpYyB2b2lkIGNvbGxlY3REZXNjZW5k YW50Vmlld3NBdFBvaW50KFZlY3RvcjxVSVZpZXcgKiwgMTY+JiB2aWV3c0F0UG9pbnQsIFVJCiAg ICAgaWYgKHBhcmVudC5jbGlwc1RvQm91bmRzICYmICFbcGFyZW50IHBvaW50SW5zaWRlOnBvaW50 IHdpdGhFdmVudDpldmVudF0pCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChwYXJlbnQubGF5 ZXIubWFzayAmJiAhW3BhcmVudC5sYXllciBfd2ViX21hc2tDb250YWluc1BvaW50OnBvaW50XSkK KyAgICAgICAgcmV0dXJuOworCiAgICAgZm9yIChVSVZpZXcgKnZpZXcgaW4gW3BhcmVudCBzdWJ2 aWV3c10pIHsKICAgICAgICAgQ0dQb2ludCBzdWJ2aWV3UG9pbnQgPSBbdmlldyBjb252ZXJ0UG9p bnQ6cG9pbnQgZnJvbVZpZXc6cGFyZW50XTsKIApAQCAtODgsNiArOTIsOSBAQCBzdGF0aWMgdm9p ZCBjb2xsZWN0RGVzY2VuZGFudFZpZXdzSW5SZWN0KFZlY3RvcjxVSVZpZXcgKiwgMTY+JiB2aWV3 c0luUmVjdCwgVUlWaQogICAgIGlmIChwYXJlbnQuY2xpcHNUb0JvdW5kcyAmJiAhQ0dSZWN0SW50 ZXJzZWN0c1JlY3QocGFyZW50LmJvdW5kcywgcmVjdCkpCiAgICAgICAgIHJldHVybjsKIAorICAg IGlmIChwYXJlbnQubGF5ZXIubWFzayAmJiAhW3BhcmVudC5sYXllciBfd2ViX21hc2tNYXlJbnRl cnNlY3RSZWN0OnJlY3RdKQorICAgICAgICByZXR1cm47CisKICAgICBmb3IgKFVJVmlldyAqdmll dyBpbiBwYXJlbnQuc3Vidmlld3MpIHsKICAgICAgICAgQ0dSZWN0IHN1YnZpZXdSZWN0ID0gW3Zp ZXcgY29udmVydFJlY3Q6cmVjdCBmcm9tVmlldzpwYXJlbnRdOwogCg== 404441 2020-07-16 08:08:01 -0700 2020-07-16 09:06:08 -0700 Patch bug-214365-20200716110800.patch text/plain 1643 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NDQ1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDIwLTA3LTE2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBJbXByb3ZlIGhhbmRsaW5nIG9mIGludmFsaWQgQ2hhbmdlTG9nIGJ5IHdl YmtpdC1wYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE0MzY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weToKKyAg ICAgICAgKFByZXBhcmVDaGFuZ2VMb2cuX2Vuc3VyZV9idWdfdXJsKToKKwogMjAyMC0wNy0xNiAg Sm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3dlYmtpdGNv cmVweV0gQ29ycmVjdCB1cmwgaW4gc2V0dXAucHkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CShyZXZpc2lvbiAy NjQ0NTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5n ZWxvZy5weQkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQgQEAKKyMgQ29weXJpZ2h0IChDKSAy MDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChDKSAyMDEw IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtNTUs NiArNTYsOSBAQCBjbGFzcyBQcmVwYXJlQ2hhbmdlTG9nKEFic3RyYWN0U3RlcCk6CiAgICAgICAg IGNoYW5nZWxvZ3MgPSBzZWxmLmNhY2hlZF9sb29rdXAoc3RhdGUsICJjaGFuZ2Vsb2dzIikKICAg ICAgICAgZm9yIGNoYW5nZWxvZ19wYXRoIGluIGNoYW5nZWxvZ3M6CiAgICAgICAgICAgICBjaGFu Z2Vsb2cgPSBDaGFuZ2VMb2coY2hhbmdlbG9nX3BhdGgsIHNlbGYuX3Rvb2wuZmlsZXN5c3RlbSkK KyAgICAgICAgICAgIGlmIG5vdCBjaGFuZ2Vsb2cubGF0ZXN0X2VudHJ5KCk6CisgICAgICAgICAg ICAgICAgX2xvZy5lcnJvcignSW52YWxpZCBDaGFuZ2VMb2cgYXQ6IHt9Jy5mb3JtYXQoY2hhbmdl bG9nX3BhdGgpKQorICAgICAgICAgICAgICAgIHN5cy5leGl0KDEpCiAgICAgICAgICAgICBpZiBu b3QgY2hhbmdlbG9nLmxhdGVzdF9lbnRyeSgpLmJ1Z19pZCgpOgogICAgICAgICAgICAgICAgIGNo YW5nZWxvZy5zZXRfc2hvcnRfZGVzY3JpcHRpb25fYW5kX2J1Z191cmwoCiAgICAgICAgICAgICAg ICAgICAgIHNlbGYuY2FjaGVkX2xvb2t1cChzdGF0ZSwgImJ1Z190aXRsZSIpLAo=