171455 2017-04-28 15:29:31 -0700 Diagnostic logging of navigations is too verbose 2017-04-28 20:55:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez barraclough buildbot commit-queue dbates ggaren japhet kling webkit-bug-importer oldest_to_newest 1302825 0 cdumez 2017-04-28 15:29:31 -0700 Diagnostic logging of navigation is too verbose. We log things that are not actually user navigations (e.g. speculative loads, bookmark icon fetches, ...). 1302826 1 cdumez 2017-04-28 15:30:04 -0700 <rdar://problem/31543815> 1302849 2 308607 cdumez 2017-04-28 16:03:39 -0700 Created attachment 308607 Patch 1302851 3 308608 cdumez 2017-04-28 16:07:15 -0700 Created attachment 308608 Patch 1302971 4 308608 kling 2017-04-28 20:26:28 -0700 Comment on attachment 308608 Patch r=me. Nice approach for speculative loads that eventually become visible! 1302973 5 308608 commit-queue 2017-04-28 20:55:39 -0700 Comment on attachment 308608 Patch Clearing flags on attachment: 308608 Committed r215969: <http://trac.webkit.org/changeset/215969> 1302974 6 commit-queue 2017-04-28 20:55:41 -0700 All reviewed patches have been landed. Closing bug. 308607 2017-04-28 16:03:39 -0700 2017-04-28 16:07:14 -0700 Patch bug-171455-20170428160339.patch text/plain 9121 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1OTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTlhZmQ4ZjVlZWY0MTEx NWU4ZjhlOWMzNDc4YjQ1NDlhZDUyZjVlYy4uN2E4NGJlYzFiMmYwYjRlMmNkMDZkMjI4ZGI4ZDRj ZTAxNzgwMWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE3LTA0LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRGlhZ25vc3RpYyBsb2dnaW5n IG9mIG5hdmlnYXRpb24gaXMgdG9vIHZlcmJvc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTQ1NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzE1 NDM4MTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RGlhZ25vc3RpYyBsb2dnaW5nIG9mIG5hdmlnYXRpb24gaXMgdG9vIHZlcmJvc2UuIFdlIGxvZyB0 aGluZ3MgdGhhdCBhcmUgbm90IGFjdHVhbGx5IHVzZXIKKyAgICAgICAgbmF2aWdhdGlvbnMgKGUu Zy4gc3BlY3VsYXRpdmUgbG9hZHMsIGJvb2ttYXJrIGljb24gZmV0Y2hlcywgLi4uKS4gVG8gYWRk cmVzcyB0aGUgaXNzdWUsCisgICAgICAgIHdlIG5vdyBvbmx5IGxvZyAqb2JzZXJ2YWJsZSogbG9h ZHMuIFdlIGRvIHNvIGJ5IG9ubHkgbG9nZ2luZyBpZiB0aGUgcGFnZSBpcyB2aXNpYmxlIG9yCisg ICAgICAgIGlmIGl0IGJlY29tZXMgdmlzaWJsZS4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFdpdGhEb2N1bWVu dExvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpsb2dOYXZpZ2F0aW9uKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2V0SXNWaXNp YmxlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6bG9nTmF2aWdhdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpQYWdlOjptYWluRnJhbWVMb2FkU3RhcnRlZCk6CisgICAgICAgICog cGFnZS9QYWdlLmg6CisKKzIwMTctMDQtMjggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KKwogICAgICAgICBSYW5nZS5nZXRDbGllbnRSZWN0cygpIC8gZ2V0Qm91bmRpbmdDbGllbnRS ZWN0KCkgc2hvdWxkIHJldHVybiBET01SZWN0IHR5cGVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEzOTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKaW5kZXggMDk0MjRkZDRiZDdjNWJjZGJjOTYxYjQ3NmZhMGUwZDMyN2E2OWQ1 OS4uODg3NGEyYzQ4ZTQ1MjhkMWQ1NGM1ZjZkZmQ0YzY4OGZkNDA2ZTIwZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC05NSw3ICs5NSw2IEBACiAjaW5jbHVkZSAiUGx1 Z2luRG9jdW1lbnQuaCIKICNpbmNsdWRlICJQb2xpY3lDaGVja2VyLmgiCiAjaW5jbHVkZSAiUHJv Z3Jlc3NUcmFja2VyLmgiCi0jaW5jbHVkZSAiUHVibGljU3VmZml4LmgiCiAjaW5jbHVkZSAiUmVz b3VyY2VIYW5kbGUuaCIKICNpbmNsdWRlICJSZXNvdXJjZUxvYWRJbmZvLmgiCiAjaW5jbHVkZSAi UmVzb3VyY2VMb2FkT2JzZXJ2ZXIuaCIKQEAgLTEzOTgsNTAgKzEzOTcsNiBAQCB2b2lkIEZyYW1l TG9hZGVyOjpsb2FkKERvY3VtZW50TG9hZGVyKiBuZXdEb2N1bWVudExvYWRlcikKICAgICBsb2Fk V2l0aERvY3VtZW50TG9hZGVyKG5ld0RvY3VtZW50TG9hZGVyLCB0eXBlLCAwLCBBbGxvd05hdmln YXRpb25Ub0ludmFsaWRVUkw6Olllcyk7CiB9CiAKLXN0YXRpYyB2b2lkIGxvZ05hdmlnYXRpb24o TWFpbkZyYW1lJiBmcmFtZSwgY29uc3QgVVJMJiBkZXN0aW5hdGlvblVSTCwgRnJhbWVMb2FkVHlw ZSB0eXBlKQotewotICAgIGlmICghZnJhbWUucGFnZSgpKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBTdHJpbmcgbmF2aWdhdGlvbkRlc2NyaXB0aW9uOwotICAgIHN3aXRjaCAodHlwZSkgewotICAg IGNhc2UgRnJhbWVMb2FkVHlwZTo6U3RhbmRhcmQ6Ci0gICAgICAgIG5hdmlnYXRpb25EZXNjcmlw dGlvbiA9IEFTQ0lJTGl0ZXJhbCgic3RhbmRhcmQiKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2Fz ZSBGcmFtZUxvYWRUeXBlOjpCYWNrOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBB U0NJSUxpdGVyYWwoImJhY2siKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGcmFtZUxvYWRU eXBlOjpGb3J3YXJkOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBBU0NJSUxpdGVy YWwoImZvcndhcmQiKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpJ bmRleGVkQmFja0ZvcndhcmQ6Ci0gICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJ TGl0ZXJhbCgiaW5kZXhlZEJhY2tGb3J3YXJkIik7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2Ug RnJhbWVMb2FkVHlwZTo6UmVsb2FkOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBB U0NJSUxpdGVyYWwoInJlbG9hZCIpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZyYW1lTG9h ZFR5cGU6OlNhbWU6Ci0gICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJTGl0ZXJh bCgic2FtZSIpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlJlbG9h ZEZyb21PcmlnaW46Ci0gICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJTGl0ZXJh bCgicmVsb2FkRnJvbU9yaWdpbiIpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZyYW1lTG9h ZFR5cGU6OlJlbG9hZEV4cGlyZWRPbmx5OgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24g PSBBU0NJSUxpdGVyYWwoInJlbG9hZFJldmFsaWRhdGluZ0V4cGlyZWQiKTsKLSAgICAgICAgYnJl YWs7Ci0gICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpSZXBsYWNlOgotICAgIGNhc2UgRnJhbWVMb2Fk VHlwZTo6UmVkaXJlY3RXaXRoTG9ja2VkQmFja0ZvcndhcmRMaXN0OgotICAgICAgICAvLyBOb3Qg bG9nZ2luZyB0aG9zZSBmb3Igbm93LgotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIGZyYW1l LnBhZ2UoKS0+ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZShE aWFnbm9zdGljTG9nZ2luZ0tleXM6Om5hdmlnYXRpb25LZXkoKSwgbmF2aWdhdGlvbkRlc2NyaXB0 aW9uLCBTaG91bGRTYW1wbGU6Ok5vKTsKLSNpZiBFTkFCTEUoUFVCTElDX1NVRkZJWF9MSVNUKQot ICAgIFN0cmluZyBkb21haW4gPSB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluKGRlc3RpbmF0 aW9uVVJMLmhvc3QoKSk7Ci0gICAgaWYgKCFkb21haW4uaXNFbXB0eSgpKQotICAgICAgICBmcmFt ZS5wYWdlKCktPmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2VX aXRoRW5oYW5jZWRQcml2YWN5KERpYWdub3N0aWNMb2dnaW5nS2V5czo6ZG9tYWluVmlzaXRlZEtl eSgpLCBkb21haW4sIFNob3VsZFNhbXBsZTo6Tm8pOwotI2VuZGlmCi19Ci0KIHZvaWQgRnJhbWVM b2FkZXI6OmxvYWRXaXRoRG9jdW1lbnRMb2FkZXIoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgRnJh bWVMb2FkVHlwZSB0eXBlLCBGb3JtU3RhdGUqIGZvcm1TdGF0ZSwgQWxsb3dOYXZpZ2F0aW9uVG9J bnZhbGlkVVJMIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCkKIHsKICAgICAvLyBSZXRhaW4g YmVjYXVzZSBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudCBtYXkgcmVsZWFzZSB0aGUgbGFzdCByZWZl cmVuY2UgdG8gaXQuCkBAIC0xNDY0LDcgKzE0MTksOCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2Fk V2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIEZyYW1lTG9hZFR5cGUg dAogCiAgICAgLy8gTG9nIG1haW4gZnJhbWUgbmF2aWdhdGlvbiB0eXBlcy4KICAgICBpZiAobV9m cmFtZS5pc01haW5GcmFtZSgpKSB7Ci0gICAgICAgIGxvZ05hdmlnYXRpb24oc3RhdGljX2Nhc3Q8 TWFpbkZyYW1lJj4obV9mcmFtZSksIG5ld1VSTCwgdHlwZSk7CisgICAgICAgIGlmIChhdXRvKiBw YWdlID0gbV9mcmFtZS5wYWdlKCkpCisgICAgICAgICAgICBwYWdlLT5tYWluRnJhbWVMb2FkU3Rh cnRlZChuZXdVUkwsIHR5cGUpOwogICAgICAgICBzdGF0aWNfY2FzdDxNYWluRnJhbWUmPihtX2Zy YW1lKS5wZXJmb3JtYW5jZUxvZ2dpbmcoKS5kaWRSZWFjaFBvaW50T2ZJbnRlcmVzdChQZXJmb3Jt YW5jZUxvZ2dpbmc6Ok1haW5GcmFtZUxvYWRTdGFydGVkKTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCmluZGV4IDdkZDU4ODAyNGJkODdkOTdiNjY0ZDg3OTliZjgyM2FlNjM1NTVkMjcuLjQ0ZDJj NjhhNjVhMWNmNGE2MTMxNzFlYTliNTBiYTkyZWVhMzJjODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApA QCAtNzcsNiArNzcsNyBAQAogI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgiCiAjaW5jbHVkZSAi UG9pbnRlckxvY2tDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCisj aW5jbHVkZSAiUHVibGljU3VmZml4LmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCkBA IC0xNjcwLDYgKzE2NzEsMTEgQEAgdm9pZCBQYWdlOjpzZXRJc1Zpc2libGVJbnRlcm5hbChib29s IGlzVmlzaWJsZSkKICAgICAgICAgc2V0U1ZHQW5pbWF0aW9uc1N0YXRlKCp0aGlzLCBTVkdBbmlt YXRpb25zU3RhdGU6OlJlc3VtZWQpOwogCiAgICAgICAgIHJlc3VtZUFuaW1hdGluZ0ltYWdlcygp OworCisgICAgICAgIGlmIChtX25hdmlnYXRpb25Ub0xvZ1doZW5WaXNpYmxlKSB7CisgICAgICAg ICAgICBsb2dOYXZpZ2F0aW9uKG1fbmF2aWdhdGlvblRvTG9nV2hlblZpc2libGUudmFsdWUoKSk7 CisgICAgICAgICAgICBtX25hdmlnYXRpb25Ub0xvZ1doZW5WaXNpYmxlID0gc3RkOjpudWxsb3B0 OworICAgICAgICB9CiAgICAgfQogCiAgICAgVmVjdG9yPFJlZjxEb2N1bWVudD4+IGRvY3VtZW50 czsKQEAgLTIwNTQsNiArMjA2MCw2NCBAQCBib29sIFBhZ2U6OmFyZVByb21wdHNBbGxvd2VkKCkK ICAgICByZXR1cm4gIW1fZm9yYmlkUHJvbXB0c0RlcHRoOwogfQogCit2b2lkIFBhZ2U6OmxvZ05h dmlnYXRpb24oY29uc3QgTmF2aWdhdGlvbiYgbmF2aWdhdGlvbikKK3sKKyAgICBTdHJpbmcgbmF2 aWdhdGlvbkRlc2NyaXB0aW9uOworICAgIHN3aXRjaCAobmF2aWdhdGlvbi50eXBlKSB7CisgICAg Y2FzZSBGcmFtZUxvYWRUeXBlOjpTdGFuZGFyZDoKKyAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0 aW9uID0gQVNDSUlMaXRlcmFsKCJzdGFuZGFyZCIpOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEZyYW1lTG9hZFR5cGU6OkJhY2s6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFT Q0lJTGl0ZXJhbCgiYmFjayIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5 cGU6OkZvcndhcmQ6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJTGl0ZXJh bCgiZm9yd2FyZCIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6Oklu ZGV4ZWRCYWNrRm9yd2FyZDoKKyAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9uID0gQVNDSUlM aXRlcmFsKCJpbmRleGVkQmFja0ZvcndhcmQiKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBG cmFtZUxvYWRUeXBlOjpSZWxvYWQ6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFT Q0lJTGl0ZXJhbCgicmVsb2FkIik7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2Fk VHlwZTo6U2FtZToKKyAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9uID0gQVNDSUlMaXRlcmFs KCJzYW1lIik7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6UmVsb2Fk RnJvbU9yaWdpbjoKKyAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9uID0gQVNDSUlMaXRlcmFs KCJyZWxvYWRGcm9tT3JpZ2luIik7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRnJhbWVMb2Fk VHlwZTo6UmVsb2FkRXhwaXJlZE9ubHk6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9 IEFTQ0lJTGl0ZXJhbCgicmVsb2FkUmV2YWxpZGF0aW5nRXhwaXJlZCIpOworICAgICAgICBicmVh azsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlJlcGxhY2U6CisgICAgY2FzZSBGcmFtZUxvYWRU eXBlOjpSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q6CisgICAgICAgIC8vIE5vdCBs b2dnaW5nIHRob3NlIGZvciBub3cuCisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgZGlhZ25v c3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZShEaWFnbm9zdGljTG9nZ2lu Z0tleXM6Om5hdmlnYXRpb25LZXkoKSwgbmF2aWdhdGlvbkRlc2NyaXB0aW9uLCBTaG91bGRTYW1w bGU6Ok5vKTsKKworICAgIGlmICghbmF2aWdhdGlvbi5kb21haW4uaXNFbXB0eSgpKQorICAgICAg ICBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aEVuaGFu Y2VkUHJpdmFjeShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmRvbWFpblZpc2l0ZWRLZXkoKSwgbmF2 aWdhdGlvbi5kb21haW4sIFNob3VsZFNhbXBsZTo6Tm8pOworfQorCit2b2lkIFBhZ2U6Om1haW5G cmFtZUxvYWRTdGFydGVkKGNvbnN0IFVSTCYgZGVzdGluYXRpb25VUkwsIEZyYW1lTG9hZFR5cGUg dHlwZSkKK3sKKyAgICBTdHJpbmcgZG9tYWluOworI2lmIEVOQUJMRShQVUJMSUNfU1VGRklYX0xJ U1QpCisgICAgZG9tYWluID0gdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbihkZXN0aW5hdGlv blVSTC5ob3N0KCkpOworI2VuZGlmCisKKyAgICBOYXZpZ2F0aW9uIG5hdmlnYXRpb24gPSB7IGRv bWFpbiwgdHlwZSB9OworCisgICAgLy8gVG8gYXZvaWQgYmVpbmcgdG9vIHZlcmJvc2UsIHdlIG9u bHkgbG9nIG5hdmlnYXRpb25zIGlmIHRoZSBwYWdlIGlzIG9yIGJlY29tZXMgdmlzaWJsZS4gVGhp cyBhdm9pZHMgbG9nZ2luZyBub24tdXNlciBvYnNlcnZhYmxlIGxvYWRzLgorICAgIGlmICghaXNW aXNpYmxlKCkpIHsKKyAgICAgICAgbV9uYXZpZ2F0aW9uVG9Mb2dXaGVuVmlzaWJsZSA9IG5hdmln YXRpb247CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX25hdmlnYXRpb25Ub0xvZ1do ZW5WaXNpYmxlID0gc3RkOjpudWxsb3B0OworICAgIGxvZ05hdmlnYXRpb24obmF2aWdhdGlvbik7 Cit9CisKIFBsdWdpbkluZm9Qcm92aWRlciYgUGFnZTo6cGx1Z2luSW5mb1Byb3ZpZGVyKCkKIHsK ICAgICByZXR1cm4gbV9wbHVnaW5JbmZvUHJvdmlkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDhjYTA5 YTUzZTM2MjRjNzVjNmM1MDhmM2U1MjQ5MmE4OWNkZmRiZGEuLjA5NDBlNTg2NjM5NWIxMWYzMmIx YzJjMjE5MWRiOTczNjA3YTdlNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0xMjgsNiArMTI4LDcgQEAg Y2xhc3MgU2V0dGluZ3M7CiBjbGFzcyBTb2NrZXRQcm92aWRlcjsKIGNsYXNzIFN0b3JhZ2VOYW1l c3BhY2U7CiBjbGFzcyBTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI7CitjbGFzcyBVUkw7CiBjbGFz cyBVc2VyQ29udGVudFByb3ZpZGVyOwogY2xhc3MgVmFsaWRhdGlvbk1lc3NhZ2VDbGllbnQ7CiBj bGFzcyBBY3Rpdml0eVN0YXRlQ2hhbmdlT2JzZXJ2ZXI7CkBAIC00OTUsNiArNDk2LDggQEAgcHVi bGljOgogICAgIHZvaWQgYWxsb3dQcm9tcHRzKCk7CiAgICAgYm9vbCBhcmVQcm9tcHRzQWxsb3dl ZCgpOwogCisgICAgdm9pZCBtYWluRnJhbWVMb2FkU3RhcnRlZChjb25zdCBVUkwmLCBGcmFtZUxv YWRUeXBlKTsKKwogICAgIHZvaWQgc2V0TGFzdFNwYXRpYWxOYXZpZ2F0aW9uQ2FuZGlkYXRlQ291 bnQodW5zaWduZWQgY291bnQpIHsgbV9sYXN0U3BhdGlhbE5hdmlnYXRpb25DYW5kaWRhdGVzQ291 bnQgPSBjb3VudDsgfQogICAgIHVuc2lnbmVkIGxhc3RTcGF0aWFsTmF2aWdhdGlvbkNhbmRpZGF0 ZUNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0U3BhdGlhbE5hdmlnYXRpb25DYW5kaWRhdGVz Q291bnQ7IH0KIApAQCAtNTk1LDYgKzU5OCwxMiBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBzZXRMb3dQb3dlck1vZGVFbmFibGVkT3ZlcnJpZGVGb3JUZXN0aW5nKHN0ZDo6b3B0 aW9uYWw8Ym9vbD4pOwogCiBwcml2YXRlOgorICAgIHN0cnVjdCBOYXZpZ2F0aW9uIHsKKyAgICAg ICAgU3RyaW5nIGRvbWFpbjsKKyAgICAgICAgRnJhbWVMb2FkVHlwZSB0eXBlOworICAgIH07Cisg ICAgdm9pZCBsb2dOYXZpZ2F0aW9uKGNvbnN0IE5hdmlnYXRpb24mKTsKKwogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgaW5pdEdyb3VwKCk7CiAKICAgICB2b2lkIHNldElzSW5XaW5kb3dJbnRlcm5h bChib29sKTsKQEAgLTgwNCw2ICs4MTMsOCBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxMb3dQb3dlck1vZGVOb3RpZmllcj4gbV9sb3dQb3dlck1vZGVOb3RpZmllcjsKICAgICBzdGQ6 Om9wdGlvbmFsPGJvb2w+IG1fbG93UG93ZXJNb2RlRW5hYmxlZE92ZXJyaWRlRm9yVGVzdGluZzsK IAorICAgIHN0ZDo6b3B0aW9uYWw8TmF2aWdhdGlvbj4gbV9uYXZpZ2F0aW9uVG9Mb2dXaGVuVmlz aWJsZTsKKwogICAgIGJvb2wgbV9pc1J1bm5pbmdVc2VyU2NyaXB0cyB7IGZhbHNlIH07CiB9Owog Cg== 308608 2017-04-28 16:07:15 -0700 2017-04-28 20:55:39 -0700 Patch bug-171455-20170428160715.patch text/plain 9122 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1OTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTlhZmQ4ZjVlZWY0MTEx NWU4ZjhlOWMzNDc4YjQ1NDlhZDUyZjVlYy4uZjI0ZDg2ODAyNDcwNTM5NGFiNjUyYWYxNjE2MWNi ZDA3ODQ2NTQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE3LTA0LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRGlhZ25vc3RpYyBsb2dnaW5n IG9mIG5hdmlnYXRpb25zIGlzIHRvbyB2ZXJib3NlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzE0NTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMx NTQzODE1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IERpYWdub3N0aWMgbG9nZ2luZyBvZiBuYXZpZ2F0aW9uIGlzIHRvbyB2ZXJib3NlLiBXZSBsb2cg dGhpbmdzIHRoYXQgYXJlIG5vdCBhY3R1YWxseSB1c2VyCisgICAgICAgIG5hdmlnYXRpb25zIChl LmcuIHNwZWN1bGF0aXZlIGxvYWRzLCBib29rbWFyayBpY29uIGZldGNoZXMsIC4uLikuIFRvIGFk ZHJlc3MgdGhlIGlzc3VlLAorICAgICAgICB3ZSBub3cgb25seSBsb2cgKm9ic2VydmFibGUqIGxv YWRzLiBXZSBkbyBzbyBieSBvbmx5IGxvZ2dpbmcgaWYgdGhlIHBhZ2UgaXMgdmlzaWJsZSBvcgor ICAgICAgICBpZiBpdCBiZWNvbWVzIHZpc2libGUuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRXaXRoRG9jdW1l bnRMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6bG9nTmF2aWdhdGlvbik6IERlbGV0ZWQuCisg ICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnNldElzVmlz aWJsZUludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmxvZ05hdmlnYXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6UGFnZTo6bWFpbkZyYW1lTG9hZFN0YXJ0ZWQpOgorICAgICAgICAq IHBhZ2UvUGFnZS5oOgorCisyMDE3LTA0LTI4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CisKICAgICAgICAgUmFuZ2UuZ2V0Q2xpZW50UmVjdHMoKSAvIGdldEJvdW5kaW5nQ2xpZW50 UmVjdCgpIHNob3VsZCByZXR1cm4gRE9NUmVjdCB0eXBlcwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMzkzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCmluZGV4IDA5NDI0ZGQ0YmQ3YzViY2RiYzk2MWI0NzZmYTBlMGQzMjdhNjlk NTkuLjg4NzRhMmM0OGU0NTI4ZDFkNTRjNWY2ZGZkNGM2ODhmZDQwNmUyMGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtOTUsNyArOTUsNiBAQAogI2luY2x1ZGUgIlBs dWdpbkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiUG9saWN5Q2hlY2tlci5oIgogI2luY2x1ZGUgIlBy b2dyZXNzVHJhY2tlci5oIgotI2luY2x1ZGUgIlB1YmxpY1N1ZmZpeC5oIgogI2luY2x1ZGUgIlJl c291cmNlSGFuZGxlLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VMb2FkSW5mby5oIgogI2luY2x1ZGUg IlJlc291cmNlTG9hZE9ic2VydmVyLmgiCkBAIC0xMzk4LDUwICsxMzk3LDYgQEAgdm9pZCBGcmFt ZUxvYWRlcjo6bG9hZChEb2N1bWVudExvYWRlciogbmV3RG9jdW1lbnRMb2FkZXIpCiAgICAgbG9h ZFdpdGhEb2N1bWVudExvYWRlcihuZXdEb2N1bWVudExvYWRlciwgdHlwZSwgMCwgQWxsb3dOYXZp Z2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMpOwogfQogCi1zdGF0aWMgdm9pZCBsb2dOYXZpZ2F0aW9u KE1haW5GcmFtZSYgZnJhbWUsIGNvbnN0IFVSTCYgZGVzdGluYXRpb25VUkwsIEZyYW1lTG9hZFR5 cGUgdHlwZSkKLXsKLSAgICBpZiAoIWZyYW1lLnBhZ2UoKSkKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgU3RyaW5nIG5hdmlnYXRpb25EZXNjcmlwdGlvbjsKLSAgICBzd2l0Y2ggKHR5cGUpIHsKLSAg ICBjYXNlIEZyYW1lTG9hZFR5cGU6OlN0YW5kYXJkOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3Jp cHRpb24gPSBBU0NJSUxpdGVyYWwoInN0YW5kYXJkIik7Ci0gICAgICAgIGJyZWFrOwotICAgIGNh c2UgRnJhbWVMb2FkVHlwZTo6QmFjazoKLSAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9uID0g QVNDSUlMaXRlcmFsKCJiYWNrIik7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRnJhbWVMb2Fk VHlwZTo6Rm9yd2FyZDoKLSAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9uID0gQVNDSUlMaXRl cmFsKCJmb3J3YXJkIik7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6 SW5kZXhlZEJhY2tGb3J3YXJkOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBBU0NJ SUxpdGVyYWwoImluZGV4ZWRCYWNrRm9yd2FyZCIpOwotICAgICAgICBicmVhazsKLSAgICBjYXNl IEZyYW1lTG9hZFR5cGU6OlJlbG9hZDoKLSAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9uID0g QVNDSUlMaXRlcmFsKCJyZWxvYWQiKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGcmFtZUxv YWRUeXBlOjpTYW1lOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBBU0NJSUxpdGVy YWwoInNhbWUiKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpSZWxv YWRGcm9tT3JpZ2luOgotICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBBU0NJSUxpdGVy YWwoInJlbG9hZEZyb21PcmlnaW4iKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGcmFtZUxv YWRUeXBlOjpSZWxvYWRFeHBpcmVkT25seToKLSAgICAgICAgbmF2aWdhdGlvbkRlc2NyaXB0aW9u ID0gQVNDSUlMaXRlcmFsKCJyZWxvYWRSZXZhbGlkYXRpbmdFeHBpcmVkIik7Ci0gICAgICAgIGJy ZWFrOwotICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6UmVwbGFjZToKLSAgICBjYXNlIEZyYW1lTG9h ZFR5cGU6OlJlZGlyZWN0V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdDoKLSAgICAgICAgLy8gTm90 IGxvZ2dpbmcgdGhvc2UgZm9yIG5vdy4KLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBmcmFt ZS5wYWdlKCktPmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2Uo RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpuYXZpZ2F0aW9uS2V5KCksIG5hdmlnYXRpb25EZXNjcmlw dGlvbiwgU2hvdWxkU2FtcGxlOjpObyk7Ci0jaWYgRU5BQkxFKFBVQkxJQ19TVUZGSVhfTElTVCkK LSAgICBTdHJpbmcgZG9tYWluID0gdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbihkZXN0aW5h dGlvblVSTC5ob3N0KCkpOwotICAgIGlmICghZG9tYWluLmlzRW1wdHkoKSkKLSAgICAgICAgZnJh bWUucGFnZSgpLT5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdl V2l0aEVuaGFuY2VkUHJpdmFjeShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmRvbWFpblZpc2l0ZWRL ZXkoKSwgZG9tYWluLCBTaG91bGRTYW1wbGU6Ok5vKTsKLSNlbmRpZgotfQotCiB2b2lkIEZyYW1l TG9hZGVyOjpsb2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIEZy YW1lTG9hZFR5cGUgdHlwZSwgRm9ybVN0YXRlKiBmb3JtU3RhdGUsIEFsbG93TmF2aWdhdGlvblRv SW52YWxpZFVSTCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwpCiB7CiAgICAgLy8gUmV0YWlu IGJlY2F1c2UgZGlzcGF0Y2hCZWZvcmVMb2FkRXZlbnQgbWF5IHJlbGVhc2UgdGhlIGxhc3QgcmVm ZXJlbmNlIHRvIGl0LgpAQCAtMTQ2NCw3ICsxNDE5LDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9h ZFdpdGhEb2N1bWVudExvYWRlcihEb2N1bWVudExvYWRlciogbG9hZGVyLCBGcmFtZUxvYWRUeXBl IHQKIAogICAgIC8vIExvZyBtYWluIGZyYW1lIG5hdmlnYXRpb24gdHlwZXMuCiAgICAgaWYgKG1f ZnJhbWUuaXNNYWluRnJhbWUoKSkgewotICAgICAgICBsb2dOYXZpZ2F0aW9uKHN0YXRpY19jYXN0 PE1haW5GcmFtZSY+KG1fZnJhbWUpLCBuZXdVUkwsIHR5cGUpOworICAgICAgICBpZiAoYXV0byog cGFnZSA9IG1fZnJhbWUucGFnZSgpKQorICAgICAgICAgICAgcGFnZS0+bWFpbkZyYW1lTG9hZFN0 YXJ0ZWQobmV3VVJMLCB0eXBlKTsKICAgICAgICAgc3RhdGljX2Nhc3Q8TWFpbkZyYW1lJj4obV9m cmFtZSkucGVyZm9ybWFuY2VMb2dnaW5nKCkuZGlkUmVhY2hQb2ludE9mSW50ZXJlc3QoUGVyZm9y bWFuY2VMb2dnaW5nOjpNYWluRnJhbWVMb2FkU3RhcnRlZCk7CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmNwcAppbmRleCA3ZGQ1ODgwMjRiZDg3ZDk3YjY2NGQ4Nzk5YmY4MjNhZTYzNTU1ZDI3Li40NGQy YzY4YTY1YTFjZjRhNjEzMTcxZWE5YjUwYmE5MmVlYTMyYzg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK QEAgLTc3LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQbHVnaW5WaWV3QmFzZS5oIgogI2luY2x1ZGUg IlBvaW50ZXJMb2NrQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgor I2luY2x1ZGUgIlB1YmxpY1N1ZmZpeC5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyQ29tcG9zaXRv ci5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgpA QCAtMTY3MCw2ICsxNjcxLDExIEBAIHZvaWQgUGFnZTo6c2V0SXNWaXNpYmxlSW50ZXJuYWwoYm9v bCBpc1Zpc2libGUpCiAgICAgICAgIHNldFNWR0FuaW1hdGlvbnNTdGF0ZSgqdGhpcywgU1ZHQW5p bWF0aW9uc1N0YXRlOjpSZXN1bWVkKTsKIAogICAgICAgICByZXN1bWVBbmltYXRpbmdJbWFnZXMo KTsKKworICAgICAgICBpZiAobV9uYXZpZ2F0aW9uVG9Mb2dXaGVuVmlzaWJsZSkgeworICAgICAg ICAgICAgbG9nTmF2aWdhdGlvbihtX25hdmlnYXRpb25Ub0xvZ1doZW5WaXNpYmxlLnZhbHVlKCkp OworICAgICAgICAgICAgbV9uYXZpZ2F0aW9uVG9Mb2dXaGVuVmlzaWJsZSA9IHN0ZDo6bnVsbG9w dDsKKyAgICAgICAgfQogICAgIH0KIAogICAgIFZlY3RvcjxSZWY8RG9jdW1lbnQ+PiBkb2N1bWVu dHM7CkBAIC0yMDU0LDYgKzIwNjAsNjQgQEAgYm9vbCBQYWdlOjphcmVQcm9tcHRzQWxsb3dlZCgp CiAgICAgcmV0dXJuICFtX2ZvcmJpZFByb21wdHNEZXB0aDsKIH0KIAordm9pZCBQYWdlOjpsb2dO YXZpZ2F0aW9uKGNvbnN0IE5hdmlnYXRpb24mIG5hdmlnYXRpb24pCit7CisgICAgU3RyaW5nIG5h dmlnYXRpb25EZXNjcmlwdGlvbjsKKyAgICBzd2l0Y2ggKG5hdmlnYXRpb24udHlwZSkgeworICAg IGNhc2UgRnJhbWVMb2FkVHlwZTo6U3RhbmRhcmQ6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlw dGlvbiA9IEFTQ0lJTGl0ZXJhbCgic3RhbmRhcmQiKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBGcmFtZUxvYWRUeXBlOjpCYWNrOgorICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBB U0NJSUxpdGVyYWwoImJhY2siKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGcmFtZUxvYWRU eXBlOjpGb3J3YXJkOgorICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBBU0NJSUxpdGVy YWwoImZvcndhcmQiKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpJ bmRleGVkQmFja0ZvcndhcmQ6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJ TGl0ZXJhbCgiaW5kZXhlZEJhY2tGb3J3YXJkIik7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug RnJhbWVMb2FkVHlwZTo6UmVsb2FkOgorICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24gPSBB U0NJSUxpdGVyYWwoInJlbG9hZCIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9h ZFR5cGU6OlNhbWU6CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJTGl0ZXJh bCgic2FtZSIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OlJlbG9h ZEZyb21PcmlnaW46CisgICAgICAgIG5hdmlnYXRpb25EZXNjcmlwdGlvbiA9IEFTQ0lJTGl0ZXJh bCgicmVsb2FkRnJvbU9yaWdpbiIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZyYW1lTG9h ZFR5cGU6OlJlbG9hZEV4cGlyZWRPbmx5OgorICAgICAgICBuYXZpZ2F0aW9uRGVzY3JpcHRpb24g PSBBU0NJSUxpdGVyYWwoInJlbG9hZFJldmFsaWRhdGluZ0V4cGlyZWQiKTsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBGcmFtZUxvYWRUeXBlOjpSZXBsYWNlOgorICAgIGNhc2UgRnJhbWVMb2Fk VHlwZTo6UmVkaXJlY3RXaXRoTG9ja2VkQmFja0ZvcndhcmRMaXN0OgorICAgICAgICAvLyBOb3Qg bG9nZ2luZyB0aG9zZSBmb3Igbm93LgorICAgICAgICByZXR1cm47CisgICAgfQorICAgIGRpYWdu b3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dp bmdLZXlzOjpuYXZpZ2F0aW9uS2V5KCksIG5hdmlnYXRpb25EZXNjcmlwdGlvbiwgU2hvdWxkU2Ft cGxlOjpObyk7CisKKyAgICBpZiAoIW5hdmlnYXRpb24uZG9tYWluLmlzRW1wdHkoKSkKKyAgICAg ICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhFbmhh bmNlZFByaXZhY3koRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpkb21haW5WaXNpdGVkS2V5KCksIG5h dmlnYXRpb24uZG9tYWluLCBTaG91bGRTYW1wbGU6Ok5vKTsKK30KKwordm9pZCBQYWdlOjptYWlu RnJhbWVMb2FkU3RhcnRlZChjb25zdCBVUkwmIGRlc3RpbmF0aW9uVVJMLCBGcmFtZUxvYWRUeXBl IHR5cGUpCit7CisgICAgU3RyaW5nIGRvbWFpbjsKKyNpZiBFTkFCTEUoUFVCTElDX1NVRkZJWF9M SVNUKQorICAgIGRvbWFpbiA9IHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW4oZGVzdGluYXRp b25VUkwuaG9zdCgpKTsKKyNlbmRpZgorCisgICAgTmF2aWdhdGlvbiBuYXZpZ2F0aW9uID0geyBk b21haW4sIHR5cGUgfTsKKworICAgIC8vIFRvIGF2b2lkIGJlaW5nIHRvbyB2ZXJib3NlLCB3ZSBv bmx5IGxvZyBuYXZpZ2F0aW9ucyBpZiB0aGUgcGFnZSBpcyBvciBiZWNvbWVzIHZpc2libGUuIFRo aXMgYXZvaWRzIGxvZ2dpbmcgbm9uLXVzZXIgb2JzZXJ2YWJsZSBsb2Fkcy4KKyAgICBpZiAoIWlz VmlzaWJsZSgpKSB7CisgICAgICAgIG1fbmF2aWdhdGlvblRvTG9nV2hlblZpc2libGUgPSBuYXZp Z2F0aW9uOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbV9uYXZpZ2F0aW9uVG9Mb2dX aGVuVmlzaWJsZSA9IHN0ZDo6bnVsbG9wdDsKKyAgICBsb2dOYXZpZ2F0aW9uKG5hdmlnYXRpb24p OworfQorCiBQbHVnaW5JbmZvUHJvdmlkZXImIFBhZ2U6OnBsdWdpbkluZm9Qcm92aWRlcigpCiB7 CiAgICAgcmV0dXJuIG1fcGx1Z2luSW5mb1Byb3ZpZGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCA4Y2Ew OWE1M2UzNjI0Yzc1YzZjNTA4ZjNlNTI0OTJhODljZGZkYmRhLi4wOTQwZTU4NjYzOTViMTFmMzJi MWMyYzIxOTFkYjk3MzYwN2E3ZTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtMTI4LDYgKzEyOCw3IEBA IGNsYXNzIFNldHRpbmdzOwogY2xhc3MgU29ja2V0UHJvdmlkZXI7CiBjbGFzcyBTdG9yYWdlTmFt ZXNwYWNlOwogY2xhc3MgU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOworY2xhc3MgVVJMOwogY2xh c3MgVXNlckNvbnRlbnRQcm92aWRlcjsKIGNsYXNzIFZhbGlkYXRpb25NZXNzYWdlQ2xpZW50Owog Y2xhc3MgQWN0aXZpdHlTdGF0ZUNoYW5nZU9ic2VydmVyOwpAQCAtNDk1LDYgKzQ5Niw4IEBAIHB1 YmxpYzoKICAgICB2b2lkIGFsbG93UHJvbXB0cygpOwogICAgIGJvb2wgYXJlUHJvbXB0c0FsbG93 ZWQoKTsKIAorICAgIHZvaWQgbWFpbkZyYW1lTG9hZFN0YXJ0ZWQoY29uc3QgVVJMJiwgRnJhbWVM b2FkVHlwZSk7CisKICAgICB2b2lkIHNldExhc3RTcGF0aWFsTmF2aWdhdGlvbkNhbmRpZGF0ZUNv dW50KHVuc2lnbmVkIGNvdW50KSB7IG1fbGFzdFNwYXRpYWxOYXZpZ2F0aW9uQ2FuZGlkYXRlc0Nv dW50ID0gY291bnQ7IH0KICAgICB1bnNpZ25lZCBsYXN0U3BhdGlhbE5hdmlnYXRpb25DYW5kaWRh dGVDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdFNwYXRpYWxOYXZpZ2F0aW9uQ2FuZGlkYXRl c0NvdW50OyB9CiAKQEAgLTU5NSw2ICs1OTgsMTIgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgc2V0TG93UG93ZXJNb2RlRW5hYmxlZE92ZXJyaWRlRm9yVGVzdGluZyhzdGQ6Om9w dGlvbmFsPGJvb2w+KTsKIAogcHJpdmF0ZToKKyAgICBzdHJ1Y3QgTmF2aWdhdGlvbiB7CisgICAg ICAgIFN0cmluZyBkb21haW47CisgICAgICAgIEZyYW1lTG9hZFR5cGUgdHlwZTsKKyAgICB9Owor ICAgIHZvaWQgbG9nTmF2aWdhdGlvbihjb25zdCBOYXZpZ2F0aW9uJik7CisKICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIGluaXRHcm91cCgpOwogCiAgICAgdm9pZCBzZXRJc0luV2luZG93SW50ZXJu YWwoYm9vbCk7CkBAIC04MDQsNiArODEzLDggQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9w dHI8TG93UG93ZXJNb2RlTm90aWZpZXI+IG1fbG93UG93ZXJNb2RlTm90aWZpZXI7CiAgICAgc3Rk OjpvcHRpb25hbDxib29sPiBtX2xvd1Bvd2VyTW9kZUVuYWJsZWRPdmVycmlkZUZvclRlc3Rpbmc7 CiAKKyAgICBzdGQ6Om9wdGlvbmFsPE5hdmlnYXRpb24+IG1fbmF2aWdhdGlvblRvTG9nV2hlblZp c2libGU7CisKICAgICBib29sIG1faXNSdW5uaW5nVXNlclNjcmlwdHMgeyBmYWxzZSB9OwogfTsK IAo=