199305 2019-06-27 19:41:15 -0700 Web Inspector: support `console.screenshot` with subclasses of CanvasRenderingContext 2019-07-24 17:22:18 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 199308 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1548703 0 hi 2019-06-27 19:41:15 -0700 . 1548726 1 373086 hi 2019-06-27 22:30:19 -0700 Created attachment 373086 Patch 1554814 2 373086 joepeck 2019-07-22 13:20:36 -0700 Comment on attachment 373086 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373086&action=review r=me > Source/WebCore/page/PageConsoleClient.cpp:327 > + if (dataURL.isEmpty() || dataURL == "data:,") { This seems out of place in this patch, or does this happen sometimes with empty contexts? 1555547 3 374823 hi 2019-07-24 16:05:42 -0700 Created attachment 374823 Patch 1555569 4 374835 hi 2019-07-24 16:46:50 -0700 Created attachment 374835 Patch 1555587 5 374835 commit-queue 2019-07-24 17:21:40 -0700 Comment on attachment 374835 Patch Clearing flags on attachment: 374835 Committed r247802: <https://trac.webkit.org/changeset/247802> 1555588 6 commit-queue 2019-07-24 17:21:42 -0700 All reviewed patches have been landed. Closing bug. 1555589 7 webkit-bug-importer 2019-07-24 17:22:18 -0700 <rdar://problem/53520667> 373086 2019-06-27 22:30:19 -0700 2019-07-24 16:05:41 -0700 Patch 199305.diff text/plain 6416 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVu c2hvdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xl LXNjcmVlbnNob3QtZXhwZWN0ZWQudHh0CmluZGV4IGY1MGU3OGM1Njc4Li5jNDA5NGQwNGU2YiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1zY3JlZW5z aG90LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25z b2xlLXNjcmVlbnNob3QtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNiBAQAogQ09OU09MRSBNRVNT QUdFOiBbb2JqZWN0IEhUTUxEaXZFbGVtZW50XQogQ09OU09MRSBNRVNTQUdFOiB0ZXN0CitDT05T T0xFIE1FU1NBR0U6IFtvYmplY3QgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEXQogQ09OU09MRSBN RVNTQUdFOiA0MgogQ09OU09MRSBNRVNTQUdFOiBWaWV3cG9ydAogVGVzdHMgZm9yIHRoZSBjb25z b2xlLnNjcmVlbnNob3QgQVBJLgpAQCAtMjEsNiArMjIsMTIgQEAgUEFTUzogVGhlIGltYWdlIGhl aWdodCBzaG91bGQgYmUgMnB4LgogLS0gUnVubmluZyB0ZXN0IGNhc2U6IGNvbnNvbGUuc2NyZWVu c2hvdC5Ob2RlLkRldGFjaGVkTm9uU2NyZWVuc2hvdGFibGUKIFBBU1M6IENvdWxkIG5vdCBjYXB0 dXJlIHNjcmVlbnNob3QKIAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IGNvbnNvbGUuc2NyZWVuc2hv dC5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQKK1BBU1M6IFRoZSBhZGRlZCBtZXNzYWdlIHNob3Vs ZCBiZSBhbiBpbWFnZS4KK1BBU1M6IFRoZSBpbWFnZSBzaG91bGQgbm90IGJlIGVtcHR5LgorUEFT UzogVGhlIGltYWdlIHdpZHRoIHNob3VsZCBiZSAycHguCitQQVNTOiBUaGUgaW1hZ2UgaGVpZ2h0 IHNob3VsZCBiZSAycHguCisKIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBjb25zb2xlLnNjcmVlbnNo b3QuTm9uU2NyZWVuc2hvdGFibGVUYXJnZXQKIFBBU1M6IFRoZSBhZGRlZCBtZXNzYWdlIHNob3Vs ZCBiZSBhbiBpbWFnZS4KIFBBU1M6IFRoZSBpbWFnZSBzaG91bGQgbm90IGJlIGVtcHR5LgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1zY3JlZW5zaG90 Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXNjcmVlbnNob3Qu aHRtbAppbmRleCAwNGY2YzY2NTJkYi4uZjM0NzE0YjBmZDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVuc2hvdC5odG1sCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVuc2hvdC5odG1sCkBAIC0xMSw2 ICsxMSwxMyBAQCBmdW5jdGlvbiBjcmVhdGVEZXRhY2hlZFRlc3QoKQogICAgIHJldHVybiBkaXY7 CiB9CiAKK2Z1bmN0aW9uIGNyZWF0ZUNhbnZhczJEVGVzdCgpIHsKKyAgICBsZXQgY2FudmFzID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAgY2FudmFzLndpZHRoID0gMjsK KyAgICBjYW52YXMuaGVpZ2h0ID0gMjsKKyAgICByZXR1cm4gY2FudmFzLmdldENvbnRleHQoIjJk Iik7Cit9CisKIGZ1bmN0aW9uIHRlc3QoKQogewogICAgIGxldCBzdWl0ZSA9IEluc3BlY3RvclRl c3QuY3JlYXRlQXN5bmNTdWl0ZSgiY29uc29sZS5zY3JlZW5zaG90Iik7CkBAIC03NSw2ICs4Miwx OCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgc2hvdWxkRXJyb3I6IHRydWUsCiAgICAgfSk7 CiAKKyAgICBhZGRUZXN0KHsKKyAgICAgICAgbmFtZTogImNvbnNvbGUuc2NyZWVuc2hvdC5DYW52 YXNSZW5kZXJpbmdDb250ZXh0MkQiLAorICAgICAgICBleHByZXNzaW9uOiBgY29uc29sZS5zY3Jl ZW5zaG90KGNyZWF0ZUNhbnZhczJEVGVzdCgpKWAsCisgICAgICAgIGFzeW5jIGltYWdlTWVzc2Fn ZUFkZGVkQ2FsbGJhY2sobWVzc2FnZSkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3ROb3RFcXVhbChtZXNzYWdlLm1lc3NhZ2VUZXh0LCAiZGF0YToiLCAiVGhlIGltYWdlIHNob3Vs ZCBub3QgYmUgZW1wdHkuIik7CisKKyAgICAgICAgICAgIGxldCBpbWcgPSBhd2FpdCBXSS5JbWFn ZVV0aWxpdGllcy5wcm9taXNpZnlMb2FkKG1lc3NhZ2UubWVzc2FnZVRleHQpOworICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChpbWcud2lkdGgsIDIsICJUaGUgaW1hZ2Ugd2lk dGggc2hvdWxkIGJlIDJweC4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1 YWwoaW1nLmhlaWdodCwgMiwgIlRoZSBpbWFnZSBoZWlnaHQgc2hvdWxkIGJlIDJweC4iKTsKKyAg ICAgICAgfSwKKyAgICB9KTsKKwogICAgIGFkZFRlc3QoewogICAgICAgICBuYW1lOiAiY29uc29s ZS5zY3JlZW5zaG90Lk5vblNjcmVlbnNob3RhYmxlVGFyZ2V0IiwKICAgICAgICAgZXhwcmVzc2lv bjogYGNvbnNvbGUuc2NyZWVuc2hvdCg0MilgLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25z b2xlQ2xpZW50LmNwcAppbmRleCAzZjQzZWIwODBhNi4uOGQ4NzlhMWZjNmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwCkBAIC0yMjIsMTIgKzIyMiw4IEBAIHN0 YXRpYyBKU0M6OkpTT2JqZWN0KiBvYmplY3RBcmd1bWVudEF0KFNjcmlwdEFyZ3VtZW50cyYgYXJn dW1lbnRzLCB1bnNpZ25lZCBpbmRlCiAgICAgcmV0dXJuIGFyZ3VtZW50cy5hcmd1bWVudENvdW50 KCkgPiBpbmRleCA/IGFyZ3VtZW50cy5hcmd1bWVudEF0KGluZGV4KS5nZXRPYmplY3QoKSA6IG51 bGxwdHI7CiB9CiAKLXN0YXRpYyBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjYW52YXNSZW5kZXJp bmdDb250ZXh0KEpTQzo6Vk0mIHZtLCBTY3JpcHRBcmd1bWVudHMmIGFyZ3VtZW50cykKK3N0YXRp YyBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjYW52YXNSZW5kZXJpbmdDb250ZXh0KEpTQzo6Vk0m IHZtLCBKU0M6OkpTVmFsdWUgdGFyZ2V0KQogewotICAgIGF1dG8qIHRhcmdldCA9IG9iamVjdEFy Z3VtZW50QXQoYXJndW1lbnRzLCAwKTsKLSAgICBpZiAoIXRhcmdldCkKLSAgICAgICAgcmV0dXJu IG51bGxwdHI7Ci0KICAgICBpZiAoYXV0byogY2FudmFzID0gSlNIVE1MQ2FudmFzRWxlbWVudDo6 dG9XcmFwcGVkKHZtLCB0YXJnZXQpKQogICAgICAgICByZXR1cm4gY2FudmFzLT5yZW5kZXJpbmdD b250ZXh0KCk7CiAgICAgaWYgKGF1dG8qIGNhbnZhcyA9IEpTT2Zmc2NyZWVuQ2FudmFzOjp0b1dy YXBwZWQodm0sIHRhcmdldCkpCkBAIC0yNDksMTQgKzI0NSwxOCBAQCBzdGF0aWMgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dCogY2FudmFzUmVuZGVyaW5nQ29udGV4dChKU0M6OlZNJiB2bSwgU2NyaXB0 QXJndW1lbgogCiB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpyZWNvcmQoSlNDOjpFeGVjU3RhdGUq IHN0YXRlLCBSZWY8U2NyaXB0QXJndW1lbnRzPiYmIGFyZ3VtZW50cykKIHsKLSAgICBpZiAoYXV0 byogY29udGV4dCA9IGNhbnZhc1JlbmRlcmluZ0NvbnRleHQoc3RhdGUtPnZtKCksIGFyZ3VtZW50 cykpCi0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29uc29sZVN0YXJ0UmVjb3Jk aW5nQ2FudmFzKCpjb250ZXh0LCAqc3RhdGUsIG9iamVjdEFyZ3VtZW50QXQoYXJndW1lbnRzLCAx KSk7CisgICAgaWYgKGF1dG8qIHRhcmdldCA9IG9iamVjdEFyZ3VtZW50QXQoYXJndW1lbnRzLCAw KSkgeworICAgICAgICBpZiAoYXV0byogY29udGV4dCA9IGNhbnZhc1JlbmRlcmluZ0NvbnRleHQo c3RhdGUtPnZtKCksIHRhcmdldCkpCisgICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmNvbnNvbGVTdGFydFJlY29yZGluZ0NhbnZhcygqY29udGV4dCwgKnN0YXRlLCBvYmplY3RB cmd1bWVudEF0KGFyZ3VtZW50cywgMSkpOworICAgIH0KIH0KIAogdm9pZCBQYWdlQ29uc29sZUNs aWVudDo6cmVjb3JkRW5kKEpTQzo6RXhlY1N0YXRlKiBzdGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50 cz4mJiBhcmd1bWVudHMpCiB7Ci0gICAgaWYgKGF1dG8qIGNvbnRleHQgPSBjYW52YXNSZW5kZXJp bmdDb250ZXh0KHN0YXRlLT52bSgpLCBhcmd1bWVudHMpKQotICAgICAgICBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZEZpbmlzaFJlY29yZGluZ0NhbnZhc0ZyYW1lKCpjb250ZXh0LCB0cnVl KTsKKyAgICBpZiAoYXV0byogdGFyZ2V0ID0gb2JqZWN0QXJndW1lbnRBdChhcmd1bWVudHMsIDAp KSB7CisgICAgICAgIGlmIChhdXRvKiBjb250ZXh0ID0gY2FudmFzUmVuZGVyaW5nQ29udGV4dChz dGF0ZS0+dm0oKSwgdGFyZ2V0KSkKKyAgICAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkRmluaXNoUmVjb3JkaW5nQ2FudmFzRnJhbWUoKmNvbnRleHQsIHRydWUpOworICAgIH0K IH0KIAogdm9pZCBQYWdlQ29uc29sZUNsaWVudDo6c2NyZWVuc2hvdChKU0M6OkV4ZWNTdGF0ZSog c3RhdGUsIFJlZjxTY3JpcHRBcmd1bWVudHM+JiYgYXJndW1lbnRzKQpAQCAtMjg5LDYgKzI4OSwy OCBAQCB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpzY3JlZW5zaG90KEpTQzo6RXhlY1N0YXRlKiBz dGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50cz4mJgogICAgICAgICAgICAgaWYgKGF1dG8gc25hcHNo b3QgPSBXZWJDb3JlOjpzbmFwc2hvdE5vZGUobV9wYWdlLm1haW5GcmFtZSgpLCAqbm9kZSkpCiAg ICAgICAgICAgICAgICAgZGF0YVVSTCA9IHNuYXBzaG90LT50b0RhdGFVUkwoImltYWdlL3BuZyJf cywgV1RGOjpudWxsb3B0LCBQcmVzZXJ2ZVJlc29sdXRpb246Olllcyk7CiAgICAgICAgICAgICBj YXB0dXJlQXR0ZW1wdGVkID0gdHJ1ZTsKKyAgICAgICAgfSBlbHNlIGlmIChhdXRvKiBjb250ZXh0 ID0gY2FudmFzUmVuZGVyaW5nQ29udGV4dChzdGF0ZS0+dm0oKSwgdGFyZ2V0KSkgeworICAgICAg ICAgICAgYXV0byYgY2FudmFzID0gY29udGV4dC0+Y2FudmFzQmFzZSgpOworICAgICAgICAgICAg aWYgKGlzPEhUTUxDYW52YXNFbGVtZW50PihjYW52YXMpKSB7CisjaWYgRU5BQkxFKFdFQkdMKQor ICAgICAgICAgICAgICAgIGlmIChpczxXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlPihjb250ZXh0 KSkKKyAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFz ZT4oY29udGV4dCktPnNldFByZXZlbnRCdWZmZXJDbGVhckZvckluc3BlY3Rvcih0cnVlKTsKKyNl bmRpZgorCisgICAgICAgICAgICAgICAgYXV0byByZXN1bHQgPSBkb3duY2FzdDxIVE1MQ2FudmFz RWxlbWVudD4oY2FudmFzKS50b0RhdGFVUkwoImltYWdlL3BuZyJfcyk7CisKKyNpZiBFTkFCTEUo V0VCR0wpCisgICAgICAgICAgICAgICAgaWYgKGlzPFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U+ KGNvbnRleHQpKQorICAgICAgICAgICAgICAgICAgICBkb3duY2FzdDxXZWJHTFJlbmRlcmluZ0Nv bnRleHRCYXNlPihjb250ZXh0KS0+c2V0UHJldmVudEJ1ZmZlckNsZWFyRm9ySW5zcGVjdG9yKGZh bHNlKTsKKyNlbmRpZgorCisgICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQuaGFzRXhjZXB0aW9u KCkpCisgICAgICAgICAgICAgICAgICAgIGRhdGFVUkwgPSByZXN1bHQucmVsZWFzZVJldHVyblZh bHVlKCkuc3RyaW5nOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBGSVhNRTogPGh0 dHBzOi8vd2Via2l0Lm9yZy9iLzE4MDgzMz4gV2ViIEluc3BlY3Rvcjogc3VwcG9ydCBPZmZzY3Jl ZW5DYW52YXMgZm9yIENhbnZhcyByZWxhdGVkIG9wZXJhdGlvbnMKKworICAgICAgICAgICAgY2Fw dHVyZUF0dGVtcHRlZCA9IHRydWU7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTMwMiw3ICszMjQs NyBAQCB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpzY3JlZW5zaG90KEpTQzo6RXhlY1N0YXRlKiBz dGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50cz4mJgogICAgICAgICAgICAgZGF0YVVSTCA9IHNuYXBz aG90LT50b0RhdGFVUkwoImltYWdlL3BuZyJfcywgV1RGOjpudWxsb3B0LCBQcmVzZXJ2ZVJlc29s dXRpb246Olllcyk7CiAgICAgfQogCi0gICAgaWYgKGRhdGFVUkwuaXNFbXB0eSgpKSB7CisgICAg aWYgKGRhdGFVUkwuaXNFbXB0eSgpIHx8IGRhdGFVUkwgPT0gImRhdGE6LCIpIHsKICAgICAgICAg YWRkTWVzc2FnZShzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3Rvcjo6Q29uc29sZU1lc3NhZ2U+KE1l c3NhZ2VTb3VyY2U6OkNvbnNvbGVBUEksIE1lc3NhZ2VUeXBlOjpJbWFnZSwgTWVzc2FnZUxldmVs OjpFcnJvciwgIkNvdWxkIG5vdCBjYXB0dXJlIHNjcmVlbnNob3QiX3MsIFdURk1vdmUoYXJndW1l bnRzKSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQo= 374823 2019-07-24 16:05:42 -0700 2019-07-24 16:46:48 -0700 Patch bug-199305-20190724160542.patch text/plain 7964 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MzY0ZTA2ZmM5ZjA4NThmNTgxOGU2ZTQ5MjM3NDc1OTZlZmQyOWJkLi40 NWQyY2ZjZDk1NGI3YmRmZWExNzMyM2Q4ZDMyZmZiYzc3ZDMyNzI3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTktMDctMjQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN1cHBvcnQgYGNvbnNvbGUuc2NyZWVuc2hvdGAg d2l0aCBzdWJjbGFzc2VzIG9mIENhbnZhc1JlbmRlcmluZ0NvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTMwNQorCisgICAgICAgIFJldmll d2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvY29uc29s ZS9jb25zb2xlLXNjcmVlbnNob3QuaHRtbAorCisgICAgICAgICogcGFnZS9QYWdlQ29uc29sZUNs aWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjYW52YXNSZW5kZXJpbmdDb250ZXh0KToKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VDb25zb2xlQ2xpZW50OjpyZWNvcmQpOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZUNvbnNvbGVDbGllbnQ6OnJlY29yZEVuZCk6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlQ29uc29sZUNsaWVudDo6c2NyZWVuc2hvdCk6CisKIDIwMTktMDctMjQgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByaW50IHRo ZSB0YXJnZXQgb2YgYGNvbnNvbGUuc2NyZWVuc2hvdGAgbGFzdCBzbyB0aGUgdGFyZ2V0IGlzIHRo ZSBjbG9zZXN0IGl0ZW0gdG8gdGhlIGltYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNv bGVDbGllbnQuY3BwCmluZGV4IGUxOTcyZDk5MGQ1MWEyOTcxYjgyODcxNjA3YWU5MjIxZmNlYWFk Y2QuLjBkM2MyY2JiYzlhY2Y5OTQwNTJhMGRhZTg5MDI0NTUyNzU4YzRhYTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwCkBAIC0yMzMsMTIgKzIzMyw4IEBAIHN0 YXRpYyBKU0M6OkpTT2JqZWN0KiBvYmplY3RBcmd1bWVudEF0KFNjcmlwdEFyZ3VtZW50cyYgYXJn dW1lbnRzLCB1bnNpZ25lZCBpbmRlCiAgICAgcmV0dXJuIGFyZ3VtZW50cy5hcmd1bWVudENvdW50 KCkgPiBpbmRleCA/IGFyZ3VtZW50cy5hcmd1bWVudEF0KGluZGV4KS5nZXRPYmplY3QoKSA6IG51 bGxwdHI7CiB9CiAKLXN0YXRpYyBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjYW52YXNSZW5kZXJp bmdDb250ZXh0KEpTQzo6Vk0mIHZtLCBTY3JpcHRBcmd1bWVudHMmIGFyZ3VtZW50cykKK3N0YXRp YyBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjYW52YXNSZW5kZXJpbmdDb250ZXh0KEpTQzo6Vk0m IHZtLCBKU0M6OkpTVmFsdWUgdGFyZ2V0KQogewotICAgIGF1dG8qIHRhcmdldCA9IG9iamVjdEFy Z3VtZW50QXQoYXJndW1lbnRzLCAwKTsKLSAgICBpZiAoIXRhcmdldCkKLSAgICAgICAgcmV0dXJu IG51bGxwdHI7Ci0KICAgICBpZiAoYXV0byogY2FudmFzID0gSlNIVE1MQ2FudmFzRWxlbWVudDo6 dG9XcmFwcGVkKHZtLCB0YXJnZXQpKQogICAgICAgICByZXR1cm4gY2FudmFzLT5yZW5kZXJpbmdD b250ZXh0KCk7CiAgICAgaWYgKGF1dG8qIGNhbnZhcyA9IEpTT2Zmc2NyZWVuQ2FudmFzOjp0b1dy YXBwZWQodm0sIHRhcmdldCkpCkBAIC0yNjAsMTQgKzI1NiwxOCBAQCBzdGF0aWMgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dCogY2FudmFzUmVuZGVyaW5nQ29udGV4dChKU0M6OlZNJiB2bSwgU2NyaXB0 QXJndW1lbgogCiB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpyZWNvcmQoSlNDOjpFeGVjU3RhdGUq IHN0YXRlLCBSZWY8U2NyaXB0QXJndW1lbnRzPiYmIGFyZ3VtZW50cykKIHsKLSAgICBpZiAoYXV0 byogY29udGV4dCA9IGNhbnZhc1JlbmRlcmluZ0NvbnRleHQoc3RhdGUtPnZtKCksIGFyZ3VtZW50 cykpCi0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29uc29sZVN0YXJ0UmVjb3Jk aW5nQ2FudmFzKCpjb250ZXh0LCAqc3RhdGUsIG9iamVjdEFyZ3VtZW50QXQoYXJndW1lbnRzLCAx KSk7CisgICAgaWYgKGF1dG8qIHRhcmdldCA9IG9iamVjdEFyZ3VtZW50QXQoYXJndW1lbnRzLCAw KSkgeworICAgICAgICBpZiAoYXV0byogY29udGV4dCA9IGNhbnZhc1JlbmRlcmluZ0NvbnRleHQo c3RhdGUtPnZtKCksIHRhcmdldCkpCisgICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmNvbnNvbGVTdGFydFJlY29yZGluZ0NhbnZhcygqY29udGV4dCwgKnN0YXRlLCBvYmplY3RB cmd1bWVudEF0KGFyZ3VtZW50cywgMSkpOworICAgIH0KIH0KIAogdm9pZCBQYWdlQ29uc29sZUNs aWVudDo6cmVjb3JkRW5kKEpTQzo6RXhlY1N0YXRlKiBzdGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50 cz4mJiBhcmd1bWVudHMpCiB7Ci0gICAgaWYgKGF1dG8qIGNvbnRleHQgPSBjYW52YXNSZW5kZXJp bmdDb250ZXh0KHN0YXRlLT52bSgpLCBhcmd1bWVudHMpKQotICAgICAgICBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZEZpbmlzaFJlY29yZGluZ0NhbnZhc0ZyYW1lKCpjb250ZXh0LCB0cnVl KTsKKyAgICBpZiAoYXV0byogdGFyZ2V0ID0gb2JqZWN0QXJndW1lbnRBdChhcmd1bWVudHMsIDAp KSB7CisgICAgICAgIGlmIChhdXRvKiBjb250ZXh0ID0gY2FudmFzUmVuZGVyaW5nQ29udGV4dChz dGF0ZS0+dm0oKSwgdGFyZ2V0KSkKKyAgICAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkRmluaXNoUmVjb3JkaW5nQ2FudmFzRnJhbWUoKmNvbnRleHQsIHRydWUpOworICAgIH0K IH0KIAogdm9pZCBQYWdlQ29uc29sZUNsaWVudDo6c2NyZWVuc2hvdChKU0M6OkV4ZWNTdGF0ZSog c3RhdGUsIFJlZjxTY3JpcHRBcmd1bWVudHM+JiYgYXJndW1lbnRzKQpAQCAtMjg0LDYgKzI4NCwy OSBAQCB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpzY3JlZW5zaG90KEpTQzo6RXhlY1N0YXRlKiBz dGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50cz4mJgogICAgICAgICAgICAgICAgIGlmIChhdXRvIHNu YXBzaG90ID0gV2ViQ29yZTo6c25hcHNob3ROb2RlKG1fcGFnZS5tYWluRnJhbWUoKSwgKm5vZGUp KQogICAgICAgICAgICAgICAgICAgICBkYXRhVVJMID0gc25hcHNob3QtPnRvRGF0YVVSTCgiaW1h Z2UvcG5nIl9zLCBXVEY6Om51bGxvcHQsIFByZXNlcnZlUmVzb2x1dGlvbjo6WWVzKTsKICAgICAg ICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChhdXRvKiBjb250ZXh0ID0gY2FudmFzUmVuZGVy aW5nQ29udGV4dChzdGF0ZS0+dm0oKSwgcG9zc2libGVUYXJnZXQpKSB7CisgICAgICAgICAgICBh dXRvJiBjYW52YXMgPSBjb250ZXh0LT5jYW52YXNCYXNlKCk7CisgICAgICAgICAgICBpZiAoaXM8 SFRNTENhbnZhc0VsZW1lbnQ+KGNhbnZhcykpIHsKKyAgICAgICAgICAgICAgICB0YXJnZXQgPSBw b3NzaWJsZVRhcmdldDsKKyAgICAgICAgICAgICAgICBpZiAoVU5MSUtFTFkoSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpoYXNGcm9udGVuZHMoKSkpIHsKKyNpZiBFTkFCTEUoV0VCR0wpCisgICAg ICAgICAgICAgICAgICAgIGlmIChpczxXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlPihjb250ZXh0 KSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvd25jYXN0PFdlYkdMUmVuZGVyaW5nQ29udGV4 dEJhc2U+KGNvbnRleHQpLT5zZXRQcmV2ZW50QnVmZmVyQ2xlYXJGb3JJbnNwZWN0b3IodHJ1ZSk7 CisjZW5kaWYKKworICAgICAgICAgICAgICAgICAgICBhdXRvIHJlc3VsdCA9IGRvd25jYXN0PEhU TUxDYW52YXNFbGVtZW50PihjYW52YXMpLnRvRGF0YVVSTCgiaW1hZ2UvcG5nIl9zKTsKKworI2lm IEVOQUJMRShXRUJHTCkKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlzPFdlYkdMUmVuZGVyaW5n Q29udGV4dEJhc2U+KGNvbnRleHQpKQorICAgICAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8 V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZT4oY29udGV4dCktPnNldFByZXZlbnRCdWZmZXJDbGVh ckZvckluc3BlY3RvcihmYWxzZSk7CisjZW5kaWYKKworICAgICAgICAgICAgICAgICAgICBpZiAo IXJlc3VsdC5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFVUkwg PSByZXN1bHQucmVsZWFzZVJldHVyblZhbHVlKCkuc3RyaW5nOworICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5v cmcvYi8xODA4MzM+IFdlYiBJbnNwZWN0b3I6IHN1cHBvcnQgT2Zmc2NyZWVuQ2FudmFzIGZvciBD YW52YXMgcmVsYXRlZCBvcGVyYXRpb25zCiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzZjVm ZTk2OWZhYTI5ODYwNmZhZWQ5MjcwY2RmZTU5ZDlmOWYyNTNjLi4wMzgxZGI0N2Y3MWE1ZThhZTA3 NmM5M2I2NTU1YWYyMzMwOWQ2ZWI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDctMjQg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHN1cHBvcnQgYGNvbnNvbGUuc2NyZWVuc2hvdGAgd2l0aCBzdWJjbGFzc2VzIG9mIENhbnZh c1JlbmRlcmluZ0NvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5OTMwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1zY3JlZW5zaG90Lmh0bWw6Cisg ICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1zY3JlZW5zaG90LWV4cGVjdGVkLnR4 dDoKKwogMjAxOS0wNy0yNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogcHJpbnQgdGhlIHRhcmdldCBvZiBgY29uc29sZS5zY3JlZW5z aG90YCBsYXN0IHNvIHRoZSB0YXJnZXQgaXMgdGhlIGNsb3Nlc3QgaXRlbSB0byB0aGUgaW1hZ2UK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVu c2hvdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xl LXNjcmVlbnNob3QtZXhwZWN0ZWQudHh0CmluZGV4IDY1M2Y5MDNmYTg5NzkzY2JkMTk2YjVlYmEw ZTk4ZWI2OTk5YTE0M2UuLjBmYzAwZjBjNDFjOGI4OWMzNWE0Y2IzYTAzZTkzNzhlYzExNmY2YTEg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVu c2hvdC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29u c29sZS1zY3JlZW5zaG90LWV4cGVjdGVkLnR4dApAQCAtMSw2ICsxLDcgQEAKIENPTlNPTEUgTUVT U0FHRTogW29iamVjdCBIVE1MRGl2RWxlbWVudF0KIENPTlNPTEUgTUVTU0FHRTogW29iamVjdCBI VE1MRGl2RWxlbWVudF0KIENPTlNPTEUgTUVTU0FHRTogW29iamVjdCBIVE1MRGl2RWxlbWVudF0K K0NPTlNPTEUgTUVTU0FHRTogW29iamVjdCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRdCiBDT05T T0xFIE1FU1NBR0U6IFZpZXdwb3J0CiBDT05TT0xFIE1FU1NBR0U6IFZpZXdwb3J0CiBUZXN0cyBm b3IgdGhlIGNvbnNvbGUuc2NyZWVuc2hvdCBBUEkuCkBAIC0yMiw2ICsyMywxMiBAQCBQQVNTOiBU aGUgaW1hZ2UgaGVpZ2h0IHNob3VsZCBiZSAycHguCiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogY29u c29sZS5zY3JlZW5zaG90Lk5vZGUuRGV0YWNoZWROb25TY3JlZW5zaG90YWJsZQogUEFTUzogQ291 bGQgbm90IGNhcHR1cmUgc2NyZWVuc2hvdAogCistLSBSdW5uaW5nIHRlc3QgY2FzZTogY29uc29s ZS5zY3JlZW5zaG90LkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRAorUEFTUzogVGhlIGFkZGVkIG1l c3NhZ2Ugc2hvdWxkIGJlIGFuIGltYWdlLgorUEFTUzogVGhlIGltYWdlIHNob3VsZCBub3QgYmUg ZW1wdHkuCitQQVNTOiBUaGUgaW1hZ2Ugd2lkdGggc2hvdWxkIGJlIDJweC4KK1BBU1M6IFRoZSBp bWFnZSBoZWlnaHQgc2hvdWxkIGJlIDJweC4KKwogLS0gUnVubmluZyB0ZXN0IGNhc2U6IGNvbnNv bGUuc2NyZWVuc2hvdC5Ob25TY3JlZW5zaG90YWJsZVRhcmdldAogUEFTUzogVGhlIGFkZGVkIG1l c3NhZ2Ugc2hvdWxkIGJlIGFuIGltYWdlLgogUEFTUzogVGhlIGltYWdlIHNob3VsZCBub3QgYmUg ZW1wdHkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xl LXNjcmVlbnNob3QuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUt c2NyZWVuc2hvdC5odG1sCmluZGV4IDA0ZjZjNjY1MmRiZGIzMGNjZTkwOGI5NmQ0ZDg4OTg4NWU3 NTgzNDYuLmYzNDcxNGIwZmQ2MTZhNjBkMjgwMDA5ZTNjYTVkYmUwZTk3YjYzODAgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVuc2hvdC5odG1s CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVuc2hvdC5o dG1sCkBAIC0xMSw2ICsxMSwxMyBAQCBmdW5jdGlvbiBjcmVhdGVEZXRhY2hlZFRlc3QoKQogICAg IHJldHVybiBkaXY7CiB9CiAKK2Z1bmN0aW9uIGNyZWF0ZUNhbnZhczJEVGVzdCgpIHsKKyAgICBs ZXQgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAgY2FudmFz LndpZHRoID0gMjsKKyAgICBjYW52YXMuaGVpZ2h0ID0gMjsKKyAgICByZXR1cm4gY2FudmFzLmdl dENvbnRleHQoIjJkIik7Cit9CisKIGZ1bmN0aW9uIHRlc3QoKQogewogICAgIGxldCBzdWl0ZSA9 IEluc3BlY3RvclRlc3QuY3JlYXRlQXN5bmNTdWl0ZSgiY29uc29sZS5zY3JlZW5zaG90Iik7CkBA IC03NSw2ICs4MiwxOCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgc2hvdWxkRXJyb3I6IHRy dWUsCiAgICAgfSk7CiAKKyAgICBhZGRUZXN0KHsKKyAgICAgICAgbmFtZTogImNvbnNvbGUuc2Ny ZWVuc2hvdC5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQiLAorICAgICAgICBleHByZXNzaW9uOiBg Y29uc29sZS5zY3JlZW5zaG90KGNyZWF0ZUNhbnZhczJEVGVzdCgpKWAsCisgICAgICAgIGFzeW5j IGltYWdlTWVzc2FnZUFkZGVkQ2FsbGJhY2sobWVzc2FnZSkgeworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3ROb3RFcXVhbChtZXNzYWdlLm1lc3NhZ2VUZXh0LCAiZGF0YToiLCAiVGhl IGltYWdlIHNob3VsZCBub3QgYmUgZW1wdHkuIik7CisKKyAgICAgICAgICAgIGxldCBpbWcgPSBh d2FpdCBXSS5JbWFnZVV0aWxpdGllcy5wcm9taXNpZnlMb2FkKG1lc3NhZ2UubWVzc2FnZVRleHQp OworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChpbWcud2lkdGgsIDIsICJU aGUgaW1hZ2Ugd2lkdGggc2hvdWxkIGJlIDJweC4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRl c3QuZXhwZWN0RXF1YWwoaW1nLmhlaWdodCwgMiwgIlRoZSBpbWFnZSBoZWlnaHQgc2hvdWxkIGJl IDJweC4iKTsKKyAgICAgICAgfSwKKyAgICB9KTsKKwogICAgIGFkZFRlc3QoewogICAgICAgICBu YW1lOiAiY29uc29sZS5zY3JlZW5zaG90Lk5vblNjcmVlbnNob3RhYmxlVGFyZ2V0IiwKICAgICAg ICAgZXhwcmVzc2lvbjogYGNvbnNvbGUuc2NyZWVuc2hvdCg0MilgLAo= 374835 2019-07-24 16:46:50 -0700 2019-07-24 17:21:40 -0700 Patch bug-199305-20190724164649.patch text/plain 7965 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MzY0ZTA2ZmM5ZjA4NThmNTgxOGU2ZTQ5MjM3NDc1OTZlZmQyOWJkLi40 NWQyY2ZjZDk1NGI3YmRmZWExNzMyM2Q4ZDMyZmZiYzc3ZDMyNzI3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTktMDctMjQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN1cHBvcnQgYGNvbnNvbGUuc2NyZWVuc2hvdGAg d2l0aCBzdWJjbGFzc2VzIG9mIENhbnZhc1JlbmRlcmluZ0NvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTMwNQorCisgICAgICAgIFJldmll d2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvY29uc29s ZS9jb25zb2xlLXNjcmVlbnNob3QuaHRtbAorCisgICAgICAgICogcGFnZS9QYWdlQ29uc29sZUNs aWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjYW52YXNSZW5kZXJpbmdDb250ZXh0KToKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VDb25zb2xlQ2xpZW50OjpyZWNvcmQpOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZUNvbnNvbGVDbGllbnQ6OnJlY29yZEVuZCk6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlQ29uc29sZUNsaWVudDo6c2NyZWVuc2hvdCk6CisKIDIwMTktMDctMjQgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByaW50IHRo ZSB0YXJnZXQgb2YgYGNvbnNvbGUuc2NyZWVuc2hvdGAgbGFzdCBzbyB0aGUgdGFyZ2V0IGlzIHRo ZSBjbG9zZXN0IGl0ZW0gdG8gdGhlIGltYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNv bGVDbGllbnQuY3BwCmluZGV4IGUxOTcyZDk5MGQ1MWEyOTcxYjgyODcxNjA3YWU5MjIxZmNlYWFk Y2QuLjBkM2MyY2JiYzlhY2Y5OTQwNTJhMGRhZTg5MDI0NTUyNzU4YzRhYTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwCkBAIC0yMzMsMTIgKzIzMyw4IEBAIHN0 YXRpYyBKU0M6OkpTT2JqZWN0KiBvYmplY3RBcmd1bWVudEF0KFNjcmlwdEFyZ3VtZW50cyYgYXJn dW1lbnRzLCB1bnNpZ25lZCBpbmRlCiAgICAgcmV0dXJuIGFyZ3VtZW50cy5hcmd1bWVudENvdW50 KCkgPiBpbmRleCA/IGFyZ3VtZW50cy5hcmd1bWVudEF0KGluZGV4KS5nZXRPYmplY3QoKSA6IG51 bGxwdHI7CiB9CiAKLXN0YXRpYyBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjYW52YXNSZW5kZXJp bmdDb250ZXh0KEpTQzo6Vk0mIHZtLCBTY3JpcHRBcmd1bWVudHMmIGFyZ3VtZW50cykKK3N0YXRp YyBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiBjYW52YXNSZW5kZXJpbmdDb250ZXh0KEpTQzo6Vk0m IHZtLCBKU0M6OkpTVmFsdWUgdGFyZ2V0KQogewotICAgIGF1dG8qIHRhcmdldCA9IG9iamVjdEFy Z3VtZW50QXQoYXJndW1lbnRzLCAwKTsKLSAgICBpZiAoIXRhcmdldCkKLSAgICAgICAgcmV0dXJu IG51bGxwdHI7Ci0KICAgICBpZiAoYXV0byogY2FudmFzID0gSlNIVE1MQ2FudmFzRWxlbWVudDo6 dG9XcmFwcGVkKHZtLCB0YXJnZXQpKQogICAgICAgICByZXR1cm4gY2FudmFzLT5yZW5kZXJpbmdD b250ZXh0KCk7CiAgICAgaWYgKGF1dG8qIGNhbnZhcyA9IEpTT2Zmc2NyZWVuQ2FudmFzOjp0b1dy YXBwZWQodm0sIHRhcmdldCkpCkBAIC0yNjAsMTQgKzI1NiwxOCBAQCBzdGF0aWMgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dCogY2FudmFzUmVuZGVyaW5nQ29udGV4dChKU0M6OlZNJiB2bSwgU2NyaXB0 QXJndW1lbgogCiB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpyZWNvcmQoSlNDOjpFeGVjU3RhdGUq IHN0YXRlLCBSZWY8U2NyaXB0QXJndW1lbnRzPiYmIGFyZ3VtZW50cykKIHsKLSAgICBpZiAoYXV0 byogY29udGV4dCA9IGNhbnZhc1JlbmRlcmluZ0NvbnRleHQoc3RhdGUtPnZtKCksIGFyZ3VtZW50 cykpCi0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29uc29sZVN0YXJ0UmVjb3Jk aW5nQ2FudmFzKCpjb250ZXh0LCAqc3RhdGUsIG9iamVjdEFyZ3VtZW50QXQoYXJndW1lbnRzLCAx KSk7CisgICAgaWYgKGF1dG8qIHRhcmdldCA9IG9iamVjdEFyZ3VtZW50QXQoYXJndW1lbnRzLCAw KSkgeworICAgICAgICBpZiAoYXV0byogY29udGV4dCA9IGNhbnZhc1JlbmRlcmluZ0NvbnRleHQo c3RhdGUtPnZtKCksIHRhcmdldCkpCisgICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmNvbnNvbGVTdGFydFJlY29yZGluZ0NhbnZhcygqY29udGV4dCwgKnN0YXRlLCBvYmplY3RB cmd1bWVudEF0KGFyZ3VtZW50cywgMSkpOworICAgIH0KIH0KIAogdm9pZCBQYWdlQ29uc29sZUNs aWVudDo6cmVjb3JkRW5kKEpTQzo6RXhlY1N0YXRlKiBzdGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50 cz4mJiBhcmd1bWVudHMpCiB7Ci0gICAgaWYgKGF1dG8qIGNvbnRleHQgPSBjYW52YXNSZW5kZXJp bmdDb250ZXh0KHN0YXRlLT52bSgpLCBhcmd1bWVudHMpKQotICAgICAgICBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZEZpbmlzaFJlY29yZGluZ0NhbnZhc0ZyYW1lKCpjb250ZXh0LCB0cnVl KTsKKyAgICBpZiAoYXV0byogdGFyZ2V0ID0gb2JqZWN0QXJndW1lbnRBdChhcmd1bWVudHMsIDAp KSB7CisgICAgICAgIGlmIChhdXRvKiBjb250ZXh0ID0gY2FudmFzUmVuZGVyaW5nQ29udGV4dChz dGF0ZS0+dm0oKSwgdGFyZ2V0KSkKKyAgICAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkRmluaXNoUmVjb3JkaW5nQ2FudmFzRnJhbWUoKmNvbnRleHQsIHRydWUpOworICAgIH0K IH0KIAogdm9pZCBQYWdlQ29uc29sZUNsaWVudDo6c2NyZWVuc2hvdChKU0M6OkV4ZWNTdGF0ZSog c3RhdGUsIFJlZjxTY3JpcHRBcmd1bWVudHM+JiYgYXJndW1lbnRzKQpAQCAtMjg0LDYgKzI4NCwy OSBAQCB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjpzY3JlZW5zaG90KEpTQzo6RXhlY1N0YXRlKiBz dGF0ZSwgUmVmPFNjcmlwdEFyZ3VtZW50cz4mJgogICAgICAgICAgICAgICAgIGlmIChhdXRvIHNu YXBzaG90ID0gV2ViQ29yZTo6c25hcHNob3ROb2RlKG1fcGFnZS5tYWluRnJhbWUoKSwgKm5vZGUp KQogICAgICAgICAgICAgICAgICAgICBkYXRhVVJMID0gc25hcHNob3QtPnRvRGF0YVVSTCgiaW1h Z2UvcG5nIl9zLCBXVEY6Om51bGxvcHQsIFByZXNlcnZlUmVzb2x1dGlvbjo6WWVzKTsKICAgICAg ICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChhdXRvKiBjb250ZXh0ID0gY2FudmFzUmVuZGVy aW5nQ29udGV4dChzdGF0ZS0+dm0oKSwgcG9zc2libGVUYXJnZXQpKSB7CisgICAgICAgICAgICBh dXRvJiBjYW52YXMgPSBjb250ZXh0LT5jYW52YXNCYXNlKCk7CisgICAgICAgICAgICBpZiAoaXM8 SFRNTENhbnZhc0VsZW1lbnQ+KGNhbnZhcykpIHsKKyAgICAgICAgICAgICAgICB0YXJnZXQgPSBw b3NzaWJsZVRhcmdldDsKKyAgICAgICAgICAgICAgICBpZiAoVU5MSUtFTFkoSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpoYXNGcm9udGVuZHMoKSkpIHsKKyNpZiBFTkFCTEUoV0VCR0wpCisgICAg ICAgICAgICAgICAgICAgIGlmIChpczxXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlPihjb250ZXh0 KSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvd25jYXN0PFdlYkdMUmVuZGVyaW5nQ29udGV4 dEJhc2U+KGNvbnRleHQpLT5zZXRQcmV2ZW50QnVmZmVyQ2xlYXJGb3JJbnNwZWN0b3IodHJ1ZSk7 CisjZW5kaWYKKworICAgICAgICAgICAgICAgICAgICBhdXRvIHJlc3VsdCA9IGRvd25jYXN0PEhU TUxDYW52YXNFbGVtZW50PihjYW52YXMpLnRvRGF0YVVSTCgiaW1hZ2UvcG5nIl9zKTsKKworI2lm IEVOQUJMRShXRUJHTCkKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlzPFdlYkdMUmVuZGVyaW5n Q29udGV4dEJhc2U+KGNvbnRleHQpKQorICAgICAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8 V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZT4oY29udGV4dCktPnNldFByZXZlbnRCdWZmZXJDbGVh ckZvckluc3BlY3RvcihmYWxzZSk7CisjZW5kaWYKKworICAgICAgICAgICAgICAgICAgICBpZiAo IXJlc3VsdC5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFVUkwg PSByZXN1bHQucmVsZWFzZVJldHVyblZhbHVlKCkuc3RyaW5nOworICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5v cmcvYi8xODA4MzM+IFdlYiBJbnNwZWN0b3I6IHN1cHBvcnQgT2Zmc2NyZWVuQ2FudmFzIGZvciBD YW52YXMgcmVsYXRlZCBvcGVyYXRpb25zCiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzZjVm ZTk2OWZhYTI5ODYwNmZhZWQ5MjcwY2RmZTU5ZDlmOWYyNTNjLi4yYWFiYTZiYjc3NTE1NzRjOThh YTM0MzhlY2Y0MjRjZTE4NWRiM2ZjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDctMjQg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHN1cHBvcnQgYGNvbnNvbGUuc2NyZWVuc2hvdGAgd2l0aCBzdWJjbGFzc2VzIG9mIENhbnZh c1JlbmRlcmluZ0NvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5OTMwNQorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4K KworICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVuc2hvdC5odG1sOgor ICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtc2NyZWVuc2hvdC1leHBlY3RlZC50 eHQ6CisKIDIwMTktMDctMjQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IHByaW50IHRoZSB0YXJnZXQgb2YgYGNvbnNvbGUuc2NyZWVu c2hvdGAgbGFzdCBzbyB0aGUgdGFyZ2V0IGlzIHRoZSBjbG9zZXN0IGl0ZW0gdG8gdGhlIGltYWdl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXNjcmVl bnNob3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29s ZS1zY3JlZW5zaG90LWV4cGVjdGVkLnR4dAppbmRleCA2NTNmOTAzZmE4OTc5M2NiZDE5NmI1ZWJh MGU5OGViNjk5OWExNDNlLi4wZmMwMGYwYzQxYzhiODljMzVhNGNiM2EwM2U5Mzc4ZWMxMTZmNmEx IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXNjcmVl bnNob3QtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2Nv bnNvbGUtc2NyZWVuc2hvdC1leHBlY3RlZC50eHQKQEAgLTEsNiArMSw3IEBACiBDT05TT0xFIE1F U1NBR0U6IFtvYmplY3QgSFRNTERpdkVsZW1lbnRdCiBDT05TT0xFIE1FU1NBR0U6IFtvYmplY3Qg SFRNTERpdkVsZW1lbnRdCiBDT05TT0xFIE1FU1NBR0U6IFtvYmplY3QgSFRNTERpdkVsZW1lbnRd CitDT05TT0xFIE1FU1NBR0U6IFtvYmplY3QgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEXQogQ09O U09MRSBNRVNTQUdFOiBWaWV3cG9ydAogQ09OU09MRSBNRVNTQUdFOiBWaWV3cG9ydAogVGVzdHMg Zm9yIHRoZSBjb25zb2xlLnNjcmVlbnNob3QgQVBJLgpAQCAtMjIsNiArMjMsMTIgQEAgUEFTUzog VGhlIGltYWdlIGhlaWdodCBzaG91bGQgYmUgMnB4LgogLS0gUnVubmluZyB0ZXN0IGNhc2U6IGNv bnNvbGUuc2NyZWVuc2hvdC5Ob2RlLkRldGFjaGVkTm9uU2NyZWVuc2hvdGFibGUKIFBBU1M6IENv dWxkIG5vdCBjYXB0dXJlIHNjcmVlbnNob3QKIAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IGNvbnNv bGUuc2NyZWVuc2hvdC5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQKK1BBU1M6IFRoZSBhZGRlZCBt ZXNzYWdlIHNob3VsZCBiZSBhbiBpbWFnZS4KK1BBU1M6IFRoZSBpbWFnZSBzaG91bGQgbm90IGJl IGVtcHR5LgorUEFTUzogVGhlIGltYWdlIHdpZHRoIHNob3VsZCBiZSAycHguCitQQVNTOiBUaGUg aW1hZ2UgaGVpZ2h0IHNob3VsZCBiZSAycHguCisKIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBjb25z b2xlLnNjcmVlbnNob3QuTm9uU2NyZWVuc2hvdGFibGVUYXJnZXQKIFBBU1M6IFRoZSBhZGRlZCBt ZXNzYWdlIHNob3VsZCBiZSBhbiBpbWFnZS4KIFBBU1M6IFRoZSBpbWFnZSBzaG91bGQgbm90IGJl IGVtcHR5LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29s ZS1zY3JlZW5zaG90Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xl LXNjcmVlbnNob3QuaHRtbAppbmRleCAwNGY2YzY2NTJkYmRiMzBjY2U5MDhiOTZkNGQ4ODk4ODVl NzU4MzQ2Li5mMzQ3MTRiMGZkNjE2YTYwZDI4MDAwOWUzY2E1ZGJlMGU5N2I2MzgwIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXNjcmVlbnNob3QuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXNjcmVlbnNob3Qu aHRtbApAQCAtMTEsNiArMTEsMTMgQEAgZnVuY3Rpb24gY3JlYXRlRGV0YWNoZWRUZXN0KCkKICAg ICByZXR1cm4gZGl2OwogfQogCitmdW5jdGlvbiBjcmVhdGVDYW52YXMyRFRlc3QoKSB7CisgICAg bGV0IGNhbnZhcyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZhcyIpOworICAgIGNhbnZh cy53aWR0aCA9IDI7CisgICAgY2FudmFzLmhlaWdodCA9IDI7CisgICAgcmV0dXJuIGNhbnZhcy5n ZXRDb250ZXh0KCIyZCIpOworfQorCiBmdW5jdGlvbiB0ZXN0KCkKIHsKICAgICBsZXQgc3VpdGUg PSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFzeW5jU3VpdGUoImNvbnNvbGUuc2NyZWVuc2hvdCIpOwpA QCAtNzUsNiArODIsMTggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIHNob3VsZEVycm9yOiB0 cnVlLAogICAgIH0pOwogCisgICAgYWRkVGVzdCh7CisgICAgICAgIG5hbWU6ICJjb25zb2xlLnNj cmVlbnNob3QuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEIiwKKyAgICAgICAgZXhwcmVzc2lvbjog YGNvbnNvbGUuc2NyZWVuc2hvdChjcmVhdGVDYW52YXMyRFRlc3QoKSlgLAorICAgICAgICBhc3lu YyBpbWFnZU1lc3NhZ2VBZGRlZENhbGxiYWNrKG1lc3NhZ2UpIHsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0Tm90RXF1YWwobWVzc2FnZS5tZXNzYWdlVGV4dCwgImRhdGE6IiwgIlRo ZSBpbWFnZSBzaG91bGQgbm90IGJlIGVtcHR5LiIpOworCisgICAgICAgICAgICBsZXQgaW1nID0g YXdhaXQgV0kuSW1hZ2VVdGlsaXRpZXMucHJvbWlzaWZ5TG9hZChtZXNzYWdlLm1lc3NhZ2VUZXh0 KTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoaW1nLndpZHRoLCAyLCAi VGhlIGltYWdlIHdpZHRoIHNob3VsZCBiZSAycHguIik7CisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdEVxdWFsKGltZy5oZWlnaHQsIDIsICJUaGUgaW1hZ2UgaGVpZ2h0IHNob3VsZCBi ZSAycHguIik7CisgICAgICAgIH0sCisgICAgfSk7CisKICAgICBhZGRUZXN0KHsKICAgICAgICAg bmFtZTogImNvbnNvbGUuc2NyZWVuc2hvdC5Ob25TY3JlZW5zaG90YWJsZVRhcmdldCIsCiAgICAg ICAgIGV4cHJlc3Npb246IGBjb25zb2xlLnNjcmVlbnNob3QoNDIpYCwK