210083 2020-04-06 17:14:39 -0700 Web Inspector: `console.log(...)` appear as `CONSOLE LOG LOG` in the system console 2020-04-06 18:05:18 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi ews-watchlist hi inspector-bugzilla-changes keith_miller mark.lam mkwst msaboff saam timothy tzagallo webkit-bug-importer oldest_to_newest 1638387 0 hi 2020-04-06 17:14:39 -0700 Horray for redundancy :) 1638389 1 395636 hi 2020-04-06 17:23:42 -0700 Created attachment 395636 Patch 1638392 2 395637 hi 2020-04-06 17:28:34 -0700 Created attachment 395637 Patch Use better comments in the code. 1638403 3 ews-feeder 2020-04-06 18:04:10 -0700 Committed r259618: <https://trac.webkit.org/changeset/259618> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395637. 1638404 4 webkit-bug-importer 2020-04-06 18:05:18 -0700 <rdar://problem/61369403> 395636 2020-04-06 17:23:42 -0700 2020-04-06 17:28:32 -0700 Patch bug-210083-20200406182341.patch text/plain 5829 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDNjNTI5NTBmZGMzM2IyNTIxNWE4NGI0MDA3NTE4 OGVjMDdiY2U4ZTQuLjkzYjc1ZDQwMzRhZTMyOWQ2ZjNiMTIwMWM3ZWEwMmY5OGM1MzI4ZWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA0LTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBg Y29uc29sZS5sb2coLi4uKWAgYXBwZWFyIGFzIGBDT05TT0xFIExPRyBMT0dgIGluIHRoZSBzeXN0 ZW0gY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEwMDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBydW50aW1lL0NvbnNvbGVDbGllbnQuY3BwOgorICAgICAgICAoSlNDOjphcHBlbmRNZXNz YWdlUHJlZml4KToKKwogMjAyMC0wNC0wNCAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBn bWFpbC5jb20+CiAKICAgICAgICAgJ1x1JyBzaG91bGQgdGhyb3cgYW4gZWFybHkgU3ludGF4RXJy b3IgZXhjZXB0aW9uLCBidXQgaW5zdGVhZCBldmFsdWF0ZXMgdG8gJ3UnCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTg4MjkyYTkyZTgyNWZmNzQwNTIxODMwMzkzODJiMWMzZmQ2ZTkzNS4uMDYyNWQyYWU4YTdmOTRj MzllYzIyNGRmYzU3MWMzZmNjMzVmMTNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDIwLTA0LTA2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBgY29uc29sZS5sb2coLi4uKWAgYXBwZWFyIGFzIGBDT05TT0xFIExPRyBM T0dgIGluIHRoZSBzeXN0ZW0gY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2VDb25zb2xlQ2xpZW50OjphZGRNZXNzYWdlKToKKyAgICAgICAgVXNlIHRo ZSBhY3R1YWwgYE1lc3NhZ2VTb3VyY2VgIGFuZCBgTWVzc2FnZVR5cGVgIHdoZW4gcHJpbnRpbmcg Y29uc29sZSBtZXNzYWdlcy4KKwogMjAyMC0wNC0wNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFJlbW92ZSBMb2NrSGlzdG9yeSBwYXJhbWV0ZXIgZnJvbSBsb2FkV2l0 aE5hdmlnYXRpb25BY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0NvbnNvbGVDbGllbnQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29u c29sZUNsaWVudC5jcHAKaW5kZXggZjI4MDRiYTI4NWYzZWU5ZTg2Mzc3OTdkODllMzE1MTlmNjMw MDgwYy4uN2FhZDQ5ZWZlNmNhZTA1NTYyZmEwZjFiYzk3OGViZjQ4ZTI4MzY3NCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29uc29sZUNsaWVudC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29uc29sZUNsaWVudC5jcHAKQEAgLTcyLDcg KzcyLDcgQEAgc3RhdGljIHZvaWQgYXBwZW5kTWVzc2FnZVByZWZpeChTdHJpbmdCdWlsZGVyJiBi dWlsZGVyLCBNZXNzYWdlU291cmNlIHNvdXJjZSwgTWUKICAgICAgICAgc291cmNlU3RyaW5nID0g Ik5FVFdPUksiX3M7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVzc2FnZVNvdXJjZTo6Q29u c29sZUFQSToKLSAgICAgICAgc291cmNlU3RyaW5nID0gIkNPTlNPTEUiX3M7CisgICAgICAgIC8v IFVzZSB0aGUgIkNPTlNPTEUiIHRoYXQgaXMgYWxyZWFkeSBvdXRwdXQgYmVsb3cuCiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgTWVzc2FnZVNvdXJjZTo6U3RvcmFnZToKICAgICAgICAgc291cmNl U3RyaW5nID0gIlNUT1JBR0UiX3M7CkBAIC0xMTIsMjkgKzExMiwxMCBAQCBzdGF0aWMgdm9pZCBh cHBlbmRNZXNzYWdlUHJlZml4KFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIE1lc3NhZ2VTb3VyY2Ug c291cmNlLCBNZQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBTdHJpbmcgbGV2ZWxTdHJp bmc7Ci0gICAgc3dpdGNoIChsZXZlbCkgewotICAgIGNhc2UgTWVzc2FnZUxldmVsOjpEZWJ1ZzoK LSAgICAgICAgbGV2ZWxTdHJpbmcgPSAiREVCVUciX3M7Ci0gICAgICAgIGJyZWFrOwotICAgIGNh c2UgTWVzc2FnZUxldmVsOjpMb2c6Ci0gICAgICAgIGxldmVsU3RyaW5nID0gIkxPRyJfczsKLSAg ICAgICAgYnJlYWs7Ci0gICAgY2FzZSBNZXNzYWdlTGV2ZWw6OkluZm86Ci0gICAgICAgIGxldmVs U3RyaW5nID0gIklORk8iX3M7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgTWVzc2FnZUxldmVs OjpXYXJuaW5nOgotICAgICAgICBsZXZlbFN0cmluZyA9ICJXQVJOIl9zOwotICAgICAgICBicmVh azsKLSAgICBjYXNlIE1lc3NhZ2VMZXZlbDo6RXJyb3I6Ci0gICAgICAgIGxldmVsU3RyaW5nID0g IkVSUk9SIl9zOwotICAgICAgICBicmVhazsKLSAgICB9Ci0KICAgICBTdHJpbmcgdHlwZVN0cmlu ZzsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIE1lc3NhZ2VUeXBlOjpMb2c6Ci0gICAg ICAgIHR5cGVTdHJpbmcgPSAiTE9HIl9zOworICAgICAgICAvLyBVc2UgdGhlIGBsZXZlbGAgaW5z dGVhZC4KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNZXNzYWdlVHlwZTo6Q2xlYXI6CiAgICAg ICAgIHR5cGVTdHJpbmcgPSAiQ0xFQVIiX3M7CkBAIC0xNzcsMTEgKzE1OCwzNCBAQCBzdGF0aWMg dm9pZCBhcHBlbmRNZXNzYWdlUHJlZml4KFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIE1lc3NhZ2VT b3VyY2Ugc291cmNlLCBNZQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBidWlsZGVyLmFw cGVuZChzb3VyY2VTdHJpbmcpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCcgJyk7Ci0gICAgYnVpbGRl ci5hcHBlbmQobGV2ZWxTdHJpbmcpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCcgJyk7Ci0gICAgYnVp bGRlci5hcHBlbmQodHlwZVN0cmluZyk7CisgICAgU3RyaW5nIGxldmVsU3RyaW5nOworICAgIHN3 aXRjaCAobGV2ZWwpIHsKKyAgICBjYXNlIE1lc3NhZ2VMZXZlbDo6RGVidWc6CisgICAgICAgIGxl dmVsU3RyaW5nID0gIkRFQlVHIl9zOworICAgICAgICBicmVhazsKKyAgICBjYXNlIE1lc3NhZ2VM ZXZlbDo6TG9nOgorICAgICAgICAvLyBPbmx5IHNob3cgIkxPRyIgaWYgYm90aCB0aGUgdHlwZSBh bmQgbGV2ZWwgYXJlIExvZy4KKyAgICAgICAgaWYgKHR5cGUgPT0gTWVzc2FnZVR5cGU6OkxvZykK KyAgICAgICAgICAgIGxldmVsU3RyaW5nID0gIkxPRyJfczsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBNZXNzYWdlTGV2ZWw6OkluZm86CisgICAgICAgIGxldmVsU3RyaW5nID0gIklORk8iX3M7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWVzc2FnZUxldmVsOjpXYXJuaW5nOgorICAgICAg ICBsZXZlbFN0cmluZyA9ICJXQVJOIl9zOworICAgICAgICBicmVhazsKKyAgICBjYXNlIE1lc3Nh Z2VMZXZlbDo6RXJyb3I6CisgICAgICAgIGxldmVsU3RyaW5nID0gIkVSUk9SIl9zOworICAgICAg ICBicmVhazsKKyAgICB9CisKKyAgICBidWlsZGVyLmFwcGVuZCgiQ09OU09MRSIpOworICAgIGlm ICghc291cmNlU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoJyAnLCBz b3VyY2VTdHJpbmcpOworICAgIGlmICghdHlwZVN0cmluZy5pc0VtcHR5KCkpCisgICAgICAgIGJ1 aWxkZXIuYXBwZW5kKCcgJywgdHlwZVN0cmluZyk7CisgICAgaWYgKCFsZXZlbFN0cmluZy5pc0Vt cHR5KCkpCisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCcgJywgbGV2ZWxTdHJpbmcpOwogfQogCiB2 b2lkIENvbnNvbGVDbGllbnQ6OnByaW50Q29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSBzb3Vy Y2UsIE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgY29uc3QgU3RyaW5nJiBt ZXNzYWdlLCBjb25zdCBTdHJpbmcmIHVybCwgdW5zaWduZWQgbGluZU51bWJlciwgdW5zaWduZWQg Y29sdW1uTnVtYmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29s ZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcApp bmRleCBlNjBjZGUxNGQxYTdjNmMzMDQyODkwNzUwN2M2MTBiZTU1ZGUxYTIyLi4yNmU2MjVmNzYw ZWNhMmU3OGMyMWMzOWFmM2E1ODIwZTBjZTI2ZTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2VDb25zb2xlQ2xpZW50LmNwcApAQCAtMTMxLDkgKzEzMSw5IEBAIHZvaWQgUGFnZUNvbnNvbGVD bGllbnQ6OmFkZE1lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPEluc3BlY3Rvcjo6Q29uc29sZU1lc3Nh Z2U+JiYKICAgICAgICAgaWYgKFVOTElLRUxZKG1fcGFnZS5zZXR0aW5ncygpLmxvZ3NQYWdlTWVz c2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKCkgfHwgc2hvdWxkUHJpbnRFeGNlcHRpb25zKCkp KSB7CiAgICAgICAgICAgICBpZiAoY29uc29sZU1lc3NhZ2UtPnR5cGUoKSA9PSBNZXNzYWdlVHlw ZTo6SW1hZ2UpIHsKICAgICAgICAgICAgICAgICBBU1NFUlQoY29uc29sZU1lc3NhZ2UtPmFyZ3Vt ZW50cygpKTsKLSAgICAgICAgICAgICAgICBDb25zb2xlQ2xpZW50OjpwcmludENvbnNvbGVNZXNz YWdlV2l0aEFyZ3VtZW50cyhNZXNzYWdlU291cmNlOjpDb25zb2xlQVBJLCBNZXNzYWdlVHlwZTo6 TG9nLCBjb25zb2xlTWVzc2FnZS0+bGV2ZWwoKSwgY29uc29sZU1lc3NhZ2UtPmFyZ3VtZW50cygp LT5nbG9iYWxPYmplY3QoKSwgKmNvbnNvbGVNZXNzYWdlLT5hcmd1bWVudHMoKSk7CisgICAgICAg ICAgICAgICAgQ29uc29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZVdpdGhBcmd1bWVudHMo Y29uc29sZU1lc3NhZ2UtPnNvdXJjZSgpLCBjb25zb2xlTWVzc2FnZS0+dHlwZSgpLCBjb25zb2xl TWVzc2FnZS0+bGV2ZWwoKSwgY29uc29sZU1lc3NhZ2UtPmFyZ3VtZW50cygpLT5nbG9iYWxPYmpl Y3QoKSwgKmNvbnNvbGVNZXNzYWdlLT5hcmd1bWVudHMoKSk7CiAgICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICBDb25zb2xlQ2xpZW50OjpwcmludENvbnNvbGVNZXNzYWdlKE1lc3Nh Z2VTb3VyY2U6OkNvbnNvbGVBUEksIE1lc3NhZ2VUeXBlOjpMb2csIGNvbnNvbGVNZXNzYWdlLT5s ZXZlbCgpLCBjb25zb2xlTWVzc2FnZS0+bWVzc2FnZSgpLCBjb25zb2xlTWVzc2FnZS0+dXJsKCks IGNvbnNvbGVNZXNzYWdlLT5saW5lKCksIGNvbnNvbGVNZXNzYWdlLT5jb2x1bW4oKSk7CisgICAg ICAgICAgICAgICAgQ29uc29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZShjb25zb2xlTWVz c2FnZS0+c291cmNlKCksIGNvbnNvbGVNZXNzYWdlLT50eXBlKCksIGNvbnNvbGVNZXNzYWdlLT5s ZXZlbCgpLCBjb25zb2xlTWVzc2FnZS0+bWVzc2FnZSgpLCBjb25zb2xlTWVzc2FnZS0+dXJsKCks IGNvbnNvbGVNZXNzYWdlLT5saW5lKCksIGNvbnNvbGVNZXNzYWdlLT5jb2x1bW4oKSk7CiAgICAg ICAgIH0KICAgICB9CiAK 395637 2020-04-06 17:28:34 -0700 2020-04-06 18:04:11 -0700 Patch bug-210083-20200406182833.patch text/plain 6151 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDNjNTI5NTBmZGMzM2IyNTIxNWE4NGI0MDA3NTE4 OGVjMDdiY2U4ZTQuLjkzYjc1ZDQwMzRhZTMyOWQ2ZjNiMTIwMWM3ZWEwMmY5OGM1MzI4ZWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA0LTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBg Y29uc29sZS5sb2coLi4uKWAgYXBwZWFyIGFzIGBDT05TT0xFIExPRyBMT0dgIGluIHRoZSBzeXN0 ZW0gY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEwMDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBydW50aW1lL0NvbnNvbGVDbGllbnQuY3BwOgorICAgICAgICAoSlNDOjphcHBlbmRNZXNz YWdlUHJlZml4KToKKwogMjAyMC0wNC0wNCAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBn bWFpbC5jb20+CiAKICAgICAgICAgJ1x1JyBzaG91bGQgdGhyb3cgYW4gZWFybHkgU3ludGF4RXJy b3IgZXhjZXB0aW9uLCBidXQgaW5zdGVhZCBldmFsdWF0ZXMgdG8gJ3UnCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTg4MjkyYTkyZTgyNWZmNzQwNTIxODMwMzkzODJiMWMzZmQ2ZTkzNS4uMDYyNWQyYWU4YTdmOTRj MzllYzIyNGRmYzU3MWMzZmNjMzVmMTNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDIwLTA0LTA2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBgY29uc29sZS5sb2coLi4uKWAgYXBwZWFyIGFzIGBDT05TT0xFIExPRyBM T0dgIGluIHRoZSBzeXN0ZW0gY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2VDb25zb2xlQ2xpZW50OjphZGRNZXNzYWdlKToKKyAgICAgICAgVXNlIHRo ZSBhY3R1YWwgYE1lc3NhZ2VTb3VyY2VgIGFuZCBgTWVzc2FnZVR5cGVgIHdoZW4gcHJpbnRpbmcg Y29uc29sZSBtZXNzYWdlcy4KKwogMjAyMC0wNC0wNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFJlbW92ZSBMb2NrSGlzdG9yeSBwYXJhbWV0ZXIgZnJvbSBsb2FkV2l0 aE5hdmlnYXRpb25BY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0NvbnNvbGVDbGllbnQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29u c29sZUNsaWVudC5jcHAKaW5kZXggZjI4MDRiYTI4NWYzZWU5ZTg2Mzc3OTdkODllMzE1MTlmNjMw MDgwYy4uNWY4OTBkODExNzg5NjhlOTI1YmViNDgxMjM2MTM5OGI3N2I1YmU5NyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29uc29sZUNsaWVudC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29uc29sZUNsaWVudC5jcHAKQEAgLTYyLDYg KzYyLDkgQEAgc3RhdGljIHZvaWQgYXBwZW5kTWVzc2FnZVByZWZpeChTdHJpbmdCdWlsZGVyJiBi dWlsZGVyLCBNZXNzYWdlU291cmNlIHNvdXJjZSwgTWUKIHsKICAgICBTdHJpbmcgc291cmNlU3Ry aW5nOwogICAgIHN3aXRjaCAoc291cmNlKSB7CisgICAgY2FzZSBNZXNzYWdlU291cmNlOjpDb25z b2xlQVBJOgorICAgICAgICAvLyBEZWZhdWx0LCBubyBuZWVkIHRvIGJlIG1vcmUgc3BlY2lmaWMu CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVzc2FnZVNvdXJjZTo6WE1MOgogICAgICAgICBz b3VyY2VTdHJpbmcgPSAiWE1MIl9zOwogICAgICAgICBicmVhazsKQEAgLTcxLDkgKzc0LDYgQEAg c3RhdGljIHZvaWQgYXBwZW5kTWVzc2FnZVByZWZpeChTdHJpbmdCdWlsZGVyJiBidWlsZGVyLCBN ZXNzYWdlU291cmNlIHNvdXJjZSwgTWUKICAgICBjYXNlIE1lc3NhZ2VTb3VyY2U6Ok5ldHdvcms6 CiAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJORVRXT1JLIl9zOwogICAgICAgICBicmVhazsKLSAg ICBjYXNlIE1lc3NhZ2VTb3VyY2U6OkNvbnNvbGVBUEk6Ci0gICAgICAgIHNvdXJjZVN0cmluZyA9 ICJDT05TT0xFIl9zOwotICAgICAgICBicmVhazsKICAgICBjYXNlIE1lc3NhZ2VTb3VyY2U6OlN0 b3JhZ2U6CiAgICAgICAgIHNvdXJjZVN0cmluZyA9ICJTVE9SQUdFIl9zOwogICAgICAgICBicmVh azsKQEAgLTExMiwyOSArMTEyLDEwIEBAIHN0YXRpYyB2b2lkIGFwcGVuZE1lc3NhZ2VQcmVmaXgo U3RyaW5nQnVpbGRlciYgYnVpbGRlciwgTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lCiAgICAgICAg IGJyZWFrOwogICAgIH0KIAotICAgIFN0cmluZyBsZXZlbFN0cmluZzsKLSAgICBzd2l0Y2ggKGxl dmVsKSB7Ci0gICAgY2FzZSBNZXNzYWdlTGV2ZWw6OkRlYnVnOgotICAgICAgICBsZXZlbFN0cmlu ZyA9ICJERUJVRyJfczsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBNZXNzYWdlTGV2ZWw6Okxv ZzoKLSAgICAgICAgbGV2ZWxTdHJpbmcgPSAiTE9HIl9zOwotICAgICAgICBicmVhazsKLSAgICBj YXNlIE1lc3NhZ2VMZXZlbDo6SW5mbzoKLSAgICAgICAgbGV2ZWxTdHJpbmcgPSAiSU5GTyJfczsK LSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBNZXNzYWdlTGV2ZWw6Oldhcm5pbmc6Ci0gICAgICAg IGxldmVsU3RyaW5nID0gIldBUk4iX3M7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgTWVzc2Fn ZUxldmVsOjpFcnJvcjoKLSAgICAgICAgbGV2ZWxTdHJpbmcgPSAiRVJST1IiX3M7Ci0gICAgICAg IGJyZWFrOwotICAgIH0KLQogICAgIFN0cmluZyB0eXBlU3RyaW5nOwogICAgIHN3aXRjaCAodHlw ZSkgewogICAgIGNhc2UgTWVzc2FnZVR5cGU6OkxvZzoKLSAgICAgICAgdHlwZVN0cmluZyA9ICJM T0ciX3M7CisgICAgICAgIC8vIERlZmF1bHQsIG5vIG5lZWQgdG8gYmUgbW9yZSBzcGVjaWZpYy4K ICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNZXNzYWdlVHlwZTo6Q2xlYXI6CiAgICAgICAgIHR5 cGVTdHJpbmcgPSAiQ0xFQVIiX3M7CkBAIC0xNzcsMTEgKzE1OCwzNCBAQCBzdGF0aWMgdm9pZCBh cHBlbmRNZXNzYWdlUHJlZml4KFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIE1lc3NhZ2VTb3VyY2Ug c291cmNlLCBNZQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBidWlsZGVyLmFwcGVuZChz b3VyY2VTdHJpbmcpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCcgJyk7Ci0gICAgYnVpbGRlci5hcHBl bmQobGV2ZWxTdHJpbmcpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCcgJyk7Ci0gICAgYnVpbGRlci5h cHBlbmQodHlwZVN0cmluZyk7CisgICAgU3RyaW5nIGxldmVsU3RyaW5nOworICAgIHN3aXRjaCAo bGV2ZWwpIHsKKyAgICBjYXNlIE1lc3NhZ2VMZXZlbDo6TG9nOgorICAgICAgICAvLyBEZWZhdWx0 LCBubyBuZWVkIHRvIGJlIG1vcmUgc3BlY2lmaWMuCisgICAgICAgIGlmICh0eXBlID09IE1lc3Nh Z2VUeXBlOjpMb2cpCisgICAgICAgICAgICBsZXZlbFN0cmluZyA9ICJMT0ciX3M7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgTWVzc2FnZUxldmVsOjpEZWJ1ZzoKKyAgICAgICAgbGV2ZWxTdHJp bmcgPSAiREVCVUciX3M7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWVzc2FnZUxldmVsOjpJ bmZvOgorICAgICAgICBsZXZlbFN0cmluZyA9ICJJTkZPIl9zOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIE1lc3NhZ2VMZXZlbDo6V2FybmluZzoKKyAgICAgICAgbGV2ZWxTdHJpbmcgPSAiV0FS TiJfczsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBNZXNzYWdlTGV2ZWw6OkVycm9yOgorICAg ICAgICBsZXZlbFN0cmluZyA9ICJFUlJPUiJfczsKKyAgICAgICAgYnJlYWs7CisgICAgfQorCisg ICAgYnVpbGRlci5hcHBlbmQoIkNPTlNPTEUiKTsKKyAgICBpZiAoIXNvdXJjZVN0cmluZy5pc0Vt cHR5KCkpCisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCcgJywgc291cmNlU3RyaW5nKTsKKyAgICBp ZiAoIXR5cGVTdHJpbmcuaXNFbXB0eSgpKQorICAgICAgICBidWlsZGVyLmFwcGVuZCgnICcsIHR5 cGVTdHJpbmcpOworICAgIGlmICghbGV2ZWxTdHJpbmcuaXNFbXB0eSgpKQorICAgICAgICBidWls ZGVyLmFwcGVuZCgnICcsIGxldmVsU3RyaW5nKTsKIH0KIAogdm9pZCBDb25zb2xlQ2xpZW50Ojpw cmludENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlVHlwZSB0eXBl LCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5n JiB1cmwsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIHVuc2lnbmVkIGNvbHVtbk51bWJlcikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbnNvbGVDbGllbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAKaW5kZXggZTYwY2RlMTRkMWE3YzZj MzA0Mjg5MDc1MDdjNjEwYmU1NWRlMWEyMi4uMjZlNjI1Zjc2MGVjYTJlNzhjMjFjMzlhZjNhNTgy MGUwY2UyNmU1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNs aWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAK QEAgLTEzMSw5ICsxMzEsOSBAQCB2b2lkIFBhZ2VDb25zb2xlQ2xpZW50OjphZGRNZXNzYWdlKHN0 ZDo6dW5pcXVlX3B0cjxJbnNwZWN0b3I6OkNvbnNvbGVNZXNzYWdlPiYmCiAgICAgICAgIGlmIChV TkxJS0VMWShtX3BhZ2Uuc2V0dGluZ3MoKS5sb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xl RW5hYmxlZCgpIHx8IHNob3VsZFByaW50RXhjZXB0aW9ucygpKSkgewogICAgICAgICAgICAgaWYg KGNvbnNvbGVNZXNzYWdlLT50eXBlKCkgPT0gTWVzc2FnZVR5cGU6OkltYWdlKSB7CiAgICAgICAg ICAgICAgICAgQVNTRVJUKGNvbnNvbGVNZXNzYWdlLT5hcmd1bWVudHMoKSk7Ci0gICAgICAgICAg ICAgICAgQ29uc29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZVdpdGhBcmd1bWVudHMoTWVz c2FnZVNvdXJjZTo6Q29uc29sZUFQSSwgTWVzc2FnZVR5cGU6OkxvZywgY29uc29sZU1lc3NhZ2Ut PmxldmVsKCksIGNvbnNvbGVNZXNzYWdlLT5hcmd1bWVudHMoKS0+Z2xvYmFsT2JqZWN0KCksICpj b25zb2xlTWVzc2FnZS0+YXJndW1lbnRzKCkpOworICAgICAgICAgICAgICAgIENvbnNvbGVDbGll bnQ6OnByaW50Q29uc29sZU1lc3NhZ2VXaXRoQXJndW1lbnRzKGNvbnNvbGVNZXNzYWdlLT5zb3Vy Y2UoKSwgY29uc29sZU1lc3NhZ2UtPnR5cGUoKSwgY29uc29sZU1lc3NhZ2UtPmxldmVsKCksIGNv bnNvbGVNZXNzYWdlLT5hcmd1bWVudHMoKS0+Z2xvYmFsT2JqZWN0KCksICpjb25zb2xlTWVzc2Fn ZS0+YXJndW1lbnRzKCkpOwogICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgQ29u c29sZUNsaWVudDo6cHJpbnRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpDb25zb2xlQVBJ LCBNZXNzYWdlVHlwZTo6TG9nLCBjb25zb2xlTWVzc2FnZS0+bGV2ZWwoKSwgY29uc29sZU1lc3Nh Z2UtPm1lc3NhZ2UoKSwgY29uc29sZU1lc3NhZ2UtPnVybCgpLCBjb25zb2xlTWVzc2FnZS0+bGlu ZSgpLCBjb25zb2xlTWVzc2FnZS0+Y29sdW1uKCkpOworICAgICAgICAgICAgICAgIENvbnNvbGVD bGllbnQ6OnByaW50Q29uc29sZU1lc3NhZ2UoY29uc29sZU1lc3NhZ2UtPnNvdXJjZSgpLCBjb25z b2xlTWVzc2FnZS0+dHlwZSgpLCBjb25zb2xlTWVzc2FnZS0+bGV2ZWwoKSwgY29uc29sZU1lc3Nh Z2UtPm1lc3NhZ2UoKSwgY29uc29sZU1lc3NhZ2UtPnVybCgpLCBjb25zb2xlTWVzc2FnZS0+bGlu ZSgpLCBjb25zb2xlTWVzc2FnZS0+Y29sdW1uKCkpOwogICAgICAgICB9CiAgICAgfQogCg==