179809 2017-11-16 18:00:48 -0800 Clean up after r224952 2017-11-17 13:36:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 179800 1 achristensen achristensen beidson benjamin cdumez cmarcelo dbates ews-watchlist ryanhaddad webkit-bug-importer oldest_to_newest 1372928 0 achristensen 2017-11-16 18:00:48 -0800 Clean up after r224952 1372929 1 327139 achristensen 2017-11-16 18:02:24 -0800 Created attachment 327139 Patch 1373256 2 achristensen 2017-11-17 13:35:52 -0800 http://trac.webkit.org/r224983 1373257 3 webkit-bug-importer 2017-11-17 13:36:20 -0800 <rdar://problem/35622683> 327139 2017-11-16 18:02:24 -0800 2017-11-17 10:23:14 -0800 Patch bug-179809-20171116180223.patch text/plain 14390 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMjQ5NTIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE3LTExLTE2ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgYWZ0ZXIgcjIyNDk1 MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5ODA5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYv TWFpblRocmVhZC5jcHA6CisgICAgICAgIChXVEY6OmRpc3BhdGNoRnVuY3Rpb25zRnJvbU1haW5U aHJlYWQpOgorICAgICAgICAoV1RGOjpjYWxsT25NYWluVGhyZWFkKToKKyAgICAgICAgKiB3dGYv TWFpblRocmVhZC5oOgorICAgICAgICAqIHd0Zi9nZW5lcmljL01haW5UaHJlYWRHZW5lcmljLmNw cDoKKyAgICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCk6 CisgICAgICAgIChXVEY6OmN1cnJlbnRSdW5Mb29wSW5Db21tb25Nb2RlKTogRGVsZXRlZC4KKyAg ICAgICAgKiB3dGYvbWFjL01haW5UaHJlYWRNYWMubW06CisgICAgICAgIChXVEY6OnNjaGVkdWxl RGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQpOgorICAgICAgICAoV1RGOjpjdXJyZW50UnVu TG9vcEluQ29tbW9uTW9kZSk6IERlbGV0ZWQuCisgICAgICAgICogd3RmL3dpbi9NYWluVGhyZWFk V2luLmNwcDoKKyAgICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRo cmVhZCk6CisgICAgICAgIChXVEY6OmN1cnJlbnRSdW5Mb29wSW5Db21tb25Nb2RlKTogRGVsZXRl ZC4KKwogMjAxNy0xMS0xNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIEZpeCBmYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQtcG9zdE1lc3NhZ2Ut cmVjdXJzaXZlLmh0bWwgYWZ0ZXIgcjIyNDg5NgpJbmRleDogU291cmNlL1dURi93dGYvTWFpblRo cmVhZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvTWFpblRocmVhZC5jcHAJKHJl dmlzaW9uIDIyNDkwNSkKKysrIFNvdXJjZS9XVEYvd3RmL01haW5UaHJlYWQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMzUsMTQgKzEzNSwxNCBAQCB2b2lkIGRpc3BhdGNoRnVuY3Rpb25zRnJvbU1h aW5UaHJlYWQoKQogICAgICAgICAvLyB5aWVsZCBzbyB0aGUgdXNlciBpbnB1dCBjYW4gYmUgcHJv Y2Vzc2VkLiBPdGhlcndpc2UgdXNlciBtYXkgbm90IGJlIGFibGUgdG8gZXZlbiBjbG9zZSB0aGUg d2luZG93LgogICAgICAgICAvLyBUaGlzIGNvZGUgaGFzIGVmZmVjdCBvbmx5IGluIGNhc2UgdGhl IHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKSBpcyBpbXBsZW1lbnRlZCBp biBhIHdheSB0aGF0CiAgICAgICAgIC8vIGFsbG93cyBpbnB1dCBldmVudHMgdG8gYmUgcHJvY2Vz c2VkIGJlZm9yZSB3ZSBhcmUgYmFjayBoZXJlLgotICAgICAgICBpZiAoTW9ub3RvbmljVGltZTo6 bm93KCkgLSBzdGFydFRpbWUgPiBtYXhSdW5Mb29wU3VzcGVuc2lvblRpbWUgJiYgY3VycmVudFJ1 bkxvb3BJbkNvbW1vbk1vZGUoKSkgeworICAgICAgICBpZiAoTW9ub3RvbmljVGltZTo6bm93KCkg LSBzdGFydFRpbWUgPiBtYXhSdW5Mb29wU3VzcGVuc2lvblRpbWUpIHsKICAgICAgICAgICAgIHNj aGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAgICAgfQogfQogCi12b2lkIGNhbGxPbk1haW5UaHJlYWQoRnVuY3Rpb248 dm9pZCgpPiYmIGZ1bmN0aW9uLCBTY2hlZHVsZVBhaXJIYXNoU2V0KiBwYWlycykKK3ZvaWQgY2Fs bE9uTWFpblRocmVhZChGdW5jdGlvbjx2b2lkKCk+JiYgZnVuY3Rpb24pCiB7CiAgICAgQVNTRVJU KGZ1bmN0aW9uKTsKIApAQCAtMTU1LDcgKzE1NSw3IEBAIHZvaWQgY2FsbE9uTWFpblRocmVhZChG dW5jdGlvbjx2b2lkKCk+JiYKICAgICB9CiAKICAgICBpZiAobmVlZFRvU2NoZWR1bGUpCi0gICAg ICAgIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQocGFpcnMpOworICAgICAg ICBzY2hlZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKCk7CiB9CiAKIHZvaWQgc2V0 TWFpblRocmVhZENhbGxiYWNrc1BhdXNlZChib29sIHBhdXNlZCkKSW5kZXg6IFNvdXJjZS9XVEYv d3RmL01haW5UaHJlYWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9NYWluVGhyZWFk LmgJKHJldmlzaW9uIDIyNDkwNSkKKysrIFNvdXJjZS9XVEYvd3RmL01haW5UaHJlYWQuaAkod29y a2luZyBjb3B5KQpAQCAtMzksMTQgKzM5LDExIEBACiBuYW1lc3BhY2UgV1RGIHsKIAogY2xhc3Mg UHJpbnRTdHJlYW07Ci1jbGFzcyBTY2hlZHVsZVBhaXI7Ci1zdHJ1Y3QgU2NoZWR1bGVQYWlySGFz aDsKLXR5cGVkZWYgSGFzaFNldDxSZWZQdHI8U2NoZWR1bGVQYWlyPiwgU2NoZWR1bGVQYWlySGFz aD4gU2NoZWR1bGVQYWlySGFzaFNldDsKIAogLy8gTXVzdCBiZSBjYWxsZWQgZnJvbSB0aGUgbWFp biB0aHJlYWQuCiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBpbml0aWFsaXplTWFpblRocmVhZCgp OwogCi1XVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBjYWxsT25NYWluVGhyZWFkKEZ1bmN0aW9uPHZv aWQoKT4mJiwgU2NoZWR1bGVQYWlySGFzaFNldCogPSBudWxscHRyKTsKK1dURl9FWFBPUlRfUFJJ VkFURSB2b2lkIGNhbGxPbk1haW5UaHJlYWQoRnVuY3Rpb248dm9pZCgpPiYmKTsKIAogI2lmIFBM QVRGT1JNKENPQ09BKQogV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgY2FsbE9uV2ViVGhyZWFkT3JE aXNwYXRjaEFzeW5jT25NYWluVGhyZWFkKHZvaWQgKF5ibG9jaykoKSk7CkBAIC04NSw5ICs4Miw4 IEBAIFdURl9FWFBPUlRfUFJJVkFURSBib29sIGlzTWFpblRocmVhZE9yR0MKIAogLy8gTk9URTog dGhlc2UgZnVuY3Rpb25zIGFyZSBpbnRlcm5hbCB0byB0aGUgY2FsbE9uTWFpblRocmVhZCBpbXBs ZW1lbnRhdGlvbi4KIHZvaWQgaW5pdGlhbGl6ZU1haW5UaHJlYWRQbGF0Zm9ybSgpOwotdm9pZCBz Y2hlZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKFNjaGVkdWxlUGFpckhhc2hTZXQq ID0gbnVsbHB0cik7Cit2b2lkIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQo KTsKIHZvaWQgZGlzcGF0Y2hGdW5jdGlvbnNGcm9tTWFpblRocmVhZCgpOwotYm9vbCBjdXJyZW50 UnVuTG9vcEluQ29tbW9uTW9kZSgpOwogCiAjaWYgT1MoREFSV0lOKSAmJiAhVVNFKEdMSUIpCiAj aWYgIVVTRShXRUJfVEhSRUFEKQpJbmRleDogU291cmNlL1dURi93dGYvZ2VuZXJpYy9NYWluVGhy ZWFkR2VuZXJpYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ2VuZXJpYy9NYWlu VGhyZWFkR2VuZXJpYy5jcHAJKHJldmlzaW9uIDIyNDkwNSkKKysrIFNvdXJjZS9XVEYvd3RmL2dl bmVyaWMvTWFpblRocmVhZEdlbmVyaWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NywxMiArNjcs NyBAQCB2b2lkIGluaXRpYWxpemVNYWluVGhyZWFkUGxhdGZvcm0oKQogewogfQogCi1ib29sIGN1 cnJlbnRSdW5Mb29wSW5Db21tb25Nb2RlKCkKLXsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQotdm9p ZCBzY2hlZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKFNjaGVkdWxlUGFpckhhc2hT ZXQqKQordm9pZCBzY2hlZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKCkKIHsKICAg ICAvLyBVc2UgYSBSdW5Mb29wOjpUaW1lciBpbnN0ZWFkIG9mIFJ1bkxvb3A6OmRpc3BhdGNoKCkg dG8gYmUgYWJsZSB0byB1c2UgYSBkaWZmZXJlbnQgcHJpb3JpdHkgYW5kCiAgICAgLy8gYXZvaWQg dGhlIGRvdWJsZSBxdWV1ZSBiZWNhdXNlIGRpc3BhdGNoT25NYWluVGhyZWFkIGFsc28gcXVldWVz IHRoZSBmdW5jdGlvbnMuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5tbQkocmV2 aXNpb24gMjI0OTA3KQorKysgU291cmNlL1dURi93dGYvbWFjL01haW5UaHJlYWRNYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTEyMiwxNCArMTIyLDcgQEAgc3RhdGljIHZvaWQgcG9zdFRpbWVyKCkK ICAgICBDRlJ1bkxvb3BBZGRUaW1lcihDRlJ1bkxvb3BHZXRDdXJyZW50KCksIENGUnVuTG9vcFRp bWVyQ3JlYXRlKDAsIDAsIDAsIDAsIDAsIHRpbWVyRmlyZWQsIDApLCBrQ0ZSdW5Mb29wQ29tbW9u TW9kZXMpOwogfQogCi1ib29sIGN1cnJlbnRSdW5Mb29wSW5Db21tb25Nb2RlKCkKLXsKLSAgICBO U1N0cmluZyAqY3VycmVudE1vZGUgPSBbW05TUnVuTG9vcCBjdXJyZW50UnVuTG9vcF0gY3VycmVu dE1vZGVdOwotICAgIHJldHVybiBjdXJyZW50TW9kZSA9PSAoTlNTdHJpbmcgKilrQ0ZSdW5Mb29w Q29tbW9uTW9kZXMKLSAgICAgICAgfHwgY3VycmVudE1vZGUgPT0gKE5TU3RyaW5nICopa0NGUnVu TG9vcERlZmF1bHRNb2RlOwotfQotCi12b2lkIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1h aW5UaHJlYWQoU2NoZWR1bGVQYWlySGFzaFNldCogcGFpcnMpCit2b2lkIHNjaGVkdWxlRGlzcGF0 Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKQogewogICAgIEFTU0VSVChzdGF0aWNNYWluVGhyZWFk Q2FsbGVyKTsKIApAQCAtMTM3LDIzICsxMzAsMTUgQEAgdm9pZCBzY2hlZHVsZURpc3BhdGNoRnVu Y3Rpb25zT25NYWluVGhyZQogICAgICAgICBwb3N0VGltZXIoKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KLQotICAgIFJldGFpblB0cjxOU0FycmF5PE5TU3RyaW5nICo+PiBtb2RlczsKLSAgICBp ZiAocGFpcnMpIHsKLSAgICAgICAgbW9kZXMgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxs b2NdIGluaXRXaXRoQ2FwYWNpdHk6cGFpcnMtPnNpemUoKV0pOwotICAgICAgICBmb3IgKGF1dG8m IHBhaXIgOiAqcGFpcnMpCi0gICAgICAgICAgICBbKE5TTXV0YWJsZUFycmF5ICopbW9kZXMuZ2V0 KCkgYWRkT2JqZWN0OihOU1N0cmluZyAqKXBhaXItPm1vZGUoKV07Ci0gICAgfSBlbHNlCi0gICAg ICAgIG1vZGVzID0gQFsoTlNTdHJpbmcgKilrQ0ZSdW5Mb29wQ29tbW9uTW9kZXNdOwogICAgIAog ICAgIGlmIChtYWluVGhyZWFkRXN0YWJsaXNoZWRBc1B0aHJlYWRNYWluKSB7CiAgICAgICAgIEFT U0VSVCghbWFpblRocmVhZE5TVGhyZWFkKTsKLSAgICAgICAgW3N0YXRpY01haW5UaHJlYWRDYWxs ZXIgcGVyZm9ybVNlbGVjdG9yT25NYWluVGhyZWFkOkBzZWxlY3RvcihjYWxsKSB3aXRoT2JqZWN0 Om5pbCB3YWl0VW50aWxEb25lOk5PIG1vZGVzOm1vZGVzLmdldCgpXTsKKyAgICAgICAgW3N0YXRp Y01haW5UaHJlYWRDYWxsZXIgcGVyZm9ybVNlbGVjdG9yT25NYWluVGhyZWFkOkBzZWxlY3Rvcihj YWxsKSB3aXRoT2JqZWN0Om5pbCB3YWl0VW50aWxEb25lOk5PXTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAogICAgIEFTU0VSVChtYWluVGhyZWFkTlNUaHJlYWQpOwotICAgIFtzdGF0aWNNYWlu VGhyZWFkQ2FsbGVyIHBlcmZvcm1TZWxlY3RvcjpAc2VsZWN0b3IoY2FsbCkgb25UaHJlYWQ6bWFp blRocmVhZE5TVGhyZWFkIHdpdGhPYmplY3Q6bmlsIHdhaXRVbnRpbERvbmU6Tk8gbW9kZXM6bW9k ZXMuZ2V0KCldOworICAgIFtzdGF0aWNNYWluVGhyZWFkQ2FsbGVyIHBlcmZvcm1TZWxlY3RvcjpA c2VsZWN0b3IoY2FsbCkgb25UaHJlYWQ6bWFpblRocmVhZE5TVGhyZWFkIHdpdGhPYmplY3Q6bmls IHdhaXRVbnRpbERvbmU6Tk9dOwogfQogCiB2b2lkIGNhbGxPbldlYlRocmVhZE9yRGlzcGF0Y2hB c3luY09uTWFpblRocmVhZCh2b2lkICheYmxvY2spKCkpCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi93 aW4vTWFpblRocmVhZFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvd2luL01h aW5UaHJlYWRXaW4uY3BwCShyZXZpc2lvbiAyMjQ5MDUpCisrKyBTb3VyY2UvV1RGL3d0Zi93aW4v TWFpblRocmVhZFdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDExICs0OSw2IEBAIExSRVNV TFQgQ0FMTEJBQ0sgVGhyZWFkaW5nV2luZG93V25kUHJvYygKICAgICByZXR1cm4gMDsKIH0KIAot Ym9vbCBjdXJyZW50UnVuTG9vcEluQ29tbW9uTW9kZSgpCi17Ci0gICAgcmV0dXJuIHRydWU7Ci19 Ci0KIHZvaWQgaW5pdGlhbGl6ZU1haW5UaHJlYWRQbGF0Zm9ybSgpCiB7CiAgICAgaWYgKHRocmVh ZGluZ1dpbmRvd0hhbmRsZSkKQEAgLTcyLDcgKzY3LDcgQEAgdm9pZCBpbml0aWFsaXplTWFpblRo cmVhZFBsYXRmb3JtKCkKICAgICBUaHJlYWQ6OmluaXRpYWxpemVDdXJyZW50VGhyZWFkSW50ZXJu YWwoIk1haW4gVGhyZWFkIik7CiB9CiAKLXZvaWQgc2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09u TWFpblRocmVhZChTY2hlZHVsZVBhaXJIYXNoU2V0KikKK3ZvaWQgc2NoZWR1bGVEaXNwYXRjaEZ1 bmN0aW9uc09uTWFpblRocmVhZCgpCiB7CiAgICAgQVNTRVJUKHRocmVhZGluZ1dpbmRvd0hhbmRs ZSk7CiAgICAgUG9zdE1lc3NhZ2UodGhyZWFkaW5nV2luZG93SGFuZGxlLCB0aHJlYWRpbmdGaXJl ZE1lc3NhZ2UsIDAsIDApOwpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI0OTUyKQorKysgU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIw MTctMTEtMTYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBDbGVhbiB1cCBhZnRlciByMjI0OTUyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk4MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBKdXN0IHJlbW92aW5nIHNvbWUgbm93LXVudXNlZCBjb2Rl IGFuZCByZW5hbWluZyB0aGluZ3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9X ZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUubW06CisgICAgICAg IChjYWxsT25NYWluVGhyZWFkT3JQZXJmb3JtT25SdW5Mb29wKToKKyAgICAgICAgKC1bV2ViQ29y ZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246d2lsbFNl bmRSZXF1ZXN0OnJlZGlyZWN0UmVzcG9uc2U6XSk6CisgICAgICAgICgtW1dlYkNvcmVSZXNvdXJj ZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZSBjb25uZWN0aW9uOmRpZFJlY2VpdmVBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZVJlc291cmNlSGFuZGxl QXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246Y2FuQXV0aGVudGljYXRlQWdhaW5z dFByb3RlY3Rpb25TcGFjZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZVJlc291cmNlSGFuZGxlQXNP cGVyYXRpb25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246ZGlkUmVjZWl2ZVJlc3BvbnNlOl0pOgor ICAgICAgICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUg Y29ubmVjdGlvbjpkaWRSZWNlaXZlRGF0YTpsZW5ndGhSZWNlaXZlZDpdKToKKyAgICAgICAgKC1b V2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246 ZGlkU2VuZEJvZHlEYXRhOnRvdGFsQnl0ZXNXcml0dGVuOnRvdGFsQnl0ZXNFeHBlY3RlZFRvV3Jp dGU6XSk6CisgICAgICAgICgtW1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVE ZWxlZ2F0ZSBjb25uZWN0aW9uRGlkRmluaXNoTG9hZGluZzpdKToKKyAgICAgICAgKC1bV2ViQ29y ZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246ZGlkRmFp bFdpdGhFcnJvcjpdKToKKyAgICAgICAgKC1bV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRp b25RdWV1ZURlbGVnYXRlIGNvbm5lY3Rpb246d2lsbENhY2hlUmVzcG9uc2U6XSk6CisgICAgICAg IChjYWxsT25NYWluVGhyZWFkT3JTY2hlZHVsZSk6IERlbGV0ZWQuCisKIDIwMTctMTEtMTYgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVc2Ug UnVuTG9vcCBhbmQgTW9kZSBmcm9tIE5ldHdvcmtpbmdDb250ZXh0IGlmIHRoZXkgYXJlIGdpdmVu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlUmVzb3Vy Y2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVy YXRpb25RdWV1ZURlbGVnYXRlLm1tCShyZXZpc2lvbiAyMjQ5NTIpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1 ZXVlRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTUxLDE5ICs1MSwyMSBAQCBzdGF0aWMg U2NoZWR1bGVQYWlySGFzaFNldCogc2NoZWR1bGVkUnVuCiAgICAgcmV0dXJuIGhhbmRsZS0+Y29u dGV4dCgpLT5zY2hlZHVsZWRSdW5Mb29wUGFpcnMoKTsKIH0KIAotc3RhdGljIHZvaWQgY2FsbE9u TWFpblRocmVhZE9yU2NoZWR1bGUoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uLCBTY2hlZHVs ZVBhaXJIYXNoU2V0KiBwYWlycykKK3N0YXRpYyB2b2lkIGNhbGxPbk1haW5UaHJlYWRPclBlcmZv cm1PblJ1bkxvb3AoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uLCBTY2hlZHVsZVBhaXJIYXNo U2V0KiBwYWlycykKIHsKLSAgICBpZiAocGFpcnMgJiYgcGFpcnMtPnNpemUoKSkgewotICAgICAg ICBhdXRvIGJsb2NrID0gQmxvY2tQdHI8dm9pZCgpPjo6ZnJvbUNhbGxhYmxlKFthbHJlYWR5Q2Fs bGVkID0gZmFsc2UsIGZ1bmN0aW9uID0gV1RGTW92ZShmdW5jdGlvbildICgpIG11dGFibGUgewot ICAgICAgICAgICAgaWYgKGFscmVhZHlDYWxsZWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICAgICAgYWxyZWFkeUNhbGxlZCA9IHRydWU7Ci0gICAgICAgICAgICBmdW5jdGlvbigp OwotICAgICAgICB9KTsKLSAgICAgICAgZm9yIChhdXRvJiBwYWlyIDogKnBhaXJzKQotICAgICAg ICAgICAgQ0ZSdW5Mb29wUGVyZm9ybUJsb2NrKHBhaXItPnJ1bkxvb3AoKSwgcGFpci0+bW9kZSgp LCBibG9jay5nZXQoKSk7Ci0gICAgfSBlbHNlCisgICAgaWYgKCFwYWlycyB8fCAhcGFpcnMtPnNp emUoKSkgewogICAgICAgICBjYWxsT25NYWluVGhyZWFkKFdURk1vdmUoZnVuY3Rpb24pKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGF1dG8gYmxvY2sgPSBCbG9ja1B0cjx2b2lkKCk+ Ojpmcm9tQ2FsbGFibGUoW2FscmVhZHlDYWxsZWQgPSBmYWxzZSwgZnVuY3Rpb24gPSBXVEZNb3Zl KGZ1bmN0aW9uKV0gKCkgbXV0YWJsZSB7CisgICAgICAgIGlmIChhbHJlYWR5Q2FsbGVkKQorICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICBhbHJlYWR5Q2FsbGVkID0gdHJ1ZTsKKyAgICAgICAg ZnVuY3Rpb24oKTsKKyAgICB9KTsKKyAgICBmb3IgKGF1dG8mIHBhaXIgOiAqcGFpcnMpCisgICAg ICAgIENGUnVuTG9vcFBlcmZvcm1CbG9jayhwYWlyLT5ydW5Mb29wKCksIHBhaXItPm1vZGUoKSwg YmxvY2suZ2V0KCkpOwogfQogCiBAaW1wbGVtZW50YXRpb24gV2ViQ29yZVJlc291cmNlSGFuZGxl QXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlCkBAIC0xNDgsNyArMTUwLDcgQEAgLSAoTlNVUkxSZXF1 ZXN0ICopY29ubmVjdGlvbjooTlNVUkxDb25uZQogICAgIGlmIChtX21lc3NhZ2VRdWV1ZSkKICAg ICAgICAgbV9tZXNzYWdlUXVldWUtPmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEZ1bmN0aW9uPHZv aWQoKT4+KFdURk1vdmUod29yaykpKTsKICAgICBlbHNlCi0gICAgICAgIGNhbGxPbk1haW5UaHJl YWRPclNjaGVkdWxlKFdURk1vdmUod29yayksIHNjaGVkdWxlZFJ1bkxvb3BQYWlycyhtX2hhbmRs ZSkpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkT3JQZXJmb3JtT25SdW5Mb29wKFdURk1vdmUo d29yayksIHNjaGVkdWxlZFJ1bkxvb3BQYWlycyhtX2hhbmRsZSkpOwogCiAgICAgZGlzcGF0Y2hf c2VtYXBob3JlX3dhaXQobV9zZW1hcGhvcmUsIERJU1BBVENIX1RJTUVfRk9SRVZFUik7CiAgICAg cmV0dXJuIG1fcmVxdWVzdFJlc3VsdC5nZXQoKTsKQEAgLTE3Miw3ICsxNzQsNyBAQCAtICh2b2lk KWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNvCiAgICAgaWYgKG1fbWVzc2FnZVF1ZXVl KQogICAgICAgICBtX21lc3NhZ2VRdWV1ZS0+YXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8RnVuY3Rp b248dm9pZCgpPj4oV1RGTW92ZSh3b3JrKSkpOwogICAgIGVsc2UKLSAgICAgICAgY2FsbE9uTWFp blRocmVhZE9yU2NoZWR1bGUoV1RGTW92ZSh3b3JrKSwgc2NoZWR1bGVkUnVuTG9vcFBhaXJzKG1f aGFuZGxlKSk7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWRPclBlcmZvcm1PblJ1bkxvb3AoV1RG TW92ZSh3b3JrKSwgc2NoZWR1bGVkUnVuTG9vcFBhaXJzKG1faGFuZGxlKSk7CiB9CiAKIC0gKEJP T0wpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0aW9uICopY29ubmVjdGlvbiBjYW5BdXRoZW50aWNh dGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlOihOU1VSTFByb3RlY3Rpb25TcGFjZSAqKXByb3RlY3Rp b25TcGFjZQpAQCAtMTk0LDcgKzE5Niw3IEBAIC0gKEJPT0wpY29ubmVjdGlvbjooTlNVUkxDb25u ZWN0aW9uICopY28KICAgICBpZiAobV9tZXNzYWdlUXVldWUpCiAgICAgICAgIG1fbWVzc2FnZVF1 ZXVlLT5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxGdW5jdGlvbjx2b2lkKCk+PihXVEZNb3ZlKHdv cmspKSk7CiAgICAgZWxzZQotICAgICAgICBjYWxsT25NYWluVGhyZWFkT3JTY2hlZHVsZShXVEZN b3ZlKHdvcmspLCBzY2hlZHVsZWRSdW5Mb29wUGFpcnMobV9oYW5kbGUpKTsKKyAgICAgICAgY2Fs bE9uTWFpblRocmVhZE9yUGVyZm9ybU9uUnVuTG9vcChXVEZNb3ZlKHdvcmspLCBzY2hlZHVsZWRS dW5Mb29wUGFpcnMobV9oYW5kbGUpKTsKIAogICAgIGRpc3BhdGNoX3NlbWFwaG9yZV93YWl0KG1f c2VtYXBob3JlLCBESVNQQVRDSF9USU1FX0ZPUkVWRVIpOwogICAgIHJldHVybiBtX2Jvb2xSZXN1 bHQ7CkBAIC0yMzMsNyArMjM1LDcgQEAgLSAodm9pZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rp b24gKiljbwogICAgIGlmIChtX21lc3NhZ2VRdWV1ZSkKICAgICAgICAgbV9tZXNzYWdlUXVldWUt PmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEZ1bmN0aW9uPHZvaWQoKT4+KFdURk1vdmUod29yaykp KTsKICAgICBlbHNlCi0gICAgICAgIGNhbGxPbk1haW5UaHJlYWRPclNjaGVkdWxlKFdURk1vdmUo d29yayksIHNjaGVkdWxlZFJ1bkxvb3BQYWlycyhtX2hhbmRsZSkpOworICAgICAgICBjYWxsT25N YWluVGhyZWFkT3JQZXJmb3JtT25SdW5Mb29wKFdURk1vdmUod29yayksIHNjaGVkdWxlZFJ1bkxv b3BQYWlycyhtX2hhbmRsZSkpOwogCiAgICAgZGlzcGF0Y2hfc2VtYXBob3JlX3dhaXQobV9zZW1h cGhvcmUsIERJU1BBVENIX1RJTUVfRk9SRVZFUik7CiB9CkBAIC0yNjIsNyArMjY0LDcgQEAgLSAo dm9pZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rpb24gKiljbwogICAgIGlmIChtX21lc3NhZ2VR dWV1ZSkKICAgICAgICAgbV9tZXNzYWdlUXVldWUtPmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEZ1 bmN0aW9uPHZvaWQoKT4+KFdURk1vdmUod29yaykpKTsKICAgICBlbHNlCi0gICAgICAgIGNhbGxP bk1haW5UaHJlYWRPclNjaGVkdWxlKFdURk1vdmUod29yayksIHNjaGVkdWxlZFJ1bkxvb3BQYWly cyhtX2hhbmRsZSkpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkT3JQZXJmb3JtT25SdW5Mb29w KFdURk1vdmUod29yayksIHNjaGVkdWxlZFJ1bkxvb3BQYWlycyhtX2hhbmRsZSkpOwogfQogCiAt ICh2b2lkKWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNvbm5lY3Rpb24gZGlkU2VuZEJv ZHlEYXRhOihOU0ludGVnZXIpYnl0ZXNXcml0dGVuIHRvdGFsQnl0ZXNXcml0dGVuOihOU0ludGVn ZXIpdG90YWxCeXRlc1dyaXR0ZW4gdG90YWxCeXRlc0V4cGVjdGVkVG9Xcml0ZTooTlNJbnRlZ2Vy KXRvdGFsQnl0ZXNFeHBlY3RlZFRvV3JpdGUKQEAgLTI4Miw3ICsyODQsNyBAQCAtICh2b2lkKWNv bm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNvCiAgICAgaWYgKG1fbWVzc2FnZVF1ZXVlKQog ICAgICAgICBtX21lc3NhZ2VRdWV1ZS0+YXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8RnVuY3Rpb248 dm9pZCgpPj4oV1RGTW92ZSh3b3JrKSkpOwogICAgIGVsc2UKLSAgICAgICAgY2FsbE9uTWFpblRo cmVhZE9yU2NoZWR1bGUoV1RGTW92ZSh3b3JrKSwgc2NoZWR1bGVkUnVuTG9vcFBhaXJzKG1faGFu ZGxlKSk7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWRPclBlcmZvcm1PblJ1bkxvb3AoV1RGTW92 ZSh3b3JrKSwgc2NoZWR1bGVkUnVuTG9vcFBhaXJzKG1faGFuZGxlKSk7CiB9CiAKIC0gKHZvaWQp Y29ubmVjdGlvbkRpZEZpbmlzaExvYWRpbmc6KE5TVVJMQ29ubmVjdGlvbiAqKWNvbm5lY3Rpb24K QEAgLTMwNiw3ICszMDgsNyBAQCAtICh2b2lkKWNvbm5lY3Rpb25EaWRGaW5pc2hMb2FkaW5nOihO U1VSCiAgICAgaWYgKG1fbWVzc2FnZVF1ZXVlKQogICAgICAgICBtX21lc3NhZ2VRdWV1ZS0+YXBw ZW5kKHN0ZDo6bWFrZV91bmlxdWU8RnVuY3Rpb248dm9pZCgpPj4oV1RGTW92ZSh3b3JrKSkpOwog ICAgIGVsc2UKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZE9yU2NoZWR1bGUoV1RGTW92ZSh3b3Jr KSwgc2NoZWR1bGVkUnVuTG9vcFBhaXJzKG1faGFuZGxlKSk7CisgICAgICAgIGNhbGxPbk1haW5U aHJlYWRPclBlcmZvcm1PblJ1bkxvb3AoV1RGTW92ZSh3b3JrKSwgc2NoZWR1bGVkUnVuTG9vcFBh aXJzKG1faGFuZGxlKSk7CiB9CiAKIC0gKHZvaWQpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0aW9u ICopY29ubmVjdGlvbiBkaWRGYWlsV2l0aEVycm9yOihOU0Vycm9yICopZXJyb3IKQEAgLTMzMCw3 ICszMzIsNyBAQCAtICh2b2lkKWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNvCiAgICAg aWYgKG1fbWVzc2FnZVF1ZXVlKQogICAgICAgICBtX21lc3NhZ2VRdWV1ZS0+YXBwZW5kKHN0ZDo6 bWFrZV91bmlxdWU8RnVuY3Rpb248dm9pZCgpPj4oV1RGTW92ZSh3b3JrKSkpOwogICAgIGVsc2UK LSAgICAgICAgY2FsbE9uTWFpblRocmVhZE9yU2NoZWR1bGUoV1RGTW92ZSh3b3JrKSwgc2NoZWR1 bGVkUnVuTG9vcFBhaXJzKG1faGFuZGxlKSk7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWRPclBl cmZvcm1PblJ1bkxvb3AoV1RGTW92ZSh3b3JrKSwgc2NoZWR1bGVkUnVuTG9vcFBhaXJzKG1faGFu ZGxlKSk7CiB9CiAKIApAQCAtMzU0LDcgKzM1Niw3IEBAIC0gKE5TQ2FjaGVkVVJMUmVzcG9uc2Ug Kiljb25uZWN0aW9uOihOU1UKICAgICBpZiAobV9tZXNzYWdlUXVldWUpCiAgICAgICAgIG1fbWVz c2FnZVF1ZXVlLT5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxGdW5jdGlvbjx2b2lkKCk+PihXVEZN b3ZlKHdvcmspKSk7CiAgICAgZWxzZQotICAgICAgICBjYWxsT25NYWluVGhyZWFkT3JTY2hlZHVs ZShXVEZNb3ZlKHdvcmspLCBzY2hlZHVsZWRSdW5Mb29wUGFpcnMobV9oYW5kbGUpKTsKKyAgICAg ICAgY2FsbE9uTWFpblRocmVhZE9yUGVyZm9ybU9uUnVuTG9vcChXVEZNb3ZlKHdvcmspLCBzY2hl ZHVsZWRSdW5Mb29wUGFpcnMobV9oYW5kbGUpKTsKIAogICAgIGRpc3BhdGNoX3NlbWFwaG9yZV93 YWl0KG1fc2VtYXBob3JlLCBESVNQQVRDSF9USU1FX0ZPUkVWRVIpOwogICAgIHJldHVybiBtX2Nh Y2hlZFJlc3BvbnNlUmVzdWx0LmdldCgpOwo=