201961 2019-09-18 19:07:25 -0700 Decrease use of sessionID in WebLoaderStrategy 2019-09-18 21:03:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen aestes beidson commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1572189 0 cdumez 2019-09-18 19:07:25 -0700 Decrease use of sessionID in WebLoaderStrategy. 1572190 1 379094 cdumez 2019-09-18 19:08:06 -0700 Created attachment 379094 Patch 1572200 2 379094 ggaren 2019-09-18 19:30:47 -0700 Comment on attachment 379094 Patch r=me 1572236 3 379094 commit-queue 2019-09-18 21:02:20 -0700 Comment on attachment 379094 Patch Clearing flags on attachment: 379094 Committed r250081: <https://trac.webkit.org/changeset/250081> 1572237 4 commit-queue 2019-09-18 21:02:22 -0700 All reviewed patches have been landed. Closing bug. 1572238 5 webkit-bug-importer 2019-09-18 21:03:20 -0700 <rdar://problem/55505637> 379094 2019-09-18 19:08:06 -0700 2019-09-18 21:02:20 -0700 Patch bug-201961-20190918190805.patch text/plain 24830 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZkNjY2OTQ5MDNmMDI4NDMy MDIxN2Y4Y2U2NWExOWFjMzRhNWNiOWYuLmY3OWE2NjhiMzZhMGVkMzQ4NWJkZDQyM2UxODlkY2E4 ZDRiYzI2YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDktMTggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWNyZWFzZSB1c2Ugb2Ygc2Vzc2lv bklEIGluIFdlYkxvYWRlclN0cmF0ZWd5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDE5NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2UpOgor ICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnRyeUxvYWRpbmdVc2luZ1VSTFNjaGVtZUhh bmRsZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2Fk RnJvbU5ldHdvcmtQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29y ay9XZWJMb2FkZXJTdHJhdGVneS5oOgorCiAyMDE5LTA5LTE4ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBFYWdlcmx5IGNyZWF0ZSBhbmQgYWRkIHRoZSBt X2xheWVySG9zdGluZ1ZpZXcgdG8gV0tXZWJWaWV3LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDZjNGE0OTI0 OTk1MmE0OTE4NmM3ZTE4NzI3N2IwNzQ1YWU0N2U2MTMuLjBlNTJlYTIxODIxYjRiOTIzZmVhYTcw OGE5ZWFhZjVjNGU2ZmQwZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTc2LDggKzc2LDggQEAKICNpbmNs dWRlIDxXZWJDb3JlL1F1aWNrTG9vay5oPgogI2VuZGlmCiAKLSNkZWZpbmUgUkVMRUFTRV9MT0df SUZfQUxMT1dFRChwZXJtaXNzaW9uQ2hlY2tlciwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKHBl cm1pc3Npb25DaGVja2VyLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBOZXR3b3JrLCAiJXAg LSBXZWJMb2FkZXJTdHJhdGVneTo6IiBmbXQsIHRoaXMsICMjX19WQV9BUkdTX18pCi0jZGVmaW5l IFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQocGVybWlzc2lvbkNoZWNrZXIsIGZtdCwgLi4u KSBSRUxFQVNFX0xPR19FUlJPUl9JRihwZXJtaXNzaW9uQ2hlY2tlci5pc0Fsd2F5c09uTG9nZ2lu Z0FsbG93ZWQoKSwgTmV0d29yaywgIiVwIC0gV2ViTG9hZGVyU3RyYXRlZ3k6OiIgZm10LCB0aGlz LCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGZtdCwgLi4u KSBSRUxFQVNFX0xPR19JRihXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZXNzaW9uSUQoKS5pc0Fs d2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgTmV0d29yaywgIiVwIC0gV2ViTG9hZGVyU3RyYXRlZ3k6 OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBSRUxFQVNFX0xPR19FUlJPUl9J Rl9BTExPV0VEKGZtdCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUl9JRihXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5zZXNzaW9uSUQoKS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgTmV0d29yaywg IiVwIC0gV2ViTG9hZGVyU3RyYXRlZ3k6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAtOTcsNyArOTcs NyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2UoRnJhbWUmIGZyYW1lLCBD YWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UsIFJlcwogICAgICAgICBpZiAobG9hZGVyKQogICAgICAg ICAgICAgc2NoZWR1bGVMb2FkKCpsb2FkZXIsIHJlc291cmNlLmdldCgpLCByZWZlcnJlclBvbGlj eSA9PSBSZWZlcnJlclBvbGljeTo6Tm9SZWZlcnJlcldoZW5Eb3duZ3JhZGUpOwogICAgICAgICBl bHNlCi0gICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGZyYW1lLmdldCgpLCAibG9h ZFJlc291cmNlOiBVbmFibGUgdG8gY3JlYXRlIFN1YnJlc291cmNlTG9hZGVyIChmcmFtZSA9ICVw IiwgJmZyYW1lKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImxvYWRSZXNv dXJjZTogVW5hYmxlIHRvIGNyZWF0ZSBTdWJyZXNvdXJjZUxvYWRlciAoZnJhbWUgPSAlcCIsICZm cmFtZSk7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUobG9hZGVyKSk7CiAgICAg fSk7CiB9CkBAIC0xNjgsMTQgKzE2OCwxMyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hl ZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTG9hZGVyLCBDYWNoZWRSZXNvdQogICAg IHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQgPSBmcmFtZUxvYWRlckNsaWVudC5wYWdlSUQoKS52 YWx1ZU9yKFBhZ2VJZGVudGlmaWVyIHsgfSk7CiAgICAgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1l SUQgPSBmcmFtZUxvYWRlckNsaWVudC5mcmFtZUlEKCkudmFsdWVPcihGcmFtZUlkZW50aWZpZXIg eyB9KTsKICAgICB0cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCA9IGlkZW50aWZpZXI7Ci0g ICAgYXV0byBzZXNzaW9uSUQgPSBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZXNzaW9uSUQoKTsK IAogI2lmIEVOQUJMRShXRUJfQVJDSElWRSkgfHwgRU5BQkxFKE1IVE1MKQogICAgIC8vIElmIHRo ZSBEb2N1bWVudExvYWRlciBzY2hlZHVsZXMgdGhpcyBhcyBhbiBhcmNoaXZlIHJlc291cmNlIGxv YWQsCiAgICAgLy8gdGhlbiB3ZSBzaG91bGQgcmVtZW1iZXIgdGhlIFJlc291cmNlTG9hZGVyIGlu IG91ciByZWNvcmRzIGJ1dCBub3Qgc2NoZWR1bGUgaXQgaW4gdGhlIE5ldHdvcmtQcm9jZXNzLgog ICAgIGlmIChyZXNvdXJjZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5zY2hlZHVsZUFyY2hpdmVM b2FkKHJlc291cmNlTG9hZGVyLCByZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkpKSB7CiAgICAgICAg IExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQcm9jZXNzKSBXZWJMb2FkZXJTdHJhdGVneTo6 c2NoZWR1bGVMb2FkLCB1cmwgJyVzJyB3aWxsIGJlIGhhbmRsZWQgYXMgYW4gYXJjaGl2ZSByZXNv dXJjZS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAg ICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChyZXNvdXJjZUxvYWRlciwgInNjaGVkdWxlTG9h ZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhbiBhcmNoaXZlIHJlc291cmNlIChmcmFtZSA9ICVw LCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlE ID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0 ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2 NCgpLCBpZGVudGlmaWVyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1 bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGFzIGFuIGFyY2hpdmUgcmVzb3VyY2UgKGZyYW1l ID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291 cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1Bh cmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRv VUludDY0KCksIGlkZW50aWZpZXIpOwogICAgICAgICBtX3dlYlJlc291cmNlTG9hZGVycy5zZXQo aWRlbnRpZmllciwgV2ViUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShyZXNvdXJjZUxvYWRlciwgdHJh Y2tpbmdQYXJhbWV0ZXJzKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xODMsMTQgKzE4 MiwxNCBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQoUmVzb3VyY2VMb2Fk ZXImIHJlc291cmNlTG9hZGVyLCBDYWNoZWRSZXNvdQogCiAgICAgaWYgKHJlc291cmNlTG9hZGVy LmRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5YmVMb2FkUmVzb3Vy Y2UocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKSwgcmVzb3VyY2VMb2Fk ZXIucmVxdWVzdCgpLnVybCgpKSkgewogICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIo V2ViUHJvY2VzcykgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgdXJsICclcycgd2ls bCBiZSBsb2FkZWQgZnJvbSBhcHBsaWNhdGlvbiBjYWNoZS4iLCByZXNvdXJjZUxvYWRlci51cmwo KS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChyZXNvdXJjZUxvYWRlciwgInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgbG9hZGVkIGZyb20g YXBwbGljYXRpb24gY2FjaGUgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFt ZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxv YWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNr aW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOworICAgICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGxvYWRlZCBm cm9tIGFwcGxpY2F0aW9uIGNhY2hlIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwg ZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3Vy Y2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0 cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKICAgICAg ICAgbV93ZWJSZXNvdXJjZUxvYWRlcnMuc2V0KGlkZW50aWZpZXIsIFdlYlJlc291cmNlTG9hZGVy OjpjcmVhdGUocmVzb3VyY2VMb2FkZXIsIHRyYWNraW5nUGFyYW1ldGVycykpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCiAgICAgaWYgKHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS51cmwoKS5w cm90b2NvbElzRGF0YSgpKSB7CiAgICAgICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQ cm9jZXNzKSBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkLCB1cmwgJyVzJyB3aWxsIGJl IGxvYWRlZCBhcyBkYXRhLiIsIHJlc291cmNlTG9hZGVyLnVybCgpLnN0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKHJlc291cmNlTG9hZGVyLCAi c2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBsb2FkZWQgYXMgZGF0YSAoZnJhbWUgPSAlcCwgcGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5w YWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwg aWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9h ZDogVVJMIHdpbGwgYmUgbG9hZGVkIGFzIGRhdGEgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBS SXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIiki LCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUlu dDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIp OwogICAgICAgICBzdGFydExvY2FsTG9hZChyZXNvdXJjZUxvYWRlcik7CiAgICAgICAgIHJldHVy bjsKICAgICB9CkBAIC0xOTgsNyArMTk3LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2No ZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgQ2FjaGVkUmVzb3UKICNp ZiBVU0UoUVVJQ0tfTE9PSykKICAgICBpZiAoaXNRdWlja0xvb2tQcmV2aWV3VVJMKHJlc291cmNl TG9hZGVyLnJlcXVlc3QoKS51cmwoKSkpIHsKICAgICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5n LCAiKFdlYlByb2Nlc3MpIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMn IHdpbGwgYmUgaGFuZGxlZCBhcyBhIFF1aWNrTG9vayByZXNvdXJjZS4iLCByZXNvdXJjZUxvYWRl ci51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRChyZXNvdXJjZUxvYWRlciwgInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxl ZCBhcyBhIFF1aWNrTG9vayByZXNvdXJjZSAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0 ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJl c291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQo KSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7Cisg ICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUg aGFuZGxlZCBhcyBhIFF1aWNrTG9vayByZXNvdXJjZSAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIg UFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAi KSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9V SW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgaWRlbnRpZmll cik7CiAgICAgICAgIHN0YXJ0TG9jYWxMb2FkKHJlc291cmNlTG9hZGVyKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTIwOSwyMyArMjA4LDI0IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6 OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIENhY2hlZFJlc291 CiAgICAgLy8gaHR0cHM6Ly9ibG9ncy5nbm9tZS5vcmcvYWxleGwvMjAxMi8wMS8yNi9yZXNvdXJj ZXMtaW4tZ2xpYi8KICAgICBpZiAocmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnVybCgpLnByb3Rv Y29sSXMoInJlc291cmNlIikpIHsKICAgICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKFdl YlByb2Nlc3MpIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwg YmUgaGFuZGxlZCBhcyBhIEdSZXNvdXJjZS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChyZXNvdXJj ZUxvYWRlciwgInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIEdSZXNvdXJj ZSAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQg IiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRy YWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZy YW1lSUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIEdSZXNvdXJjZSAo ZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNr aW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1l SUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7CiAgICAgICAgIHN0YXJ0TG9jYWxMb2FkKHJlc291 cmNlTG9hZGVyKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbmRpZgogCiAjaWYgRU5BQkxF KFNFUlZJQ0VfV09SS0VSKQotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoISFyZXNvdXJjZUxv YWRlci5vcHRpb25zKCkuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIgJiYgcmVz b3VyY2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIHNjaGVkdWxlZCB0aHJvdWdo IFNlcnZpY2VXb3JrZXIgb3IgTmV0d29yayBQcm9jZXNzIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAl IiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0 ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50 b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlm aWVyKTsKKyAgICBpZiAoISFyZXNvdXJjZUxvYWRlci5vcHRpb25zKCkuc2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbklkZW50aWZpZXIpCisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNj aGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgc2NoZWR1bGVkIHRocm91Z2ggU2VydmljZVdvcmtlciBv ciBOZXR3b3JrIFByb2Nlc3MgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFt ZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxv YWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNr aW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwogCi0gICAgV2Vi U2VydmljZVdvcmtlclByb3ZpZGVyOjpzaW5nbGV0b24oKS5oYW5kbGVGZXRjaChyZXNvdXJjZUxv YWRlciwgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgW3RoaXMsIHRy YWNraW5nUGFyYW1ldGVycywgaWRlbnRpZmllciwgc2Vzc2lvbklELCBzaG91bGRDbGVhclJlZmVy cmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZSA9IG1heGltdW1C dWZmZXJpbmdUaW1lKHJlc291cmNlKSwgcmVzb3VyY2VMb2FkZXIgPSBtYWtlUmVmKHJlc291cmNl TG9hZGVyKV0gKFNlcnZpY2VXb3JrZXJDbGllbnRGZXRjaDo6UmVzdWx0IHJlc3VsdCkgbXV0YWJs ZSB7CisgICAgV2ViU2VydmljZVdvcmtlclByb3ZpZGVyOjpzaW5nbGV0b24oKS5oYW5kbGVGZXRj aChyZXNvdXJjZUxvYWRlciwgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVj dCwgW3RoaXMsIHRyYWNraW5nUGFyYW1ldGVycywgaWRlbnRpZmllciwgc2hvdWxkQ2xlYXJSZWZl cnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgbWF4aW11bUJ1ZmZlcmluZ1RpbWUgPSBtYXhpbXVt QnVmZmVyaW5nVGltZShyZXNvdXJjZSksIHJlc291cmNlTG9hZGVyID0gbWFrZVJlZihyZXNvdXJj ZUxvYWRlcildIChTZXJ2aWNlV29ya2VyQ2xpZW50RmV0Y2g6OlJlc3VsdCByZXN1bHQpIG11dGFi bGUgewogICAgICAgICBpZiAocmVzdWx0ICE9IFNlcnZpY2VXb3JrZXJDbGllbnRGZXRjaDo6UmVz dWx0OjpVbmhhbmRsZWQpIHsKICAgICAgICAgICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihX ZWJQcm9jZXNzKSBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkLCB1cmwgJyVzJyB3aWxs IGJlIHNjaGVkdWxlZCB0aHJvdWdoIFNlcnZpY2VXb3JrZXIgaGFuZGxlIGZldGNoIGFsZ29yaXRo bSIsIHJlc291cmNlTG9hZGVyLT51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOwotICAg ICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChyZXNvdXJjZUxvYWRlci5nZXQoKSwgInNj aGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgc2NoZWR1bGVkIHRocm91Z2ggU2VydmljZVdvcmtlciBo YW5kbGUgZmV0Y2ggYWxnb3JpdGhtIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwg ZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3Vy Y2VMb2FkZXItPmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwg dHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7CisgICAg ICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJl IHNjaGVkdWxlZCB0aHJvdWdoIFNlcnZpY2VXb3JrZXIgaGFuZGxlIGZldGNoIGFsZ29yaXRobSAo ZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLT5mcmFtZSgpLCB0cmFj a2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFt ZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB9CiAgICAgICAgIGlmIChyZXNvdXJjZUxvYWRlci0+b3B0aW9ucygpLnNlcnZpY2VXb3JrZXJz TW9kZSA9PSBTZXJ2aWNlV29ya2Vyc01vZGU6Ok9ubHkpIHsKLSAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SX0lGX0FMTE9XRUQocmVzb3VyY2VMb2FkZXIuZ2V0KCksICJzY2hlZHVsZUxvYWQ6 IHVuYWJsZSB0byBzY2hlZHVsZSBVUkwgdGhyb3VnaCBTZXJ2aWNlV29ya2VyIGhhbmRsZSBmZXRj aCBhbGdvcml0aG0gKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0g JSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci0+ ZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1Bh cmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKKyAgICAgICAgICAgIFJF TEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogdW5hYmxlIHRvIHNjaGVk dWxlIFVSTCB0aHJvdWdoIFNlcnZpY2VXb3JrZXIgaGFuZGxlIGZldGNoIGFsZ29yaXRobSAoZnJh bWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVz b3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLT5mcmFtZSgpLCB0cmFja2lu Z1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlE LnRvVUludDY0KCksIGlkZW50aWZpZXIpOwogICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChb cmVzb3VyY2VMb2FkZXIgPSBXVEZNb3ZlKHJlc291cmNlTG9hZGVyKV0gewogICAgICAgICAgICAg ICAgIGF1dG8gZXJyb3IgPSBpbnRlcm5hbEVycm9yKHJlc291cmNlTG9hZGVyLT5yZXF1ZXN0KCku dXJsKCkpOwogICAgICAgICAgICAgICAgIGVycm9yLnNldFR5cGUoUmVzb3VyY2VFcnJvcjo6VHlw ZTo6Q2FuY2VsbGF0aW9uKTsKQEAgLTIzNSwyMCArMjM1LDIwIEBAIHZvaWQgV2ViTG9hZGVyU3Ry YXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIENhY2hl ZFJlc291CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIVdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LndlYkxvYWRlclN0cmF0ZWd5KCkudHJ5TG9hZGluZ1VzaW5nVVJMU2NoZW1lSGFuZGxlcihyZXNv dXJjZUxvYWRlcikpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQocmVzb3Vy Y2VMb2FkZXIuZ2V0KCksICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIHNjaGVkdWxlZCB3aXRo IHRoZSBOZXR3b3JrUHJvY2VzcyAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy YW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNl TG9hZGVyLT5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRy YWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwotICAgICAg ICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkud2ViTG9hZGVyU3RyYXRlZ3koKS5zY2hlZHVs ZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIuZ2V0KCksIHJlc291cmNlTG9h ZGVyLT5yZXF1ZXN0KCksIHRyYWNraW5nUGFyYW1ldGVycywgc2Vzc2lvbklELCBzaG91bGRDbGVh clJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZSk7Cisg ICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxs IGJlIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyAoZnJhbWUgPSAlcCwgcGFnZUlE ID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBS SXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLT5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFn ZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlk ZW50aWZpZXIpOworICAgICAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkud2ViTG9hZGVy U3RyYXRlZ3koKS5zY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIu Z2V0KCksIHJlc291cmNlTG9hZGVyLT5yZXF1ZXN0KCksIHRyYWNraW5nUGFyYW1ldGVycywgc2hv dWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgbWF4aW11bUJ1ZmZlcmluZ1Rp bWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChyZXNvdXJjZUxvYWRlci5nZXQoKSwgInNjaGVkdWxlTG9hZDogVVJMIG5v dCBoYW5kbGVkIGJ5IGFueSBoYW5kbGVycyAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0 ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJl c291cmNlTG9hZGVyLT5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0 KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwor ICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCBub3QgaGFu ZGxlZCBieSBhbnkgaGFuZGxlcnMgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBm cmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJj ZUxvYWRlci0+ZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0 cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKICAgICB9 KTsKICNlbHNlCiAgICAgaWYgKCF0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKHJlc291 cmNlTG9hZGVyKSkgewotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKHJlc291cmNlTG9h ZGVyLCAic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBzY2hlZHVsZWQgd2l0aCB0aGUgTmV0d29y a1Byb2Nlc3MgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFt ZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1l dGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwotICAgICAgICBzY2hlZHVsZUxv YWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9hZGVyLnJlcXVl c3QoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzZXNzaW9uSUQsIHNob3VsZENsZWFyUmVmZXJyZXJP bkhUVFBTVG9IVFRQUmVkaXJlY3QsIG1heGltdW1CdWZmZXJpbmdUaW1lKHJlc291cmNlKSk7Cisg ICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUg c2NoZWR1bGVkIHdpdGggdGhlIE5ldHdvcmtQcm9jZXNzIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAl IiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0 ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50 b1VJbnQ2NCgpLCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlm aWVyKTsKKyAgICAgICAgc2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKHJlc291cmNlTG9h ZGVyLCByZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCksIHRyYWNraW5nUGFyYW1ldGVycywgc2hvdWxk Q2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgbWF4aW11bUJ1ZmZlcmluZ1RpbWUo cmVzb3VyY2UpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKHJlc291cmNlTG9hZGVyLCAic2NoZWR1bGVMb2FkOiBVUkwgbm90IGhhbmRsZWQgYnkg YW55IGhhbmRsZXJzIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9 ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIu ZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFja2luZ1Bh cmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKKyAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCBub3QgaGFuZGxlZCBieSBhbnkgaGFuZGxl cnMgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0 ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0 cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5m cmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwogI2VuZGlmCiB9CiAKQEAgLTI2MCw3ICsy NjAsNyBAQCBib29sIFdlYkxvYWRlclN0cmF0ZWd5Ojp0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVI YW5kbGVyKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZQogICAgIGlmICh3ZWJQYWdlKSB7CiAgICAg ICAgIGlmIChhdXRvKiBoYW5kbGVyID0gd2ViUGFnZS0+dXJsU2NoZW1lSGFuZGxlckZvclNjaGVt ZShyZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkudXJsKCkucHJvdG9jb2woKS50b1N0cmluZ1dpdGhv dXRDb3B5aW5nKCkpKSB7CiAgICAgICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIoV2Vi UHJvY2VzcykgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgVVJMICclcycgd2lsbCBi ZSBoYW5kbGVkIGJ5IGEgVUlQcm9jZXNzIFVSTCBzY2hlbWUgaGFuZGxlci4iLCByZXNvdXJjZUxv YWRlci51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQocmVzb3VyY2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJl IGhhbmRsZWQgYnkgYSBVSVByb2Nlc3MgVVJMIHNjaGVtZSBoYW5kbGVyIChmcmFtZSA9ICVwLCBy ZXNvdXJjZUlEID0gJWx1KSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHJlc291cmNlTG9hZGVy LmlkZW50aWZpZXIoKSk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hl ZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGhhbmRsZWQgYnkgYSBVSVByb2Nlc3MgVVJMIHNjaGVtZSBo YW5kbGVyIChmcmFtZSA9ICVwLCByZXNvdXJjZUlEID0gJWx1KSIsIHJlc291cmNlTG9hZGVyLmZy YW1lKCksIHJlc291cmNlTG9hZGVyLmlkZW50aWZpZXIoKSk7CiAKICAgICAgICAgICAgIGhhbmRs ZXItPnN0YXJ0TmV3VGFzayhyZXNvdXJjZUxvYWRlcik7CiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKQEAgLTI2OSw3ICsyNjksNyBAQCBib29sIFdlYkxvYWRlclN0cmF0ZWd5Ojp0cnlMb2FkaW5n VXNpbmdVUkxTY2hlbWVIYW5kbGVyKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZQogICAgIHJldHVy biBmYWxzZTsKIH0KIAotdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5l dHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJSZXNvdXJjZUxvYWRlcjo6VHJhY2tpbmdQYXJh bWV0ZXJzJiB0cmFja2luZ1BhcmFtZXRlcnMsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgYm9v bCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBTZWNvbmRzIG1heGlt dW1CdWZmZXJpbmdUaW1lKQordm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJv bU5ldHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJSZXNvdXJjZUxvYWRlcjo6VHJhY2tpbmdQ YXJhbWV0ZXJzJiB0cmFja2luZ1BhcmFtZXRlcnMsIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9u SFRUUFNUb0hUVFBSZWRpcmVjdCwgU2Vjb25kcyBtYXhpbXVtQnVmZmVyaW5nVGltZSkKIHsKICAg ICBSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlkZW50aWZpZXIgPSByZXNvdXJjZUxvYWRlci5pZGVu dGlmaWVyKCk7CiAgICAgQVNTRVJUKGlkZW50aWZpZXIpOwpAQCAtMzQyLDcgKzM0Miw3IEBAIHZv aWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2VzcyhSZXNv dXJjZUxvYWRlciYgcmVzb3VyY2VMCiAgICAgaWYgKGxvYWRQYXJhbWV0ZXJzLm9wdGlvbnMubW9k ZSAhPSBGZXRjaE9wdGlvbnM6Ok1vZGU6Ok5hdmlnYXRlKSB7CiAgICAgICAgIEFTU0VSVChsb2Fk UGFyYW1ldGVycy5zb3VyY2VPcmlnaW4pOwogICAgICAgICBpZiAoIWxvYWRQYXJhbWV0ZXJzLnNv dXJjZU9yaWdpbikgewotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChy ZXNvdXJjZUxvYWRlciwgInNjaGVkdWxlTG9hZDogbm8gc291cmNlT3JpZ2luIChmcmFtZSA9ICVw LCBwcmlvcml0eSA9ICVkLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2 NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwg c3RhdGljX2Nhc3Q8aW50PihyZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkucHJpb3JpdHkoKSksIGxv YWRQYXJhbWV0ZXJzLndlYlBhZ2VJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy53ZWJGcmFt ZUlELnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIpOworICAgICAgICAgICAg UkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBubyBzb3VyY2VPcmln aW4gKGZyYW1lID0gJXAsIHByaW9yaXR5ID0gJWQsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFt ZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxv YWRlci5mcmFtZSgpLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS5w cmlvcml0eSgpKSwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlELnRvVUludDY0KCksIGxvYWRQYXJh bWV0ZXJzLndlYkZyYW1lSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcik7 CiAgICAgICAgICAgICBzY2hlZHVsZUludGVybmFsbHlGYWlsZWRMb2FkKHJlc291cmNlTG9hZGVy KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMzY1LDkgKzM2NSw5IEBAIHZv aWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2VzcyhSZXNv dXJjZUxvYWRlciYgcmVzb3VyY2VMCiAKICAgICBBU1NFUlQoKGxvYWRQYXJhbWV0ZXJzLndlYlBh Z2VJRCAmJiBsb2FkUGFyYW1ldGVycy53ZWJGcmFtZUlEKSB8fCBsb2FkUGFyYW1ldGVycy5jbGll bnRDcmVkZW50aWFsUG9saWN5ID09IENsaWVudENyZWRlbnRpYWxQb2xpY3k6OkNhbm5vdEFza0Ns aWVudEZvckNyZWRlbnRpYWxzKTsKIAotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQocmVzb3Vy Y2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFJlc291cmNlIGlzIGJlaW5nIHNjaGVkdWxlZCB3aXRo IHRoZSBOZXR3b3JrUHJvY2VzcyAoZnJhbWUgPSAlcCwgcHJpb3JpdHkgPSAlZCwgcGFnZUlEID0g JSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2 NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VM b2FkZXIucmVxdWVzdCgpLnByaW9yaXR5KCkpLCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9V SW50NjQoKSwgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1l dGVycy5pZGVudGlmaWVyKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxv YWQ6IFJlc291cmNlIGlzIGJlaW5nIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyAo ZnJhbWUgPSAlcCwgcHJpb3JpdHkgPSAlZCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQg PSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVy LmZyYW1lKCksIHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnByaW9y aXR5KCkpLCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRl cnMud2ViRnJhbWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyKTsKICAg ICBpZiAoIVdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVj dGlvbigpLmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6U2NoZWR1bGVSZXNvdXJjZUxvYWQobG9hZFBhcmFtZXRlcnMpLCAwKSkgewotICAg ICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKHJlc291cmNlTG9hZGVyLCAic2NoZWR1 bGVMb2FkOiBVbmFibGUgdG8gc2NoZWR1bGUgcmVzb3VyY2Ugd2l0aCB0aGUgTmV0d29ya1Byb2Nl c3MgKGZyYW1lID0gJXAsIHByaW9yaXR5ID0gJWQsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFt ZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxv YWRlci5mcmFtZSgpLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS5w cmlvcml0eSgpKSwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlELnRvVUludDY0KCksIGxvYWRQYXJh bWV0ZXJzLndlYkZyYW1lSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcik7 CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVW5h YmxlIHRvIHNjaGVkdWxlIHJlc291cmNlIHdpdGggdGhlIE5ldHdvcmtQcm9jZXNzIChmcmFtZSA9 ICVwLCBwcmlvcml0eSA9ICVkLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBS SXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUo KSwgc3RhdGljX2Nhc3Q8aW50PihyZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkucHJpb3JpdHkoKSks IGxvYWRQYXJhbWV0ZXJzLndlYlBhZ2VJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy53ZWJG cmFtZUlELnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIpOwogICAgICAgICAv LyBXZSBwcm9iYWJseSBmYWlsZWQgdG8gc2NoZWR1bGUgdGhpcyBsb2FkIHdpdGggdGhlIE5ldHdv cmtQcm9jZXNzIGJlY2F1c2UgaXQgaGFkIGNyYXNoZWQuCiAgICAgICAgIC8vIFRoaXMgbG9hZCB3 aWxsIG5ldmVyIHN1Y2NlZWQgc28gd2Ugd2lsbCBzY2hlZHVsZSBpdCB0byBmYWlsIGFzeW5jaHJv bm91c2x5LgogICAgICAgICBzY2hlZHVsZUludGVybmFsbHlGYWlsZWRMb2FkKHJlc291cmNlTG9h ZGVyKTsKQEAgLTUzOSwxNyArNTM5LDE2IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OmxvYWRS ZXNvdXJjZVN5bmNocm9ub3VzbHkoRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCB1bnNpCiAgICAg YXV0byB3ZWJQYWdlUHJveHlJRCA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT53ZWJQYWdlUHJveHlJZGVu dGlmaWVyKCkgOiBXZWJQYWdlUHJveHlJZGVudGlmaWVyIHsgfTsKICAgICBhdXRvIHBhZ2VJRCA9 IHdlYlBhZ2UgPyB3ZWJQYWdlLT5pZGVudGlmaWVyKCkgOiBQYWdlSWRlbnRpZmllciB7IH07CiAg ICAgYXV0byBmcmFtZUlEID0gd2ViRnJhbWUgPyB3ZWJGcmFtZS0+ZnJhbWVJRCgpIDogRnJhbWVJ ZGVudGlmaWVyIHsgfTsKLSAgICBhdXRvIHNlc3Npb25JRCA9IHdlYlBhZ2UgPyB3ZWJQYWdlLT5z ZXNzaW9uSUQoKSA6IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7CiAKICAgICBh dXRvKiBkb2N1bWVudCA9IGZyYW1lTG9hZGVyLmZyYW1lKCkuZG9jdW1lbnQoKTsKICAgICBpZiAo IWRvY3VtZW50KSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoc2Vzc2lv bklELCAibG9hZFJlc291cmNlU3luY2hyb25vdXNseTogbm8gZG9jdW1lbnQgKHBhZ2VJRCA9ICUi IFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlbHUpIiwgcGFn ZUlELnRvVUludDY0KCksIGZyYW1lSUQudG9VSW50NjQoKSwgcmVzb3VyY2VMb2FkSWRlbnRpZmll cik7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImxvYWRSZXNvdXJjZVN5 bmNocm9ub3VzbHk6IG5vIGRvY3VtZW50IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9 ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJWx1KSIsIHBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFt ZUlELnRvVUludDY0KCksIHJlc291cmNlTG9hZElkZW50aWZpZXIpOwogICAgICAgICBlcnJvciA9 IGludGVybmFsRXJyb3IocmVxdWVzdC51cmwoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK ICAgICBpZiAoYXV0byBzeW5jTG9hZFJlc3VsdCA9IHRyeUxvYWRpbmdTeW5jaHJvbm91c2x5VXNp bmdVUkxTY2hlbWVIYW5kbGVyKGZyYW1lTG9hZGVyLCByZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBy ZXF1ZXN0KSkgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKHNlc3Npb25J RCwgImxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHk6IGZhaWxlZCBjYWxsaW5nIHRyeUxvYWRpbmdT eW5jaHJvbm91c2x5VXNpbmdVUkxTY2hlbWVIYW5kbGVyIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwg ZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJWx1LCBlcnJvciA9ICVkKSIsIHBh Z2VJRC50b1VJbnQ2NCgpLCBmcmFtZUlELnRvVUludDY0KCksIHJlc291cmNlTG9hZElkZW50aWZp ZXIsIHN5bmNMb2FkUmVzdWx0LT5lcnJvci5lcnJvckNvZGUoKSk7CisgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SX0lGX0FMTE9XRUQoImxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHk6IGZhaWxlZCBj YWxsaW5nIHRyeUxvYWRpbmdTeW5jaHJvbm91c2x5VXNpbmdVUkxTY2hlbWVIYW5kbGVyIChwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJWx1 LCBlcnJvciA9ICVkKSIsIHBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFtZUlELnRvVUludDY0KCksIHJl c291cmNlTG9hZElkZW50aWZpZXIsIHN5bmNMb2FkUmVzdWx0LT5lcnJvci5lcnJvckNvZGUoKSk7 CiAgICAgICAgIGVycm9yID0gV1RGTW92ZShzeW5jTG9hZFJlc3VsdC0+ZXJyb3IpOwogICAgICAg ICByZXNwb25zZSA9IFdURk1vdmUoc3luY0xvYWRSZXN1bHQtPnJlc3BvbnNlKTsKICAgICAgICAg ZGF0YSA9IFdURk1vdmUoc3luY0xvYWRSZXN1bHQtPmRhdGEpOwpAQCAtNTg5LDcgKzU4OCw3IEBA IHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoRnJhbWVM b2FkZXImIGZyYW1lTG9hZGVyLCB1bnNpCiAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3NQb29s OjpTZXRXZWJQcm9jZXNzSGFzVXBsb2FkcyB7IFByb2Nlc3M6OmlkZW50aWZpZXIoKSB9LCAwKTsK IAogICAgIGlmICghV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmRTeW5jKE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVj dGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9hZChsb2FkUGFyYW1ldGVycyks IE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9u b3VzTG9hZDo6UmVwbHkoZXJyb3IsIHJlc3BvbnNlLCBkYXRhKSwgMCkpIHsKLSAgICAgICAgUkVM RUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChzZXNzaW9uSUQsICJsb2FkUmVzb3VyY2VTeW5jaHJv bm91c2x5OiBmYWlsZWQgc2VuZGluZyBzeW5jaHJvbm91cyBuZXR3b3JrIHByb2Nlc3MgbWVzc2Fn ZSAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJ RCA9ICVsdSkiLCBwYWdlSUQudG9VSW50NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCByZXNvdXJj ZUxvYWRJZGVudGlmaWVyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgi bG9hZFJlc291cmNlU3luY2hyb25vdXNseTogZmFpbGVkIHNlbmRpbmcgc3luY2hyb25vdXMgbmV0 d29yayBwcm9jZXNzIG1lc3NhZ2UgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0ICIsIHJlc291cmNlSUQgPSAlbHUpIiwgcGFnZUlELnRvVUludDY0KCksIGZyYW1lSUQu dG9VSW50NjQoKSwgcmVzb3VyY2VMb2FkSWRlbnRpZmllcik7CiAgICAgICAgIGlmIChhdXRvKiBw YWdlID0gd2ViUGFnZSA/IHdlYlBhZ2UtPmNvcmVQYWdlKCkgOiBudWxscHRyKQogICAgICAgICAg ICAgcGFnZS0+ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZShX ZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmludGVybmFsRXJyb3JLZXkoKSwgV2ViQ29y ZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpzeW5jaHJvbm91c01lc3NhZ2VGYWlsZWRLZXkoKSwg V2ViQ29yZTo6U2hvdWxkU2FtcGxlOjpObyk7CiAgICAgICAgIHJlc3BvbnNlID0gUmVzb3VyY2VS ZXNwb25zZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViTG9hZGVyU3RyYXRlZ3kuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmgKaW5kZXggYzlhMTE4ZmMzNWQxMTllYzBiZmRhMzMyYWU5Yjc5Mjky Zjk4OGRlMi4uYjI0NzhhYjUwZDE0MDA5ZGI0NWM2MjkxN2I5Yzc0OGE1NWExYWIyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3ku aAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVn eS5oCkBAIC03OSw3ICs3OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZFVSTFNjaGVtZVRhc2tQ cm94eShXZWJVUkxTY2hlbWVUYXNrUHJveHkmKTsKICAgICB2b2lkIHJlbW92ZVVSTFNjaGVtZVRh c2tQcm94eShXZWJVUkxTY2hlbWVUYXNrUHJveHkmKTsKIAotICAgIHZvaWQgc2NoZWR1bGVMb2Fk RnJvbU5ldHdvcmtQcm9jZXNzKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyJiwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViUmVzb3VyY2VMb2FkZXI6OlRyYWNraW5nUGFy YW1ldGVycyYsIFBBTDo6U2Vzc2lvbklELCBib29sIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBT VG9IVFRQUmVkaXJlY3QsIFNlY29uZHMgbWF4aW11bUJ1ZmZlcmluZ1RpbWUpOworICAgIHZvaWQg c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyJiwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViUmVzb3VyY2VMb2FkZXI6 OlRyYWNraW5nUGFyYW1ldGVycyYsIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hU VFBSZWRpcmVjdCwgU2Vjb25kcyBtYXhpbXVtQnVmZmVyaW5nVGltZSk7CiAKICAgICBib29sIGlz T25MaW5lKCkgY29uc3QgZmluYWw7CiAgICAgdm9pZCBhZGRPbmxpbmVTdGF0ZUNoYW5nZUxpc3Rl bmVyKEZ1bmN0aW9uPHZvaWQoYm9vbCk+JiYpIGZpbmFsOwo=