211403 2020-05-04 15:02:26 -0700 WKWebView.title should be safe browsing warning's title during a safe browsing warning 2020-05-08 10:13:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1648755 0 achristensen 2020-05-04 15:02:26 -0700 WKWebView.title should be safe browsing warning's title during a safe browsing warning 1648757 1 398422 achristensen 2020-05-04 15:03:27 -0700 Created attachment 398422 Patch 1648758 2 achristensen 2020-05-04 15:03:30 -0700 <rdar://problem/56201982> 1648981 3 398422 thorton 2020-05-04 23:37:01 -0700 Comment on attachment 398422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398422&action=review > Source/WebKit/UIProcess/WebPageProxy.cpp:5213 > + m_pageLoadState.setTitle(transaction, oldTitle); I don't really know how this all works, is there a guarantee that neither parsing nor JS have changed the title in the meantime, that you'll lose/stomp here? 1649225 4 achristensen 2020-05-05 09:11:19 -0700 There is no such guarantee. This is just a best attempt at restoring what was there. The title is from a non-malicious page. 1650347 5 398796 achristensen 2020-05-07 14:17:53 -0700 Created attachment 398796 Patch 1650664 6 ews-feeder 2020-05-08 10:13:41 -0700 Committed r261390: <https://trac.webkit.org/changeset/261390> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398796. 398422 2020-05-04 15:03:27 -0700 2020-05-07 14:17:52 -0700 Patch bug-211403-20200504150326.patch text/plain 3537 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjExMTIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA1LTA0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJWaWV3LnRp dGxlIHNob3VsZCBiZSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcncyB0aXRsZSBkdXJpbmcgYSBzYWZl IGJyb3dzaW5nIHdhcm5pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMTQwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYyMDE5ODI+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBB UEkgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u KToKKwogMjAyMC0wNS0wNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIFRlc3RXZWJLaXRBUEkuV2ViS2l0LkN1c3RvbURpc3BsYXlOYW1lIGlz IGEgZmxha3kgdGltZW91dApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCShyZXZpc2lvbiAyNjEwMzgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjAzLDcgKzUyMDMsMTUgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYQogICAgICAgICAgICAgICAgIG1fcGFn ZUxvYWRTdGF0ZS5jb21taXRDaGFuZ2VzKCk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg IG1fcGFnZUNsaWVudC0+c2hvd1NhZmVCcm93c2luZ1dhcm5pbmcoKnNhZmVCcm93c2luZ1dhcm5p bmcsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgcG9saWN5QWN0aW9uXSAo YXV0byYmIHJlc3VsdCkgbXV0YWJsZSB7CisgICAgICAgICAgICBTdHJpbmcgb2xkVGl0bGUgPSBt X3BhZ2VMb2FkU3RhdGUudGl0bGUoKTsKKyAgICAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBt X3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKKyAgICAgICAgICAgIG1fcGFnZUxvYWRTdGF0 ZS5zZXRUaXRsZSh0cmFuc2FjdGlvbiwgc2FmZUJyb3dzaW5nV2FybmluZy0+dGl0bGUoKSk7Cisg ICAgICAgICAgICAKKyAgICAgICAgICAgIG1fcGFnZUNsaWVudC0+c2hvd1NhZmVCcm93c2luZ1dh cm5pbmcoKnNhZmVCcm93c2luZ1dhcm5pbmcsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92 ZShwcm90ZWN0ZWRUaGlzKSwgb2xkVGl0bGUgPSBXVEZNb3ZlKG9sZFRpdGxlKSwgY29tcGxldGlv bkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgcG9saWN5QWN0aW9uXSAoYXV0 byYmIHJlc3VsdCkgbXV0YWJsZSB7CisKKyAgICAgICAgICAgICAgICBhdXRvIHRyYW5zYWN0aW9u ID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CisgICAgICAgICAgICAgICAgbV9wYWdl TG9hZFN0YXRlLnNldFRpdGxlKHRyYW5zYWN0aW9uLCBvbGRUaXRsZSk7CisKICAgICAgICAgICAg ICAgICBzd2l0Y2hPbihyZXN1bHQsIFsmXSAoY29uc3QgVVJMJiB1cmwpIHsKICAgICAgICAgICAg ICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoUG9saWN5QWN0aW9uOjpJZ25vcmUpOwogICAgICAg ICAgICAgICAgICAgICBsb2FkUmVxdWVzdCh7IHVybCB9KTsKSW5kZXg6IFRvb2xzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MTExNSkKKysrIFRv b2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA1LTA0 ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAg V0tXZWJWaWV3LnRpdGxlIHNob3VsZCBiZSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcncyB0aXRsZSBk dXJpbmcgYSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTQwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYy MDE5ODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NhZmVCcm93c2luZy5tbToKKyAgICAg ICAgKFRFU1QpOgorCiAyMDIwLTA1LTA0ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgdW5uZWVkZWQgVVNFKE1FRElBUkVNT1RFKQpJbmRleDogVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TYWZlQnJvd3NpbmcubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TYWZlQnJvd3Npbmcu bW0JKHJldmlzaW9uIDI2MTAzOCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvU2FmZUJyb3dzaW5nLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsMTAgKzI4MywxMiBA QCBURVNUKFNhZmVCcm93c2luZywgVmlzaXRVbnNhZmVXZWJzaXRlKQogI2lmIFBMQVRGT1JNKE1B QykKICAgICBFWFBFQ1RfR1Qod2FybmluZy5zdWJ2aWV3cy5maXJzdE9iamVjdC5zdWJ2aWV3c1sy XS5mcmFtZS5zaXplLmhlaWdodCwgMCk7CiAjZW5kaWYKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dl YlZpZXcgdGl0bGVdLCAiRGVjZXB0aXZlIFdlYnNpdGUgV2FybmluZyIpOwogICAgIGNoZWNrVGl0 bGVBbmRDbGljayh3YXJuaW5nLnN1YnZpZXdzLmZpcnN0T2JqZWN0LnN1YnZpZXdzWzRdLCAiU2hv dyBEZXRhaWxzIik7CiAgICAgRVhQRUNUX0VRKHdhcm5pbmcuc3Vidmlld3MuY291bnQsIDJ1bGwp OwogICAgIEVYUEVDVF9GQUxTRShjb21taXR0ZWROYXZpZ2F0aW9uKTsKICAgICB2aXNpdFVuc2Fm ZVNpdGUod2FybmluZyk7CisgICAgRVhQRUNUX1dLX1NUUkVRKFt3ZWJWaWV3IHRpdGxlXSwgIiIp OwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmY29tbWl0dGVkTmF2aWdhdGlvbik7CiB9 CiAK 398796 2020-05-07 14:17:53 -0700 2020-05-08 10:13:41 -0700 Patch bug-211403-20200507141752.patch text/plain 6954 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjEyOTgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJWaWV3LnRp dGxlIHNob3VsZCBiZSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcncyB0aXRsZSBkdXJpbmcgYSBzYWZl IGJyb3dzaW5nIHdhcm5pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMTQwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBhIG5ldyBwcm9wZXJ0eSB0byBQYWdlTG9hZFN0YXRlLCB3aGljaCBhbGxv d3MgdGhlIHRpdGxlIHRvIGJlIHNldCB1bmRlcm5lYXRoIGl0LgorICAgICAgICBUaGF0IHdheSwg b25jZSB0aGUgc2FmZSBicm93c2luZyB3YXJuaW5nIGlzIGNsb3NlZCwgd2UgY2FuIHVwZGF0ZSB0 aGUgdGl0bGUgdG8gd2hhdCBpdCB3b3VsZCd2ZSBiZWVuLAorICAgICAgICBpbmNsdWRpbmcgYW55 IGNoYW5nZXMgdGhhdCBoYXBwZW5lZCB3aGlsZSB0aGUgd2FybmluZyB3YXMgb3Blbi4KKworICAg ICAgICBDb3ZlcmVkIGJ5IGFuIEFQSSB0ZXN0LiAgSSBhbHNvIG1hbnVhbGx5IHZlcmlmaWVkIHRo aXMgZml4ZXMgcmRhcjovL3Byb2JsZW0vNTYyMDE5ODIKKworICAgICAgICAqIFVJUHJvY2Vzcy9Q YWdlTG9hZFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6Y29tbWl0 Q2hhbmdlcyk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VMb2FkU3RhdGU6OnJlc2V0KToKKyAgICAg ICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJL aXQ6OlBhZ2VMb2FkU3RhdGU6OnRpdGxlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UGFnZUxv YWRTdGF0ZTo6c2V0VGl0bGVGcm9tU2FmZUJyb3dzaW5nV2FybmluZyk6CisgICAgICAgICogVUlQ cm9jZXNzL1BhZ2VMb2FkU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKToKKwogMjAyMC0wNS0wNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVl QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjA3NjkuCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAkocmV2aXNpb24g MjYxMjk4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTk1LDcgKzk1LDggQEAgdm9pZCBQYWdlTG9hZFN0YXRlOjpjb21taXRD aGFuZ2VzKCkKIAogICAgIGJvb2wgY2FuR29CYWNrQ2hhbmdlZCA9IG1fY29tbWl0dGVkU3RhdGUu Y2FuR29CYWNrICE9IG1fdW5jb21taXR0ZWRTdGF0ZS5jYW5Hb0JhY2s7CiAgICAgYm9vbCBjYW5H b0ZvcndhcmRDaGFuZ2VkID0gbV9jb21taXR0ZWRTdGF0ZS5jYW5Hb0ZvcndhcmQgIT0gbV91bmNv bW1pdHRlZFN0YXRlLmNhbkdvRm9yd2FyZDsKLSAgICBib29sIHRpdGxlQ2hhbmdlZCA9IG1fY29t bWl0dGVkU3RhdGUudGl0bGUgIT0gbV91bmNvbW1pdHRlZFN0YXRlLnRpdGxlOworICAgIGJvb2wg dGl0bGVDaGFuZ2VkID0gbV9jb21taXR0ZWRTdGF0ZS50aXRsZSAhPSBtX3VuY29tbWl0dGVkU3Rh dGUudGl0bGUKKyAgICAgICAgfHwgbV9jb21taXR0ZWRTdGF0ZS50aXRsZUZyb21TYWZlQnJvd3Np bmdXYXJuaW5nICE9IG1fdW5jb21taXR0ZWRTdGF0ZS50aXRsZUZyb21TYWZlQnJvd3NpbmdXYXJu aW5nOwogICAgIGJvb2wgaXNMb2FkaW5nQ2hhbmdlZCA9IGlzTG9hZGluZyhtX2NvbW1pdHRlZFN0 YXRlKSAhPSBpc0xvYWRpbmcobV91bmNvbW1pdHRlZFN0YXRlKTsKICAgICBib29sIGFjdGl2ZVVS TENoYW5nZWQgPSBhY3RpdmVVUkwobV9jb21taXR0ZWRTdGF0ZSkgIT0gYWN0aXZlVVJMKG1fdW5j b21taXR0ZWRTdGF0ZSk7CiAgICAgYm9vbCBoYXNPbmx5U2VjdXJlQ29udGVudENoYW5nZWQgPSBo YXNPbmx5U2VjdXJlQ29udGVudChtX2NvbW1pdHRlZFN0YXRlKSAhPSBoYXNPbmx5U2VjdXJlQ29u dGVudChtX3VuY29tbWl0dGVkU3RhdGUpOwpAQCAtMTY3LDYgKzE2OCw3IEBAIHZvaWQgUGFnZUxv YWRTdGF0ZTo6cmVzZXQoY29uc3QgVHJhbnNhY3QKICAgICBtX2xhc3RVbnJlYWNoYWJsZVVSTCA9 IFN0cmluZygpOwogCiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnRpdGxlID0gU3RyaW5nKCk7Cisg ICAgbV91bmNvbW1pdHRlZFN0YXRlLnRpdGxlRnJvbVNhZmVCcm93c2luZ1dhcm5pbmcgPSB7IH07 CiAKICAgICBtX3VuY29tbWl0dGVkU3RhdGUuZXN0aW1hdGVkUHJvZ3Jlc3MgPSAwOwogICAgIG1f dW5jb21taXR0ZWRTdGF0ZS5uZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzID0gZmFsc2U7CkBAIC0z MzEsNiArMzMzLDcgQEAgdm9pZCBQYWdlTG9hZFN0YXRlOjpkaWRDb21taXRMb2FkKGNvbnN0IAog ICAgIG1fdW5jb21taXR0ZWRTdGF0ZS5uZWdvdGlhdGVkTGVnYWN5VExTID0gdXNlZExlZ2FjeVRM UzsKIAogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS50aXRsZSA9IFN0cmluZygpOworICAgIG1fdW5j b21taXR0ZWRTdGF0ZS50aXRsZUZyb21TYWZlQnJvd3NpbmdXYXJuaW5nID0geyB9OwogfQogCiB2 b2lkIFBhZ2VMb2FkU3RhdGU6OmRpZEZpbmlzaExvYWQoY29uc3QgVHJhbnNhY3Rpb246OlRva2Vu JiB0b2tlbikKQEAgLTM3NSw2ICszNzgsOSBAQCB2b2lkIFBhZ2VMb2FkU3RhdGU6OnNldFVucmVh Y2hhYmxlVVJMKGNvCiAKIGNvbnN0IFN0cmluZyYgUGFnZUxvYWRTdGF0ZTo6dGl0bGUoKSBjb25z dAogeworICAgIGlmICghbV9jb21taXR0ZWRTdGF0ZS50aXRsZUZyb21TYWZlQnJvd3NpbmdXYXJu aW5nLmlzTnVsbCgpKQorICAgICAgICByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS50aXRsZUZyb21T YWZlQnJvd3NpbmdXYXJuaW5nOworCiAgICAgcmV0dXJuIG1fY29tbWl0dGVkU3RhdGUudGl0bGU7 CiB9CiAKQEAgLTM4NCw2ICszOTAsMTIgQEAgdm9pZCBQYWdlTG9hZFN0YXRlOjpzZXRUaXRsZShj b25zdCBUcmFucwogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS50aXRsZSA9IHRpdGxlOwogfQogCit2 b2lkIFBhZ2VMb2FkU3RhdGU6OnNldFRpdGxlRnJvbVNhZmVCcm93c2luZ1dhcm5pbmcoY29uc3Qg VHJhbnNhY3Rpb246OlRva2VuJiB0b2tlbiwgY29uc3QgU3RyaW5nJiB0aXRsZSkKK3sKKyAgICBB U1NFUlRfVU5VU0VEKHRva2VuLCAmdG9rZW4ubV9wYWdlTG9hZFN0YXRlID09IHRoaXMpOworICAg IG1fdW5jb21taXR0ZWRTdGF0ZS50aXRsZUZyb21TYWZlQnJvd3NpbmdXYXJuaW5nID0gdGl0bGU7 Cit9CisKIGJvb2wgUGFnZUxvYWRTdGF0ZTo6Y2FuR29CYWNrKCkgY29uc3QKIHsKICAgICByZXR1 cm4gbV9jb21taXR0ZWRTdGF0ZS5jYW5Hb0JhY2s7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9QYWdlTG9hZFN0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUGFnZUxvYWRTdGF0ZS5oCShyZXZpc2lvbiAyNjEyOTgpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3NSw2ICsxNzUsNyBA QCBwdWJsaWM6CiAKICAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3Q7CiAgICAgdm9pZCBz ZXRUaXRsZShjb25zdCBUcmFuc2FjdGlvbjo6VG9rZW4mLCBjb25zdCBTdHJpbmcmKTsKKyAgICB2 b2lkIHNldFRpdGxlRnJvbVNhZmVCcm93c2luZ1dhcm5pbmcoY29uc3QgVHJhbnNhY3Rpb246OlRv a2VuJiwgY29uc3QgU3RyaW5nJik7CiAKICAgICBib29sIGNhbkdvQmFjaygpIGNvbnN0OwogICAg IHZvaWQgc2V0Q2FuR29CYWNrKGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYsIGJvb2wpOwpAQCAt MjE3LDYgKzIxOCw3IEBAIHByaXZhdGU6CiAgICAgICAgIFN0cmluZyB1bnJlYWNoYWJsZVVSTDsK IAogICAgICAgICBTdHJpbmcgdGl0bGU7CisgICAgICAgIFN0cmluZyB0aXRsZUZyb21TYWZlQnJv d3NpbmdXYXJuaW5nOwogCiAgICAgICAgIFVSTCByZXNvdXJjZURpcmVjdG9yeVVSTDsKIApJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyNjEy OTgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01MjE4LDcgKzUyMTgsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYQogICAgICAgICAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21taXRDaGFu Z2VzKCk7CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBt X3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKKyAgICAgICAgICAgIG1fcGFnZUxvYWRTdGF0 ZS5zZXRUaXRsZUZyb21TYWZlQnJvd3NpbmdXYXJuaW5nKHRyYW5zYWN0aW9uLCBzYWZlQnJvd3Np bmdXYXJuaW5nLT50aXRsZSgpKTsKKwogICAgICAgICAgICAgbV9wYWdlQ2xpZW50LT5zaG93U2Fm ZUJyb3dzaW5nV2FybmluZygqc2FmZUJyb3dzaW5nV2FybmluZywgW3RoaXMsIHByb3RlY3RlZFRo aXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpLCBwb2xpY3lBY3Rpb25dIChhdXRvJiYgcmVzdWx0KSBtdXRhYmxl IHsKKworICAgICAgICAgICAgICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUu dHJhbnNhY3Rpb24oKTsKKyAgICAgICAgICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0VGl0bGVG cm9tU2FmZUJyb3dzaW5nV2FybmluZyh0cmFuc2FjdGlvbiwgeyB9KTsKKwogICAgICAgICAgICAg ICAgIHN3aXRjaE9uKHJlc3VsdCwgWyZdIChjb25zdCBVUkwmIHVybCkgewogICAgICAgICAgICAg ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihQb2xpY3lBY3Rpb246Oklnbm9yZSk7CiAgICAgICAg ICAgICAgICAgICAgIGxvYWRSZXF1ZXN0KHsgdXJsIH0pOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjYxMzM0KQorKysgVG9v bHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDUtMDcg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBX S1dlYlZpZXcudGl0bGUgc2hvdWxkIGJlIHNhZmUgYnJvd3Npbmcgd2FybmluZydzIHRpdGxlIGR1 cmluZyBhIHNhZmUgYnJvd3Npbmcgd2FybmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Nh ZmVCcm93c2luZy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIwLTA1LTA3ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJraXRweTogVXNlIGFwcGxl X2FkZGl0aW9ucyBjZXJ0aWZpY2F0ZSBwYXRoIGlmIGF2YWlsYWJsZQpJbmRleDogVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TYWZlQnJvd3NpbmcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TYWZlQnJvd3NpbmcubW0J KHJldmlzaW9uIDI2MTI5OCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvU2FmZUJyb3dzaW5nLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsMTAgKzI4MywxMiBAQCBU RVNUKFNhZmVCcm93c2luZywgVmlzaXRVbnNhZmVXZWJzaXRlKQogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBFWFBFQ1RfR1Qod2FybmluZy5zdWJ2aWV3cy5maXJzdE9iamVjdC5zdWJ2aWV3c1syXS5m cmFtZS5zaXplLmhlaWdodCwgMCk7CiAjZW5kaWYKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZp ZXcgdGl0bGVdLCAiRGVjZXB0aXZlIFdlYnNpdGUgV2FybmluZyIpOwogICAgIGNoZWNrVGl0bGVB bmRDbGljayh3YXJuaW5nLnN1YnZpZXdzLmZpcnN0T2JqZWN0LnN1YnZpZXdzWzRdLCAiU2hvdyBE ZXRhaWxzIik7CiAgICAgRVhQRUNUX0VRKHdhcm5pbmcuc3Vidmlld3MuY291bnQsIDJ1bGwpOwog ICAgIEVYUEVDVF9GQUxTRShjb21taXR0ZWROYXZpZ2F0aW9uKTsKICAgICB2aXNpdFVuc2FmZVNp dGUod2FybmluZyk7CisgICAgRVhQRUNUX1dLX1NUUkVRKFt3ZWJWaWV3IHRpdGxlXSwgIiIpOwog ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmY29tbWl0dGVkTmF2aWdhdGlvbik7CiB9CiAK