236651 2022-02-15 10:11:06 -0800 Share WebKitTestRunner code among USE(LIBWPE) ports 2022-02-16 05:55:17 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead annulen aperez ews-watchlist gyuyoung.kim ryuan.choi sergio webkit-bug-importer zdobersek oldest_to_newest 1841778 0 don.olmstead 2022-02-15 10:11:06 -0800 The PlatformWebView and EventSenderProxy implementations just use libwpe directly. 1841803 1 452053 don.olmstead 2022-02-15 10:47:30 -0800 Created attachment 452053 Patch 1841807 2 452054 don.olmstead 2022-02-15 10:50:52 -0800 Created attachment 452054 Patch 1841821 3 452060 don.olmstead 2022-02-15 11:13:39 -0800 Created attachment 452060 Patch 1841826 4 452061 don.olmstead 2022-02-15 11:18:07 -0800 Created attachment 452061 Patch 1841926 5 don.olmstead 2022-02-15 13:49:12 -0800 AppleWin doesn't use WebKitTestRunner so the failure is unrelated to this change. 1842139 6 452061 zdobersek 2022-02-15 22:47:04 -0800 Comment on attachment 452061 Patch LGTM. 1842255 7 ews-feeder 2022-02-16 05:54:22 -0800 Committed r289887 (247325@main): <https://commits.webkit.org/247325@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452061. 1842256 8 webkit-bug-importer 2022-02-16 05:55:17 -0800 <rdar://problem/89021314> 452053 2022-02-15 10:47:30 -0800 2022-02-15 11:07:43 -0800 Patch bug-236651.diff text/plain 9021 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNDU3 ZTRmN2M0OTcuLjU0NTNjMTE3MTViYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTE1ICBEb24gT2xtc3Rl YWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgU2hhcmUgV2ViS2l0VGVzdFJ1 bm5lciBjb2RlIGFtb25nIFVTRShMSUJXUEUpIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkgUExBVEZPUk0oV1BFKSB0byBVU0UoTElC V1BFKSBpbiBFdmVudFNlbmRlclByb3h5IGFuZCBQbGF0Zm9ybVdlYlZpZXcuIFRoZSBmb3JtZXIK KyAgICAgICAganVzdCB1c2VzIHRoZSBsaWJ3cGUgQVBJIHRvIHNlbmQgZXZlbnRzIHNvIGl0IGNh biBiZSBzaGFyZWQuIFRoZSBsYXRlciB1c2VzIHRoZQorICAgICAgICBXUEVUb29saW5nQmFja2Vu ZCBzbyBpdCBjYW4gYWxzbyBiZSBzaGFyZWQuCisKKyAgICAgICAgVGhlIFdQRSBwb3J0IHdhcyBt aXNzaW5nIGd1YXJkcyBhcm91bmQgRU5BQkxFKFRPVUNIX0VWRU5UUykgc28gYWRkIHRob3NlIGFu ZCBvcmdhbml6ZSB0aGUKKyAgICAgICAgY29ycmVzcG9uZGluZyAuY3BwIHNvIHRoZSBtZXRob2Rz IHRyYWNrIHdpdGggdGhlIG9yZGVyaW5nIGluIHRoZSBoZWFkZXIuCisKKyAgICAgICAgQWxzbyBt b2Rlcm5pemUgdGhlIFBsYXRmb3JtV2ViVmlldyBjb2RlIHRvIHByZWZlciB1c2luZyBvdmVyIHR5 cGVkZWYuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlOgorICAgICAgICAq IFdlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3Lmg6CisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9saWJ3cGUvRXZlbnRTZW5kZXJQcm94eUxpYldQRS5jcHA6IFJlbmFtZWQgZnJvbSBU b29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcC4KKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Z2V0VXBkYXRlZFRvdWNoRXZlbnRzKToKKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKToKKyAg ICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVu dCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJWaWV3TGli V1BFLmNwcDogUmVuYW1lZCBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3BlL1BsYXRmb3Jt V2ViVmlld1dQRS5jcHAuCisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6d2luZG93U25h cHNob3RJbWFnZSk6CisKIDIwMjItMDItMTQgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgogCiAgICAgICAgIFtFV1NdIE5lZWQgL2Jpbi9zaCBlcXVpdmFsZW50IG9uIHdpbmNh aXJvCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHku aCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCmluZGV4IGFkYjlj M2QyMzkyMy4uZGNlYTg1M2MxZGY3IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0V2ZW50U2VuZGVyUHJveHkuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2Vu ZGVyUHJveHkuaApAQCAtMzIsNyArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgVVNFKExJ QldQRSkKICNpbmNsdWRlIDx3cGUvd3BlLmg+CiAjZW5kaWYKIApAQCAtMTMwLDcgKzEzMCw3IEBA IHByaXZhdGU6CiAgICAgUmV0YWluUHRyPE5TRXZlbnQ+IHByZXNzdXJlQ2hhbmdlRXZlbnQoaW50 IHN0YWdlLCBmbG9hdCBwcmVzc3VyZSwgUHJlc3N1cmVDaGFuZ2VEaXJlY3Rpb24pOwogI2VuZGlm CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgVVNFKExJ QldQRSkKICAgICBWZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGdldFVw ZGF0ZWRUb3VjaEV2ZW50cygpOwogICAgIHZvaWQgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7 CiAgICAgdm9pZCBwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0gd3BlX2lucHV0X3Rv dWNoX2V2ZW50X3R5cGUpOwpAQCAtMTU1LDExICsxNTUsMTMgQEAgcHJpdmF0ZToKICNpZiBQTEFU Rk9STShHVEspCiAgICAgYm9vbCBtX2hhc1ByZWNpc2VEZWx0YXMgeyBmYWxzZSB9OwogI2VuZGlm Ci0jaWYgUExBVEZPUk0oV1BFKQorI2lmIFVTRShMSUJXUEUpCiAgICAgdWludDMyX3QgbV9idXR0 b25TdGF0ZSB7IDAgfTsKKyNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgIFZlY3RvcjxzdHJ1 Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50X3Jhdz4gbV90b3VjaEV2ZW50czsKICAgICBIYXNoU2V0 PHVuc2lnbmVkLCBEZWZhdWx0SGFzaDx1bnNpZ25lZD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tl eUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBtX3VwZGF0ZWRUb3VjaEV2ZW50czsKICNlbmRpZgorI2Vu ZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXVFIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRm b3JtV1BFLmNtYWtlCmluZGV4IDIwMTRiYTJlMTE2NC4uZjZiNTlkYjNjMGVlIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UKQEAgLTYsOCArNiw5IEBAIGxpc3QoQVBQ RU5EIFdlYktpdFRlc3RSdW5uZXJfREVQRU5ERU5DSUVTIFdlYktpdFRlc3RSdW5uZXItZm9yd2Fy ZGluZy1oZWFkZXJzKQogbGlzdChBUFBFTkQgV2ViS2l0VGVzdFJ1bm5lcl9TT1VSQ0VTCiAgICAg Y2Fpcm8vVGVzdEludm9jYXRpb25DYWlyby5jcHAKIAotICAgIHdwZS9FdmVudFNlbmRlclByb3h5 V1BFLmNwcAotICAgIHdwZS9QbGF0Zm9ybVdlYlZpZXdXUEUuY3BwCisgICAgbGlid3BlL0V2ZW50 U2VuZGVyUHJveHlMaWJXUEUuY3BwCisgICAgbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5j cHAKKwogICAgIHdwZS9UZXN0Q29udHJvbGxlcldQRS5jcHAKICAgICB3cGUvVUlTY3JpcHRDb250 cm9sbGVyV1BFLmNwcAogICAgIHdwZS9tYWluLmNwcApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxh dGZvcm1XZWJWaWV3LmgKaW5kZXggYjlkMGFkZmY0ZDlhLi44NmU2M2RjMjhjOWQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3LmgKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaApAQCAtNDAsMjggKzQwLDI4IEBAIE9C SkNfQ0xBU1MgV0tXZWJWaWV3Q29uZmlndXJhdGlvbjsKIE9CSkNfQ0xBU1MgV2ViS2l0VGVzdFJ1 bm5lcldpbmRvdzsKIHR5cGVkZWYgc3RydWN0IENHSW1hZ2UgKkNHSW1hZ2VSZWY7CiAKLXR5cGVk ZWYgVGVzdFJ1bm5lcldLV2ViVmlldyAqUGxhdGZvcm1XS1ZpZXc7Ci10eXBlZGVmIFdlYktpdFRl c3RSdW5uZXJXaW5kb3cgKlBsYXRmb3JtV2luZG93OwotdHlwZWRlZiBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gUGxhdGZvcm1JbWFnZTsKK3VzaW5nIFBsYXRmb3JtV0tWaWV3ID0gKlRlc3RSdW5uZXJX S1dlYlZpZXc7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9ICpXZWJLaXRUZXN0UnVubmVyV2luZG93 OwordXNpbmcgUGxhdGZvcm1JbWFnZSA9IFJldGFpblB0cjxDR0ltYWdlUmVmPjsKICNlbGlmIGRl ZmluZWQoQlVJTERJTkdfR1RLX18pCiB0eXBlZGVmIHN0cnVjdCBfR3RrV2lkZ2V0IEd0a1dpZGdl dDsKIHR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwogdHlwZWRlZiBHdGtXaWRnZXQq IFBsYXRmb3JtV2luZG93OwotI2VsaWYgUExBVEZPUk0oV1BFKQorI2VsaWYgVVNFKExJQldQRSkK IG5hbWVzcGFjZSBXUEVUb29saW5nQmFja2VuZHMgewogY2xhc3MgSGVhZGxlc3NWaWV3QmFja2Vu ZDsKIH0KLXR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwotdHlwZWRlZiBXUEVUb29s aW5nQmFja2VuZHM6OkhlYWRsZXNzVmlld0JhY2tlbmQqIFBsYXRmb3JtV2luZG93OwordXNpbmcg UGxhdGZvcm1XS1ZpZXcgPSBXS1ZpZXdSZWY7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9IFdQRVRv b2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZCo7CiAjZWxpZiBQTEFURk9STShXSU4p Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KIGNsYXNzIFRlc3RSdW5uZXJXaW5kb3c7Ci10eXBlZGVmIEhX TkQgUGxhdGZvcm1XaW5kb3c7Ci10eXBlZGVmIFdLVmlld1JlZiBQbGF0Zm9ybVdLVmlldzsKK3Vz aW5nIFBsYXRmb3JtV0tWaWV3ID0gV0tWaWV3UmVmOwordXNpbmcgUGxhdGZvcm1XaW5kb3cgPSBI V05EOwogI2VuZGlmCiAKICNpZiBVU0UoQ0FJUk8pCi10eXBlZGVmIGNhaXJvX3N1cmZhY2VfdCog UGxhdGZvcm1JbWFnZTsKKyNpbmNsdWRlIDxjYWlyby5oPgordXNpbmcgUGxhdGZvcm1JbWFnZSA9 IGNhaXJvX3N1cmZhY2VfdCo7CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdUUiB7CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJveHlMaWJXUEUuY3BwCnNp bWlsYXJpdHkgaW5kZXggOTklCnJlbmFtZSBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3Bl L0V2ZW50U2VuZGVyUHJveHlXUEUuY3BwCnJlbmFtZSB0byBUb29scy9XZWJLaXRUZXN0UnVubmVy L2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcAppbmRleCAyZjY0ZWRjZDY1Y2EuLmRm YTRhYjg4MzE4YiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZlbnRT ZW5kZXJQcm94eVdQRS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvRXZl bnRTZW5kZXJQcm94eUxpYldQRS5jcHAKQEAgLTMzNSw2ICszMzUsOCBAQCB2b2lkIEV2ZW50U2Vu ZGVyUHJveHk6OnJhd0tleVVwKFdLU3RyaW5nUmVmIGtleSwgV0tFdmVudE1vZGlmaWVycyBtb2Rp ZmllcnMsIHVucwogewogfQogCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKKwogdm9pZCBFdmVu dFNlbmRlclByb3h5OjphZGRUb3VjaFBvaW50KGludCB4LCBpbnQgeSkKIHsKICAgICBzdHJ1Y3Qg d3BlX2lucHV0X3RvdWNoX2V2ZW50X3JhdyByYXdFdmVudCB7IHdwZV9pbnB1dF90b3VjaF9ldmVu dF90eXBlX2Rvd24sIHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwgc3RhdGljX2Nhc3Q8aW50Piht X3RvdWNoRXZlbnRzLnNpemUoKSksIHN0YXRpY19jYXN0PGludDMyX3Q+KHgpLCBzdGF0aWNfY2Fz dDxpbnQzMl90Pih5KSB9OwpAQCAtMzY0LDMzICszNjYsNiBAQCB2b2lkIEV2ZW50U2VuZGVyUHJv eHk6OnNldFRvdWNoUG9pbnRSYWRpdXMoaW50LCBpbnQpCiAgICAgbm90SW1wbGVtZW50ZWQoKTsK IH0KIAotVmVjdG9yPHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBFdmVudFNlbmRl clByb3h5OjpnZXRVcGRhdGVkVG91Y2hFdmVudHMoKQotewotICAgIFZlY3Rvcjx3cGVfaW5wdXRf dG91Y2hfZXZlbnRfcmF3PiBldmVudHM7Ci0gICAgZm9yIChhdXRvIGlkIDogbV91cGRhdGVkVG91 Y2hFdmVudHMpCi0gICAgICAgIGV2ZW50cy5hcHBlbmQobV90b3VjaEV2ZW50c1tpZF0pOwotICAg IHJldHVybiBldmVudHM7Ci19Ci0KLXZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmVtb3ZlVXBkYXRl ZFRvdWNoRXZlbnRzKCkKLXsKLSAgICBmb3IgKGF1dG8gaWQgOiBtX3VwZGF0ZWRUb3VjaEV2ZW50 cykKLSAgICAgICAgbV90b3VjaEV2ZW50c1tpZF0udHlwZSA9IHdwZV9pbnB1dF90b3VjaF9ldmVu dF90eXBlX251bGw7Ci0gICAgbV90b3VjaEV2ZW50cy5yZW1vdmVBbGxNYXRjaGluZyhbXSAoYXV0 byBjdXJyZW50KSB7Ci0gICAgICAgIHJldHVybiBjdXJyZW50LnR5cGUgPT0gd3BlX2lucHV0X3Rv dWNoX2V2ZW50X3R5cGVfbnVsbDsKLSAgICAgICAgfSk7Ci19Ci0KLXZvaWQgRXZlbnRTZW5kZXJQ cm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVudChlbnVtIHdwZV9pbnB1dF90b3VjaF9l dmVudF90eXBlIGV2ZW50VHlwZSkKLXsKLSAgICBhdXRvIHVwZGF0ZWRFdmVudHMgPSBnZXRVcGRh dGVkVG91Y2hFdmVudHMoKTsKLSAgICBzdHJ1Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50IGV2ZW50 ID0geyB1cGRhdGVkRXZlbnRzLmRhdGEoKSwgdXBkYXRlZEV2ZW50cy5zaXplKCksIGV2ZW50VHlw ZSwgMCwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCAwIH07Ci0gICAgd3BlX3ZpZXdfYmFja2Vu ZF9kaXNwYXRjaF90b3VjaF9ldmVudCh2aWV3QmFja2VuZCgqbV90ZXN0Q29udHJvbGxlciksICZl dmVudCk7Ci0gICAgaWYgKGV2ZW50VHlwZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfdHlwZV91 cCkKLSAgICAgICAgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7Ci0gICAgbV91cGRhdGVkVG91 Y2hFdmVudHMuY2xlYXIoKTsKLX0KLQogdm9pZCBFdmVudFNlbmRlclByb3h5Ojp0b3VjaFN0YXJ0 KCkKIHsKICAgICBwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KHdwZV9pbnB1dF90b3VjaF9l dmVudF90eXBlX2Rvd24pOwpAQCAtNDMyLDQgKzQwNywzMyBAQCB2b2lkIEV2ZW50U2VuZGVyUHJv eHk6OmNhbmNlbFRvdWNoUG9pbnQoaW50KQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKK1Zl Y3RvcjxzdHJ1Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50X3Jhdz4gRXZlbnRTZW5kZXJQcm94eTo6 Z2V0VXBkYXRlZFRvdWNoRXZlbnRzKCkKK3sKKyAgICBWZWN0b3I8d3BlX2lucHV0X3RvdWNoX2V2 ZW50X3Jhdz4gZXZlbnRzOworICAgIGZvciAoYXV0byBpZCA6IG1fdXBkYXRlZFRvdWNoRXZlbnRz KQorICAgICAgICBldmVudHMuYXBwZW5kKG1fdG91Y2hFdmVudHNbaWRdKTsKKyAgICByZXR1cm4g ZXZlbnRzOworfQorCit2b2lkIEV2ZW50U2VuZGVyUHJveHk6OnJlbW92ZVVwZGF0ZWRUb3VjaEV2 ZW50cygpCit7CisgICAgZm9yIChhdXRvIGlkIDogbV91cGRhdGVkVG91Y2hFdmVudHMpCisgICAg ICAgIG1fdG91Y2hFdmVudHNbaWRdLnR5cGUgPSB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfdHlwZV9u dWxsOworICAgIG1fdG91Y2hFdmVudHMucmVtb3ZlQWxsTWF0Y2hpbmcoW10gKGF1dG8gY3VycmVu dCkgeworICAgICAgICByZXR1cm4gY3VycmVudC50eXBlID09IHdwZV9pbnB1dF90b3VjaF9ldmVu dF90eXBlX251bGw7CisgICAgICAgIH0pOworfQorCit2b2lkIEV2ZW50U2VuZGVyUHJveHk6OnBy ZXBhcmVBbmREaXNwYXRjaFRvdWNoRXZlbnQoZW51bSB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfdHlw ZSBldmVudFR5cGUpCit7CisgICAgYXV0byB1cGRhdGVkRXZlbnRzID0gZ2V0VXBkYXRlZFRvdWNo RXZlbnRzKCk7CisgICAgc3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVudCBldmVudCA9IHsgdXBk YXRlZEV2ZW50cy5kYXRhKCksIHVwZGF0ZWRFdmVudHMuc2l6ZSgpLCBldmVudFR5cGUsIDAsIHNl Y1RvTXNUaW1lc3RhbXAobV90aW1lKSwgMCB9OworICAgIHdwZV92aWV3X2JhY2tlbmRfZGlzcGF0 Y2hfdG91Y2hfZXZlbnQodmlld0JhY2tlbmQoKm1fdGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwor ICAgIGlmIChldmVudFR5cGUgPT0gd3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfdXApCisgICAg ICAgIHJlbW92ZVVwZGF0ZWRUb3VjaEV2ZW50cygpOworICAgIG1fdXBkYXRlZFRvdWNoRXZlbnRz LmNsZWFyKCk7Cit9CisKKyNlbmRpZiAvLyBFTkFCTEUoVE9VQ0hfRVZFTlRTKQorCiB9IC8vIG5h bWVzcGFjZSBXVFIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3BlL1BsYXRm b3JtV2ViVmlld1dQRS5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9QbGF0Zm9y bVdlYlZpZXdMaWJXUEUuY3BwCnNpbWlsYXJpdHkgaW5kZXggOTYlCnJlbmFtZSBmcm9tIFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvd3BlL1BsYXRmb3JtV2ViVmlld1dQRS5jcHAKcmVuYW1lIHRvIFRv b2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5jcHAKaW5k ZXggZmQxZjFjZmJiZTk4Li5kZmEyNGM2NWViMDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvd3BlL1BsYXRmb3JtV2ViVmlld1dQRS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJWaWV3TGliV1BFLmNwcApAQCAtMjcsMTAgKzI3LDcg QEAKICNpbmNsdWRlICJQbGF0Zm9ybVdlYlZpZXcuaCIKIAogI2luY2x1ZGUgPFdQRVRvb2xpbmdC YWNrZW5kcy9IZWFkbGVzc1ZpZXdCYWNrZW5kLmg+Ci0jaW5jbHVkZSA8V2ViS2l0L1dLSW1hZ2VD YWlyby5oPgotI2luY2x1ZGUgPGNhaXJvLmg+CiAjaW5jbHVkZSA8Y3N0ZGlvPgotI2luY2x1ZGUg PGdsaWIuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dU RlN0cmluZy5oPgogCkBAIC0xMTUsNyArMTEyLDcgQEAgdm9pZCBQbGF0Zm9ybVdlYlZpZXc6Om1h a2VXZWJWaWV3Rmlyc3RSZXNwb25kZXIoKQogewogfQogCi1jYWlyb19zdXJmYWNlX3QqIFBsYXRm b3JtV2ViVmlldzo6d2luZG93U25hcHNob3RJbWFnZSgpCitQbGF0Zm9ybUltYWdlIFBsYXRmb3Jt V2ViVmlldzo6d2luZG93U25hcHNob3RJbWFnZSgpCiB7CiAgICAgewogICAgICAgICBzdHJ1Y3Qg VGltZW91dFRpbWVyIHsK 452054 2022-02-15 10:50:52 -0800 2022-02-15 11:13:39 -0800 Patch bug-236651.diff text/plain 10976 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNDU3 ZTRmN2M0OTcuLjU0NTNjMTE3MTViYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTE1ICBEb24gT2xtc3Rl YWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgU2hhcmUgV2ViS2l0VGVzdFJ1 bm5lciBjb2RlIGFtb25nIFVTRShMSUJXUEUpIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkgUExBVEZPUk0oV1BFKSB0byBVU0UoTElC V1BFKSBpbiBFdmVudFNlbmRlclByb3h5IGFuZCBQbGF0Zm9ybVdlYlZpZXcuIFRoZSBmb3JtZXIK KyAgICAgICAganVzdCB1c2VzIHRoZSBsaWJ3cGUgQVBJIHRvIHNlbmQgZXZlbnRzIHNvIGl0IGNh biBiZSBzaGFyZWQuIFRoZSBsYXRlciB1c2VzIHRoZQorICAgICAgICBXUEVUb29saW5nQmFja2Vu ZCBzbyBpdCBjYW4gYWxzbyBiZSBzaGFyZWQuCisKKyAgICAgICAgVGhlIFdQRSBwb3J0IHdhcyBt aXNzaW5nIGd1YXJkcyBhcm91bmQgRU5BQkxFKFRPVUNIX0VWRU5UUykgc28gYWRkIHRob3NlIGFu ZCBvcmdhbml6ZSB0aGUKKyAgICAgICAgY29ycmVzcG9uZGluZyAuY3BwIHNvIHRoZSBtZXRob2Rz IHRyYWNrIHdpdGggdGhlIG9yZGVyaW5nIGluIHRoZSBoZWFkZXIuCisKKyAgICAgICAgQWxzbyBt b2Rlcm5pemUgdGhlIFBsYXRmb3JtV2ViVmlldyBjb2RlIHRvIHByZWZlciB1c2luZyBvdmVyIHR5 cGVkZWYuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlOgorICAgICAgICAq IFdlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3Lmg6CisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9saWJ3cGUvRXZlbnRTZW5kZXJQcm94eUxpYldQRS5jcHA6IFJlbmFtZWQgZnJvbSBU b29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcC4KKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Z2V0VXBkYXRlZFRvdWNoRXZlbnRzKToKKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKToKKyAg ICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVu dCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJWaWV3TGli V1BFLmNwcDogUmVuYW1lZCBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3BlL1BsYXRmb3Jt V2ViVmlld1dQRS5jcHAuCisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6d2luZG93U25h cHNob3RJbWFnZSk6CisKIDIwMjItMDItMTQgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgogCiAgICAgICAgIFtFV1NdIE5lZWQgL2Jpbi9zaCBlcXVpdmFsZW50IG9uIHdpbmNh aXJvCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHku aCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCmluZGV4IGFkYjlj M2QyMzkyMy4uZGNlYTg1M2MxZGY3IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0V2ZW50U2VuZGVyUHJveHkuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2Vu ZGVyUHJveHkuaApAQCAtMzIsNyArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgVVNFKExJ QldQRSkKICNpbmNsdWRlIDx3cGUvd3BlLmg+CiAjZW5kaWYKIApAQCAtMTMwLDcgKzEzMCw3IEBA IHByaXZhdGU6CiAgICAgUmV0YWluUHRyPE5TRXZlbnQ+IHByZXNzdXJlQ2hhbmdlRXZlbnQoaW50 IHN0YWdlLCBmbG9hdCBwcmVzc3VyZSwgUHJlc3N1cmVDaGFuZ2VEaXJlY3Rpb24pOwogI2VuZGlm CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgVVNFKExJ QldQRSkKICAgICBWZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGdldFVw ZGF0ZWRUb3VjaEV2ZW50cygpOwogICAgIHZvaWQgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7 CiAgICAgdm9pZCBwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0gd3BlX2lucHV0X3Rv dWNoX2V2ZW50X3R5cGUpOwpAQCAtMTU1LDExICsxNTUsMTMgQEAgcHJpdmF0ZToKICNpZiBQTEFU Rk9STShHVEspCiAgICAgYm9vbCBtX2hhc1ByZWNpc2VEZWx0YXMgeyBmYWxzZSB9OwogI2VuZGlm Ci0jaWYgUExBVEZPUk0oV1BFKQorI2lmIFVTRShMSUJXUEUpCiAgICAgdWludDMyX3QgbV9idXR0 b25TdGF0ZSB7IDAgfTsKKyNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgIFZlY3RvcjxzdHJ1 Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50X3Jhdz4gbV90b3VjaEV2ZW50czsKICAgICBIYXNoU2V0 PHVuc2lnbmVkLCBEZWZhdWx0SGFzaDx1bnNpZ25lZD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tl eUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBtX3VwZGF0ZWRUb3VjaEV2ZW50czsKICNlbmRpZgorI2Vu ZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXVFIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRm b3JtV1BFLmNtYWtlCmluZGV4IDIwMTRiYTJlMTE2NC4uZjZiNTlkYjNjMGVlIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UKQEAgLTYsOCArNiw5IEBAIGxpc3QoQVBQ RU5EIFdlYktpdFRlc3RSdW5uZXJfREVQRU5ERU5DSUVTIFdlYktpdFRlc3RSdW5uZXItZm9yd2Fy ZGluZy1oZWFkZXJzKQogbGlzdChBUFBFTkQgV2ViS2l0VGVzdFJ1bm5lcl9TT1VSQ0VTCiAgICAg Y2Fpcm8vVGVzdEludm9jYXRpb25DYWlyby5jcHAKIAotICAgIHdwZS9FdmVudFNlbmRlclByb3h5 V1BFLmNwcAotICAgIHdwZS9QbGF0Zm9ybVdlYlZpZXdXUEUuY3BwCisgICAgbGlid3BlL0V2ZW50 U2VuZGVyUHJveHlMaWJXUEUuY3BwCisgICAgbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5j cHAKKwogICAgIHdwZS9UZXN0Q29udHJvbGxlcldQRS5jcHAKICAgICB3cGUvVUlTY3JpcHRDb250 cm9sbGVyV1BFLmNwcAogICAgIHdwZS9tYWluLmNwcApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxh dGZvcm1XZWJWaWV3LmgKaW5kZXggYjlkMGFkZmY0ZDlhLi44NmU2M2RjMjhjOWQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3LmgKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaApAQCAtNDAsMjggKzQwLDI4IEBAIE9C SkNfQ0xBU1MgV0tXZWJWaWV3Q29uZmlndXJhdGlvbjsKIE9CSkNfQ0xBU1MgV2ViS2l0VGVzdFJ1 bm5lcldpbmRvdzsKIHR5cGVkZWYgc3RydWN0IENHSW1hZ2UgKkNHSW1hZ2VSZWY7CiAKLXR5cGVk ZWYgVGVzdFJ1bm5lcldLV2ViVmlldyAqUGxhdGZvcm1XS1ZpZXc7Ci10eXBlZGVmIFdlYktpdFRl c3RSdW5uZXJXaW5kb3cgKlBsYXRmb3JtV2luZG93OwotdHlwZWRlZiBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gUGxhdGZvcm1JbWFnZTsKK3VzaW5nIFBsYXRmb3JtV0tWaWV3ID0gKlRlc3RSdW5uZXJX S1dlYlZpZXc7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9ICpXZWJLaXRUZXN0UnVubmVyV2luZG93 OwordXNpbmcgUGxhdGZvcm1JbWFnZSA9IFJldGFpblB0cjxDR0ltYWdlUmVmPjsKICNlbGlmIGRl ZmluZWQoQlVJTERJTkdfR1RLX18pCiB0eXBlZGVmIHN0cnVjdCBfR3RrV2lkZ2V0IEd0a1dpZGdl dDsKIHR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwogdHlwZWRlZiBHdGtXaWRnZXQq IFBsYXRmb3JtV2luZG93OwotI2VsaWYgUExBVEZPUk0oV1BFKQorI2VsaWYgVVNFKExJQldQRSkK IG5hbWVzcGFjZSBXUEVUb29saW5nQmFja2VuZHMgewogY2xhc3MgSGVhZGxlc3NWaWV3QmFja2Vu ZDsKIH0KLXR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwotdHlwZWRlZiBXUEVUb29s aW5nQmFja2VuZHM6OkhlYWRsZXNzVmlld0JhY2tlbmQqIFBsYXRmb3JtV2luZG93OwordXNpbmcg UGxhdGZvcm1XS1ZpZXcgPSBXS1ZpZXdSZWY7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9IFdQRVRv b2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZCo7CiAjZWxpZiBQTEFURk9STShXSU4p Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KIGNsYXNzIFRlc3RSdW5uZXJXaW5kb3c7Ci10eXBlZGVmIEhX TkQgUGxhdGZvcm1XaW5kb3c7Ci10eXBlZGVmIFdLVmlld1JlZiBQbGF0Zm9ybVdLVmlldzsKK3Vz aW5nIFBsYXRmb3JtV0tWaWV3ID0gV0tWaWV3UmVmOwordXNpbmcgUGxhdGZvcm1XaW5kb3cgPSBI V05EOwogI2VuZGlmCiAKICNpZiBVU0UoQ0FJUk8pCi10eXBlZGVmIGNhaXJvX3N1cmZhY2VfdCog UGxhdGZvcm1JbWFnZTsKKyNpbmNsdWRlIDxjYWlyby5oPgordXNpbmcgUGxhdGZvcm1JbWFnZSA9 IGNhaXJvX3N1cmZhY2VfdCo7CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdUUiB7CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJveHlMaWJXUEUuY3BwCnNp bWlsYXJpdHkgaW5kZXggOTklCnJlbmFtZSBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3Bl L0V2ZW50U2VuZGVyUHJveHlXUEUuY3BwCnJlbmFtZSB0byBUb29scy9XZWJLaXRUZXN0UnVubmVy L2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcAppbmRleCAyZjY0ZWRjZDY1Y2EuLmM3 ZjYyODA0OWFmYSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZlbnRT ZW5kZXJQcm94eVdQRS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvRXZl bnRTZW5kZXJQcm94eUxpYldQRS5jcHAKQEAgLTE3NiwxMSArMTc2LDExIEBAIHZvaWQgRXZlbnRT ZW5kZXJQcm94eTo6bW91c2VTY3JvbGxCeShpbnQgaG9yaXpvbnRhbCwgaW50IHZlcnRpY2FsKQog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoaG9yaXpvbnRhbCkgewotICAgICAgICBzdHJ1Y3Qg d3BlX2lucHV0X2F4aXNfZXZlbnQgZXZlbnQgPSB7IHdwZV9pbnB1dF9heGlzX2V2ZW50X3R5cGVf bW90aW9uLCBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIHN0YXRpY19jYXN0PGludD4obV9wb3Np dGlvbi54KSwgc3RhdGljX2Nhc3Q8aW50PihtX3Bvc2l0aW9uLnkpLCBIb3Jpem9udGFsU2Nyb2xs LCBob3Jpem9udGFsLCAwfTsKKyAgICAgICAgc3RydWN0IHdwZV9pbnB1dF9heGlzX2V2ZW50IGV2 ZW50ID0geyB3cGVfaW5wdXRfYXhpc19ldmVudF90eXBlX21vdGlvbiwgc2VjVG9Nc1RpbWVzdGFt cChtX3RpbWUpLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcG9zaXRpb24ueCksIHN0YXRpY19jYXN0PGlu dD4obV9wb3NpdGlvbi55KSwgSG9yaXpvbnRhbFNjcm9sbCwgaG9yaXpvbnRhbCwgMCB9OwogICAg ICAgICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX2F4aXNfZXZlbnQodmlld0JhY2tlbmQoKm1f dGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwogICAgIH0KICAgICBpZiAodmVydGljYWwpIHsKLSAg ICAgICAgc3RydWN0IHdwZV9pbnB1dF9heGlzX2V2ZW50IGV2ZW50ID0gIHsgd3BlX2lucHV0X2F4 aXNfZXZlbnRfdHlwZV9tb3Rpb24sIHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwgc3RhdGljX2Nh c3Q8aW50PihtX3Bvc2l0aW9uLngpLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcG9zaXRpb24ueSksIFZl cnRpY2FsU2Nyb2xsLCB2ZXJ0aWNhbCwgMH07CisgICAgICAgIHN0cnVjdCB3cGVfaW5wdXRfYXhp c19ldmVudCBldmVudCA9ICB7IHdwZV9pbnB1dF9heGlzX2V2ZW50X3R5cGVfbW90aW9uLCBzZWNU b01zVGltZXN0YW1wKG1fdGltZSksIHN0YXRpY19jYXN0PGludD4obV9wb3NpdGlvbi54KSwgc3Rh dGljX2Nhc3Q8aW50PihtX3Bvc2l0aW9uLnkpLCBWZXJ0aWNhbFNjcm9sbCwgdmVydGljYWwsIDAg fTsKICAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9heGlzX2V2ZW50KHZpZXdCYWNr ZW5kKCptX3Rlc3RDb250cm9sbGVyKSwgJmV2ZW50KTsKICAgICB9CiB9CkBAIC0zMjAsNyArMzIw LDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtleVJlZiwg V0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKICAgICBzdHJ1Y3Qgd3BlX2lucHV0X3hrYl9r ZXltYXBfZW50cnkqIGVudHJpZXM7CiAgICAgdWludDMyX3QgZW50cmllc0NvdW50OwogICAgIHdw ZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZW50cmllc19mb3Jfa2V5X2NvZGUod3BlX2lucHV0X3hr Yl9jb250ZXh0X2dldF9kZWZhdWx0KCksIGtleVN5bSwgJmVudHJpZXMsICZlbnRyaWVzQ291bnQp OwotICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQgeyBzZWNUb01zVGlt ZXN0YW1wKG1fdGltZSksIGtleVN5bSwgZW50cmllc0NvdW50ID8gZW50cmllc1swXS5oYXJkd2Fy ZV9rZXlfY29kZSA6IDAsIHRydWUsIG1vZGlmaWVyc307CisgICAgc3RydWN0IHdwZV9pbnB1dF9r ZXlib2FyZF9ldmVudCBldmVudCB7IHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwga2V5U3ltLCBl bnRyaWVzQ291bnQgPyBlbnRyaWVzWzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwgbW9k aWZpZXJzIH07CiAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9rZXlib2FyZF9ldmVudCh2 aWV3QmFja2VuZCgqbV90ZXN0Q29udHJvbGxlciksICZldmVudCk7CiAgICAgZXZlbnQucHJlc3Nl ZCA9IGZhbHNlOwogICAgIHdwZV92aWV3X2JhY2tlbmRfZGlzcGF0Y2hfa2V5Ym9hcmRfZXZlbnQo dmlld0JhY2tlbmQoKm1fdGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwpAQCAtMzM1LDYgKzMzNSw4 IEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmF3S2V5VXAoV0tTdHJpbmdSZWYga2V5LCBXS0V2 ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgdW5zCiB7CiB9CiAKKyNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQorCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmFkZFRvdWNoUG9pbnQoaW50IHgsIGludCB5 KQogewogICAgIHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3IHJhd0V2ZW50IHsgd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfZG93biwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCBz dGF0aWNfY2FzdDxpbnQ+KG1fdG91Y2hFdmVudHMuc2l6ZSgpKSwgc3RhdGljX2Nhc3Q8aW50MzJf dD4oeCksIHN0YXRpY19jYXN0PGludDMyX3Q+KHkpIH07CkBAIC0zNjQsMzMgKzM2Niw2IEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6c2V0VG91Y2hQb2ludFJhZGl1cyhpbnQsIGludCkKICAgICBu b3RJbXBsZW1lbnRlZCgpOwogfQogCi1WZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVu dF9yYXc+IEV2ZW50U2VuZGVyUHJveHk6OmdldFVwZGF0ZWRUb3VjaEV2ZW50cygpCi17Ci0gICAg VmVjdG9yPHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGV2ZW50czsKLSAgICBmb3IgKGF1dG8g aWQgOiBtX3VwZGF0ZWRUb3VjaEV2ZW50cykKLSAgICAgICAgZXZlbnRzLmFwcGVuZChtX3RvdWNo RXZlbnRzW2lkXSk7Ci0gICAgcmV0dXJuIGV2ZW50czsKLX0KLQotdm9pZCBFdmVudFNlbmRlclBy b3h5OjpyZW1vdmVVcGRhdGVkVG91Y2hFdmVudHMoKQotewotICAgIGZvciAoYXV0byBpZCA6IG1f dXBkYXRlZFRvdWNoRXZlbnRzKQotICAgICAgICBtX3RvdWNoRXZlbnRzW2lkXS50eXBlID0gd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfbnVsbDsKLSAgICBtX3RvdWNoRXZlbnRzLnJlbW92ZUFs bE1hdGNoaW5nKFtdIChhdXRvIGN1cnJlbnQpIHsKLSAgICAgICAgcmV0dXJuIGN1cnJlbnQudHlw ZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfdHlwZV9udWxsOwotICAgICAgICB9KTsKLX0KLQot dm9pZCBFdmVudFNlbmRlclByb3h5OjpwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0g d3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGUgZXZlbnRUeXBlKQotewotICAgIGF1dG8gdXBkYXRl ZEV2ZW50cyA9IGdldFVwZGF0ZWRUb3VjaEV2ZW50cygpOwotICAgIHN0cnVjdCB3cGVfaW5wdXRf dG91Y2hfZXZlbnQgZXZlbnQgPSB7IHVwZGF0ZWRFdmVudHMuZGF0YSgpLCB1cGRhdGVkRXZlbnRz LnNpemUoKSwgZXZlbnRUeXBlLCAwLCBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIDAgfTsKLSAg ICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX3RvdWNoX2V2ZW50KHZpZXdCYWNrZW5kKCptX3Rl c3RDb250cm9sbGVyKSwgJmV2ZW50KTsKLSAgICBpZiAoZXZlbnRUeXBlID09IHdwZV9pbnB1dF90 b3VjaF9ldmVudF90eXBlX3VwKQotICAgICAgICByZW1vdmVVcGRhdGVkVG91Y2hFdmVudHMoKTsK LSAgICBtX3VwZGF0ZWRUb3VjaEV2ZW50cy5jbGVhcigpOwotfQotCiB2b2lkIEV2ZW50U2VuZGVy UHJveHk6OnRvdWNoU3RhcnQoKQogewogICAgIHByZXBhcmVBbmREaXNwYXRjaFRvdWNoRXZlbnQo d3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfZG93bik7CkBAIC00MzIsNCArNDA3LDMzIEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6Y2FuY2VsVG91Y2hQb2ludChpbnQpCiAgICAgbm90SW1wbGVt ZW50ZWQoKTsKIH0KIAorVmVjdG9yPHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBF dmVudFNlbmRlclByb3h5OjpnZXRVcGRhdGVkVG91Y2hFdmVudHMoKQoreworICAgIFZlY3Rvcjx3 cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBldmVudHM7CisgICAgZm9yIChhdXRvIGlkIDogbV91 cGRhdGVkVG91Y2hFdmVudHMpCisgICAgICAgIGV2ZW50cy5hcHBlbmQobV90b3VjaEV2ZW50c1tp ZF0pOworICAgIHJldHVybiBldmVudHM7Cit9CisKK3ZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmVt b3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCkKK3sKKyAgICBmb3IgKGF1dG8gaWQgOiBtX3VwZGF0ZWRU b3VjaEV2ZW50cykKKyAgICAgICAgbV90b3VjaEV2ZW50c1tpZF0udHlwZSA9IHdwZV9pbnB1dF90 b3VjaF9ldmVudF90eXBlX251bGw7CisgICAgbV90b3VjaEV2ZW50cy5yZW1vdmVBbGxNYXRjaGlu ZyhbXSAoYXV0byBjdXJyZW50KSB7CisgICAgICAgIHJldHVybiBjdXJyZW50LnR5cGUgPT0gd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfbnVsbDsKKyAgICAgICAgfSk7Cit9CisKK3ZvaWQgRXZl bnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVudChlbnVtIHdwZV9pbnB1 dF90b3VjaF9ldmVudF90eXBlIGV2ZW50VHlwZSkKK3sKKyAgICBhdXRvIHVwZGF0ZWRFdmVudHMg PSBnZXRVcGRhdGVkVG91Y2hFdmVudHMoKTsKKyAgICBzdHJ1Y3Qgd3BlX2lucHV0X3RvdWNoX2V2 ZW50IGV2ZW50ID0geyB1cGRhdGVkRXZlbnRzLmRhdGEoKSwgdXBkYXRlZEV2ZW50cy5zaXplKCks IGV2ZW50VHlwZSwgMCwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCAwIH07CisgICAgd3BlX3Zp ZXdfYmFja2VuZF9kaXNwYXRjaF90b3VjaF9ldmVudCh2aWV3QmFja2VuZCgqbV90ZXN0Q29udHJv bGxlciksICZldmVudCk7CisgICAgaWYgKGV2ZW50VHlwZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZl bnRfdHlwZV91cCkKKyAgICAgICAgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7CisgICAgbV91 cGRhdGVkVG91Y2hFdmVudHMuY2xlYXIoKTsKK30KKworI2VuZGlmIC8vIEVOQUJMRShUT1VDSF9F VkVOVFMpCisKIH0gLy8gbmFtZXNwYWNlIFdUUgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BFLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5jcHAKc2ltaWxhcml0eSBpbmRleCA5NiUK cmVuYW1lIGZyb20gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BF LmNwcApyZW5hbWUgdG8gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJW aWV3TGliV1BFLmNwcAppbmRleCBmZDFmMWNmYmJlOTguLmRmYTI0YzY1ZWIwMiAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BFLmNwcAorKysg Yi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9QbGF0Zm9ybVdlYlZpZXdMaWJXUEUuY3Bw CkBAIC0yNywxMCArMjcsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2ViVmlldy5oIgogCiAjaW5j bHVkZSA8V1BFVG9vbGluZ0JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuaD4KLSNpbmNsdWRl IDxXZWJLaXQvV0tJbWFnZUNhaXJvLmg+Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KICNpbmNsdWRlIDxj c3RkaW8+Ci0jaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTExNSw3ICsxMTIsNyBAQCB2b2lkIFBs YXRmb3JtV2ViVmlldzo6bWFrZVdlYlZpZXdGaXJzdFJlc3BvbmRlcigpCiB7CiB9CiAKLWNhaXJv X3N1cmZhY2VfdCogUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKK1BsYXRm b3JtSW1hZ2UgUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKIHsKICAgICB7 CiAgICAgICAgIHN0cnVjdCBUaW1lb3V0VGltZXIgewo= 452060 2022-02-15 11:13:39 -0800 2022-02-15 11:18:07 -0800 Patch bug-236651.diff text/plain 10976 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNDU3 ZTRmN2M0OTcuLjU0NTNjMTE3MTViYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTE1ICBEb24gT2xtc3Rl YWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgU2hhcmUgV2ViS2l0VGVzdFJ1 bm5lciBjb2RlIGFtb25nIFVTRShMSUJXUEUpIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkgUExBVEZPUk0oV1BFKSB0byBVU0UoTElC V1BFKSBpbiBFdmVudFNlbmRlclByb3h5IGFuZCBQbGF0Zm9ybVdlYlZpZXcuIFRoZSBmb3JtZXIK KyAgICAgICAganVzdCB1c2VzIHRoZSBsaWJ3cGUgQVBJIHRvIHNlbmQgZXZlbnRzIHNvIGl0IGNh biBiZSBzaGFyZWQuIFRoZSBsYXRlciB1c2VzIHRoZQorICAgICAgICBXUEVUb29saW5nQmFja2Vu ZCBzbyBpdCBjYW4gYWxzbyBiZSBzaGFyZWQuCisKKyAgICAgICAgVGhlIFdQRSBwb3J0IHdhcyBt aXNzaW5nIGd1YXJkcyBhcm91bmQgRU5BQkxFKFRPVUNIX0VWRU5UUykgc28gYWRkIHRob3NlIGFu ZCBvcmdhbml6ZSB0aGUKKyAgICAgICAgY29ycmVzcG9uZGluZyAuY3BwIHNvIHRoZSBtZXRob2Rz IHRyYWNrIHdpdGggdGhlIG9yZGVyaW5nIGluIHRoZSBoZWFkZXIuCisKKyAgICAgICAgQWxzbyBt b2Rlcm5pemUgdGhlIFBsYXRmb3JtV2ViVmlldyBjb2RlIHRvIHByZWZlciB1c2luZyBvdmVyIHR5 cGVkZWYuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlOgorICAgICAgICAq IFdlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3Lmg6CisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9saWJ3cGUvRXZlbnRTZW5kZXJQcm94eUxpYldQRS5jcHA6IFJlbmFtZWQgZnJvbSBU b29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcC4KKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Z2V0VXBkYXRlZFRvdWNoRXZlbnRzKToKKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKToKKyAg ICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVu dCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJWaWV3TGli V1BFLmNwcDogUmVuYW1lZCBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3BlL1BsYXRmb3Jt V2ViVmlld1dQRS5jcHAuCisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6d2luZG93U25h cHNob3RJbWFnZSk6CisKIDIwMjItMDItMTQgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgogCiAgICAgICAgIFtFV1NdIE5lZWQgL2Jpbi9zaCBlcXVpdmFsZW50IG9uIHdpbmNh aXJvCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHku aCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCmluZGV4IGFkYjlj M2QyMzkyMy4uZGNlYTg1M2MxZGY3IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0V2ZW50U2VuZGVyUHJveHkuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2Vu ZGVyUHJveHkuaApAQCAtMzIsNyArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgVVNFKExJ QldQRSkKICNpbmNsdWRlIDx3cGUvd3BlLmg+CiAjZW5kaWYKIApAQCAtMTMwLDcgKzEzMCw3IEBA IHByaXZhdGU6CiAgICAgUmV0YWluUHRyPE5TRXZlbnQ+IHByZXNzdXJlQ2hhbmdlRXZlbnQoaW50 IHN0YWdlLCBmbG9hdCBwcmVzc3VyZSwgUHJlc3N1cmVDaGFuZ2VEaXJlY3Rpb24pOwogI2VuZGlm CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgVVNFKExJ QldQRSkKICAgICBWZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGdldFVw ZGF0ZWRUb3VjaEV2ZW50cygpOwogICAgIHZvaWQgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7 CiAgICAgdm9pZCBwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0gd3BlX2lucHV0X3Rv dWNoX2V2ZW50X3R5cGUpOwpAQCAtMTU1LDExICsxNTUsMTMgQEAgcHJpdmF0ZToKICNpZiBQTEFU Rk9STShHVEspCiAgICAgYm9vbCBtX2hhc1ByZWNpc2VEZWx0YXMgeyBmYWxzZSB9OwogI2VuZGlm Ci0jaWYgUExBVEZPUk0oV1BFKQorI2lmIFVTRShMSUJXUEUpCiAgICAgdWludDMyX3QgbV9idXR0 b25TdGF0ZSB7IDAgfTsKKyNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgIFZlY3RvcjxzdHJ1 Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50X3Jhdz4gbV90b3VjaEV2ZW50czsKICAgICBIYXNoU2V0 PHVuc2lnbmVkLCBEZWZhdWx0SGFzaDx1bnNpZ25lZD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tl eUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBtX3VwZGF0ZWRUb3VjaEV2ZW50czsKICNlbmRpZgorI2Vu ZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXVFIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRm b3JtV1BFLmNtYWtlCmluZGV4IDIwMTRiYTJlMTE2NC4uZjZiNTlkYjNjMGVlIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UKQEAgLTYsOCArNiw5IEBAIGxpc3QoQVBQ RU5EIFdlYktpdFRlc3RSdW5uZXJfREVQRU5ERU5DSUVTIFdlYktpdFRlc3RSdW5uZXItZm9yd2Fy ZGluZy1oZWFkZXJzKQogbGlzdChBUFBFTkQgV2ViS2l0VGVzdFJ1bm5lcl9TT1VSQ0VTCiAgICAg Y2Fpcm8vVGVzdEludm9jYXRpb25DYWlyby5jcHAKIAotICAgIHdwZS9FdmVudFNlbmRlclByb3h5 V1BFLmNwcAotICAgIHdwZS9QbGF0Zm9ybVdlYlZpZXdXUEUuY3BwCisgICAgbGlid3BlL0V2ZW50 U2VuZGVyUHJveHlMaWJXUEUuY3BwCisgICAgbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5j cHAKKwogICAgIHdwZS9UZXN0Q29udHJvbGxlcldQRS5jcHAKICAgICB3cGUvVUlTY3JpcHRDb250 cm9sbGVyV1BFLmNwcAogICAgIHdwZS9tYWluLmNwcApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxh dGZvcm1XZWJWaWV3LmgKaW5kZXggYjlkMGFkZmY0ZDlhLi5hMzU1OTkzYWExZGYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3LmgKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaApAQCAtNDAsMjggKzQwLDI4IEBAIE9C SkNfQ0xBU1MgV0tXZWJWaWV3Q29uZmlndXJhdGlvbjsKIE9CSkNfQ0xBU1MgV2ViS2l0VGVzdFJ1 bm5lcldpbmRvdzsKIHR5cGVkZWYgc3RydWN0IENHSW1hZ2UgKkNHSW1hZ2VSZWY7CiAKLXR5cGVk ZWYgVGVzdFJ1bm5lcldLV2ViVmlldyAqUGxhdGZvcm1XS1ZpZXc7Ci10eXBlZGVmIFdlYktpdFRl c3RSdW5uZXJXaW5kb3cgKlBsYXRmb3JtV2luZG93OwotdHlwZWRlZiBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gUGxhdGZvcm1JbWFnZTsKK3VzaW5nIFBsYXRmb3JtV0tWaWV3ID0gVGVzdFJ1bm5lcldL V2ViVmlldyo7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9IFdlYktpdFRlc3RSdW5uZXJXaW5kb3cq OwordXNpbmcgUGxhdGZvcm1JbWFnZSA9IFJldGFpblB0cjxDR0ltYWdlUmVmPjsKICNlbGlmIGRl ZmluZWQoQlVJTERJTkdfR1RLX18pCiB0eXBlZGVmIHN0cnVjdCBfR3RrV2lkZ2V0IEd0a1dpZGdl dDsKIHR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwogdHlwZWRlZiBHdGtXaWRnZXQq IFBsYXRmb3JtV2luZG93OwotI2VsaWYgUExBVEZPUk0oV1BFKQorI2VsaWYgVVNFKExJQldQRSkK IG5hbWVzcGFjZSBXUEVUb29saW5nQmFja2VuZHMgewogY2xhc3MgSGVhZGxlc3NWaWV3QmFja2Vu ZDsKIH0KLXR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwotdHlwZWRlZiBXUEVUb29s aW5nQmFja2VuZHM6OkhlYWRsZXNzVmlld0JhY2tlbmQqIFBsYXRmb3JtV2luZG93OwordXNpbmcg UGxhdGZvcm1XS1ZpZXcgPSBXS1ZpZXdSZWY7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9IFdQRVRv b2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZCo7CiAjZWxpZiBQTEFURk9STShXSU4p Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KIGNsYXNzIFRlc3RSdW5uZXJXaW5kb3c7Ci10eXBlZGVmIEhX TkQgUGxhdGZvcm1XaW5kb3c7Ci10eXBlZGVmIFdLVmlld1JlZiBQbGF0Zm9ybVdLVmlldzsKK3Vz aW5nIFBsYXRmb3JtV0tWaWV3ID0gV0tWaWV3UmVmOwordXNpbmcgUGxhdGZvcm1XaW5kb3cgPSBI V05EOwogI2VuZGlmCiAKICNpZiBVU0UoQ0FJUk8pCi10eXBlZGVmIGNhaXJvX3N1cmZhY2VfdCog UGxhdGZvcm1JbWFnZTsKKyNpbmNsdWRlIDxjYWlyby5oPgordXNpbmcgUGxhdGZvcm1JbWFnZSA9 IGNhaXJvX3N1cmZhY2VfdCo7CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdUUiB7CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJveHlMaWJXUEUuY3BwCnNp bWlsYXJpdHkgaW5kZXggOTklCnJlbmFtZSBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3Bl L0V2ZW50U2VuZGVyUHJveHlXUEUuY3BwCnJlbmFtZSB0byBUb29scy9XZWJLaXRUZXN0UnVubmVy L2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcAppbmRleCAyZjY0ZWRjZDY1Y2EuLmM3 ZjYyODA0OWFmYSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZlbnRT ZW5kZXJQcm94eVdQRS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvRXZl bnRTZW5kZXJQcm94eUxpYldQRS5jcHAKQEAgLTE3NiwxMSArMTc2LDExIEBAIHZvaWQgRXZlbnRT ZW5kZXJQcm94eTo6bW91c2VTY3JvbGxCeShpbnQgaG9yaXpvbnRhbCwgaW50IHZlcnRpY2FsKQog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoaG9yaXpvbnRhbCkgewotICAgICAgICBzdHJ1Y3Qg d3BlX2lucHV0X2F4aXNfZXZlbnQgZXZlbnQgPSB7IHdwZV9pbnB1dF9heGlzX2V2ZW50X3R5cGVf bW90aW9uLCBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIHN0YXRpY19jYXN0PGludD4obV9wb3Np dGlvbi54KSwgc3RhdGljX2Nhc3Q8aW50PihtX3Bvc2l0aW9uLnkpLCBIb3Jpem9udGFsU2Nyb2xs LCBob3Jpem9udGFsLCAwfTsKKyAgICAgICAgc3RydWN0IHdwZV9pbnB1dF9heGlzX2V2ZW50IGV2 ZW50ID0geyB3cGVfaW5wdXRfYXhpc19ldmVudF90eXBlX21vdGlvbiwgc2VjVG9Nc1RpbWVzdGFt cChtX3RpbWUpLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcG9zaXRpb24ueCksIHN0YXRpY19jYXN0PGlu dD4obV9wb3NpdGlvbi55KSwgSG9yaXpvbnRhbFNjcm9sbCwgaG9yaXpvbnRhbCwgMCB9OwogICAg ICAgICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX2F4aXNfZXZlbnQodmlld0JhY2tlbmQoKm1f dGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwogICAgIH0KICAgICBpZiAodmVydGljYWwpIHsKLSAg ICAgICAgc3RydWN0IHdwZV9pbnB1dF9heGlzX2V2ZW50IGV2ZW50ID0gIHsgd3BlX2lucHV0X2F4 aXNfZXZlbnRfdHlwZV9tb3Rpb24sIHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwgc3RhdGljX2Nh c3Q8aW50PihtX3Bvc2l0aW9uLngpLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcG9zaXRpb24ueSksIFZl cnRpY2FsU2Nyb2xsLCB2ZXJ0aWNhbCwgMH07CisgICAgICAgIHN0cnVjdCB3cGVfaW5wdXRfYXhp c19ldmVudCBldmVudCA9ICB7IHdwZV9pbnB1dF9heGlzX2V2ZW50X3R5cGVfbW90aW9uLCBzZWNU b01zVGltZXN0YW1wKG1fdGltZSksIHN0YXRpY19jYXN0PGludD4obV9wb3NpdGlvbi54KSwgc3Rh dGljX2Nhc3Q8aW50PihtX3Bvc2l0aW9uLnkpLCBWZXJ0aWNhbFNjcm9sbCwgdmVydGljYWwsIDAg fTsKICAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9heGlzX2V2ZW50KHZpZXdCYWNr ZW5kKCptX3Rlc3RDb250cm9sbGVyKSwgJmV2ZW50KTsKICAgICB9CiB9CkBAIC0zMjAsNyArMzIw LDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtleVJlZiwg V0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKICAgICBzdHJ1Y3Qgd3BlX2lucHV0X3hrYl9r ZXltYXBfZW50cnkqIGVudHJpZXM7CiAgICAgdWludDMyX3QgZW50cmllc0NvdW50OwogICAgIHdw ZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZW50cmllc19mb3Jfa2V5X2NvZGUod3BlX2lucHV0X3hr Yl9jb250ZXh0X2dldF9kZWZhdWx0KCksIGtleVN5bSwgJmVudHJpZXMsICZlbnRyaWVzQ291bnQp OwotICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQgeyBzZWNUb01zVGlt ZXN0YW1wKG1fdGltZSksIGtleVN5bSwgZW50cmllc0NvdW50ID8gZW50cmllc1swXS5oYXJkd2Fy ZV9rZXlfY29kZSA6IDAsIHRydWUsIG1vZGlmaWVyc307CisgICAgc3RydWN0IHdwZV9pbnB1dF9r ZXlib2FyZF9ldmVudCBldmVudCB7IHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwga2V5U3ltLCBl bnRyaWVzQ291bnQgPyBlbnRyaWVzWzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwgbW9k aWZpZXJzIH07CiAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9rZXlib2FyZF9ldmVudCh2 aWV3QmFja2VuZCgqbV90ZXN0Q29udHJvbGxlciksICZldmVudCk7CiAgICAgZXZlbnQucHJlc3Nl ZCA9IGZhbHNlOwogICAgIHdwZV92aWV3X2JhY2tlbmRfZGlzcGF0Y2hfa2V5Ym9hcmRfZXZlbnQo dmlld0JhY2tlbmQoKm1fdGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwpAQCAtMzM1LDYgKzMzNSw4 IEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmF3S2V5VXAoV0tTdHJpbmdSZWYga2V5LCBXS0V2 ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgdW5zCiB7CiB9CiAKKyNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQorCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmFkZFRvdWNoUG9pbnQoaW50IHgsIGludCB5 KQogewogICAgIHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3IHJhd0V2ZW50IHsgd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfZG93biwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCBz dGF0aWNfY2FzdDxpbnQ+KG1fdG91Y2hFdmVudHMuc2l6ZSgpKSwgc3RhdGljX2Nhc3Q8aW50MzJf dD4oeCksIHN0YXRpY19jYXN0PGludDMyX3Q+KHkpIH07CkBAIC0zNjQsMzMgKzM2Niw2IEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6c2V0VG91Y2hQb2ludFJhZGl1cyhpbnQsIGludCkKICAgICBu b3RJbXBsZW1lbnRlZCgpOwogfQogCi1WZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVu dF9yYXc+IEV2ZW50U2VuZGVyUHJveHk6OmdldFVwZGF0ZWRUb3VjaEV2ZW50cygpCi17Ci0gICAg VmVjdG9yPHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGV2ZW50czsKLSAgICBmb3IgKGF1dG8g aWQgOiBtX3VwZGF0ZWRUb3VjaEV2ZW50cykKLSAgICAgICAgZXZlbnRzLmFwcGVuZChtX3RvdWNo RXZlbnRzW2lkXSk7Ci0gICAgcmV0dXJuIGV2ZW50czsKLX0KLQotdm9pZCBFdmVudFNlbmRlclBy b3h5OjpyZW1vdmVVcGRhdGVkVG91Y2hFdmVudHMoKQotewotICAgIGZvciAoYXV0byBpZCA6IG1f dXBkYXRlZFRvdWNoRXZlbnRzKQotICAgICAgICBtX3RvdWNoRXZlbnRzW2lkXS50eXBlID0gd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfbnVsbDsKLSAgICBtX3RvdWNoRXZlbnRzLnJlbW92ZUFs bE1hdGNoaW5nKFtdIChhdXRvIGN1cnJlbnQpIHsKLSAgICAgICAgcmV0dXJuIGN1cnJlbnQudHlw ZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfdHlwZV9udWxsOwotICAgICAgICB9KTsKLX0KLQot dm9pZCBFdmVudFNlbmRlclByb3h5OjpwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0g d3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGUgZXZlbnRUeXBlKQotewotICAgIGF1dG8gdXBkYXRl ZEV2ZW50cyA9IGdldFVwZGF0ZWRUb3VjaEV2ZW50cygpOwotICAgIHN0cnVjdCB3cGVfaW5wdXRf dG91Y2hfZXZlbnQgZXZlbnQgPSB7IHVwZGF0ZWRFdmVudHMuZGF0YSgpLCB1cGRhdGVkRXZlbnRz LnNpemUoKSwgZXZlbnRUeXBlLCAwLCBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIDAgfTsKLSAg ICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX3RvdWNoX2V2ZW50KHZpZXdCYWNrZW5kKCptX3Rl c3RDb250cm9sbGVyKSwgJmV2ZW50KTsKLSAgICBpZiAoZXZlbnRUeXBlID09IHdwZV9pbnB1dF90 b3VjaF9ldmVudF90eXBlX3VwKQotICAgICAgICByZW1vdmVVcGRhdGVkVG91Y2hFdmVudHMoKTsK LSAgICBtX3VwZGF0ZWRUb3VjaEV2ZW50cy5jbGVhcigpOwotfQotCiB2b2lkIEV2ZW50U2VuZGVy UHJveHk6OnRvdWNoU3RhcnQoKQogewogICAgIHByZXBhcmVBbmREaXNwYXRjaFRvdWNoRXZlbnQo d3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfZG93bik7CkBAIC00MzIsNCArNDA3LDMzIEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6Y2FuY2VsVG91Y2hQb2ludChpbnQpCiAgICAgbm90SW1wbGVt ZW50ZWQoKTsKIH0KIAorVmVjdG9yPHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBF dmVudFNlbmRlclByb3h5OjpnZXRVcGRhdGVkVG91Y2hFdmVudHMoKQoreworICAgIFZlY3Rvcjx3 cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBldmVudHM7CisgICAgZm9yIChhdXRvIGlkIDogbV91 cGRhdGVkVG91Y2hFdmVudHMpCisgICAgICAgIGV2ZW50cy5hcHBlbmQobV90b3VjaEV2ZW50c1tp ZF0pOworICAgIHJldHVybiBldmVudHM7Cit9CisKK3ZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmVt b3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCkKK3sKKyAgICBmb3IgKGF1dG8gaWQgOiBtX3VwZGF0ZWRU b3VjaEV2ZW50cykKKyAgICAgICAgbV90b3VjaEV2ZW50c1tpZF0udHlwZSA9IHdwZV9pbnB1dF90 b3VjaF9ldmVudF90eXBlX251bGw7CisgICAgbV90b3VjaEV2ZW50cy5yZW1vdmVBbGxNYXRjaGlu ZyhbXSAoYXV0byBjdXJyZW50KSB7CisgICAgICAgIHJldHVybiBjdXJyZW50LnR5cGUgPT0gd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfbnVsbDsKKyAgICAgICAgfSk7Cit9CisKK3ZvaWQgRXZl bnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVudChlbnVtIHdwZV9pbnB1 dF90b3VjaF9ldmVudF90eXBlIGV2ZW50VHlwZSkKK3sKKyAgICBhdXRvIHVwZGF0ZWRFdmVudHMg PSBnZXRVcGRhdGVkVG91Y2hFdmVudHMoKTsKKyAgICBzdHJ1Y3Qgd3BlX2lucHV0X3RvdWNoX2V2 ZW50IGV2ZW50ID0geyB1cGRhdGVkRXZlbnRzLmRhdGEoKSwgdXBkYXRlZEV2ZW50cy5zaXplKCks IGV2ZW50VHlwZSwgMCwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCAwIH07CisgICAgd3BlX3Zp ZXdfYmFja2VuZF9kaXNwYXRjaF90b3VjaF9ldmVudCh2aWV3QmFja2VuZCgqbV90ZXN0Q29udHJv bGxlciksICZldmVudCk7CisgICAgaWYgKGV2ZW50VHlwZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZl bnRfdHlwZV91cCkKKyAgICAgICAgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7CisgICAgbV91 cGRhdGVkVG91Y2hFdmVudHMuY2xlYXIoKTsKK30KKworI2VuZGlmIC8vIEVOQUJMRShUT1VDSF9F VkVOVFMpCisKIH0gLy8gbmFtZXNwYWNlIFdUUgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BFLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5jcHAKc2ltaWxhcml0eSBpbmRleCA5NiUK cmVuYW1lIGZyb20gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BF LmNwcApyZW5hbWUgdG8gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJW aWV3TGliV1BFLmNwcAppbmRleCBmZDFmMWNmYmJlOTguLmRmYTI0YzY1ZWIwMiAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BFLmNwcAorKysg Yi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9QbGF0Zm9ybVdlYlZpZXdMaWJXUEUuY3Bw CkBAIC0yNywxMCArMjcsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2ViVmlldy5oIgogCiAjaW5j bHVkZSA8V1BFVG9vbGluZ0JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuaD4KLSNpbmNsdWRl IDxXZWJLaXQvV0tJbWFnZUNhaXJvLmg+Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KICNpbmNsdWRlIDxj c3RkaW8+Ci0jaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTExNSw3ICsxMTIsNyBAQCB2b2lkIFBs YXRmb3JtV2ViVmlldzo6bWFrZVdlYlZpZXdGaXJzdFJlc3BvbmRlcigpCiB7CiB9CiAKLWNhaXJv X3N1cmZhY2VfdCogUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKK1BsYXRm b3JtSW1hZ2UgUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKIHsKICAgICB7 CiAgICAgICAgIHN0cnVjdCBUaW1lb3V0VGltZXIgewo= 452061 2022-02-15 11:18:07 -0800 2022-02-16 05:54:24 -0800 Patch bug-236651.diff text/plain 10976 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNDU3 ZTRmN2M0OTcuLjU0NTNjMTE3MTViYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTE1ICBEb24gT2xtc3Rl YWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgU2hhcmUgV2ViS2l0VGVzdFJ1 bm5lciBjb2RlIGFtb25nIFVTRShMSUJXUEUpIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkgUExBVEZPUk0oV1BFKSB0byBVU0UoTElC V1BFKSBpbiBFdmVudFNlbmRlclByb3h5IGFuZCBQbGF0Zm9ybVdlYlZpZXcuIFRoZSBmb3JtZXIK KyAgICAgICAganVzdCB1c2VzIHRoZSBsaWJ3cGUgQVBJIHRvIHNlbmQgZXZlbnRzIHNvIGl0IGNh biBiZSBzaGFyZWQuIFRoZSBsYXRlciB1c2VzIHRoZQorICAgICAgICBXUEVUb29saW5nQmFja2Vu ZCBzbyBpdCBjYW4gYWxzbyBiZSBzaGFyZWQuCisKKyAgICAgICAgVGhlIFdQRSBwb3J0IHdhcyBt aXNzaW5nIGd1YXJkcyBhcm91bmQgRU5BQkxFKFRPVUNIX0VWRU5UUykgc28gYWRkIHRob3NlIGFu ZCBvcmdhbml6ZSB0aGUKKyAgICAgICAgY29ycmVzcG9uZGluZyAuY3BwIHNvIHRoZSBtZXRob2Rz IHRyYWNrIHdpdGggdGhlIG9yZGVyaW5nIGluIHRoZSBoZWFkZXIuCisKKyAgICAgICAgQWxzbyBt b2Rlcm5pemUgdGhlIFBsYXRmb3JtV2ViVmlldyBjb2RlIHRvIHByZWZlciB1c2luZyBvdmVyIHR5 cGVkZWYuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlOgorICAgICAgICAq IFdlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3Lmg6CisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9saWJ3cGUvRXZlbnRTZW5kZXJQcm94eUxpYldQRS5jcHA6IFJlbmFtZWQgZnJvbSBU b29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcC4KKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Z2V0VXBkYXRlZFRvdWNoRXZlbnRzKToKKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKToKKyAg ICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVu dCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJWaWV3TGli V1BFLmNwcDogUmVuYW1lZCBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3BlL1BsYXRmb3Jt V2ViVmlld1dQRS5jcHAuCisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6d2luZG93U25h cHNob3RJbWFnZSk6CisKIDIwMjItMDItMTQgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgogCiAgICAgICAgIFtFV1NdIE5lZWQgL2Jpbi9zaCBlcXVpdmFsZW50IG9uIHdpbmNh aXJvCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHku aCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oCmluZGV4IGFkYjlj M2QyMzkyMy4uZGNlYTg1M2MxZGY3IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L0V2ZW50U2VuZGVyUHJveHkuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2Vu ZGVyUHJveHkuaApAQCAtMzIsNyArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgVVNFKExJ QldQRSkKICNpbmNsdWRlIDx3cGUvd3BlLmg+CiAjZW5kaWYKIApAQCAtMTMwLDcgKzEzMCw3IEBA IHByaXZhdGU6CiAgICAgUmV0YWluUHRyPE5TRXZlbnQ+IHByZXNzdXJlQ2hhbmdlRXZlbnQoaW50 IHN0YWdlLCBmbG9hdCBwcmVzc3VyZSwgUHJlc3N1cmVDaGFuZ2VEaXJlY3Rpb24pOwogI2VuZGlm CiAKLSNpZiBQTEFURk9STShXUEUpCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgVVNFKExJ QldQRSkKICAgICBWZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGdldFVw ZGF0ZWRUb3VjaEV2ZW50cygpOwogICAgIHZvaWQgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7 CiAgICAgdm9pZCBwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0gd3BlX2lucHV0X3Rv dWNoX2V2ZW50X3R5cGUpOwpAQCAtMTU1LDExICsxNTUsMTMgQEAgcHJpdmF0ZToKICNpZiBQTEFU Rk9STShHVEspCiAgICAgYm9vbCBtX2hhc1ByZWNpc2VEZWx0YXMgeyBmYWxzZSB9OwogI2VuZGlm Ci0jaWYgUExBVEZPUk0oV1BFKQorI2lmIFVTRShMSUJXUEUpCiAgICAgdWludDMyX3QgbV9idXR0 b25TdGF0ZSB7IDAgfTsKKyNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgIFZlY3RvcjxzdHJ1 Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50X3Jhdz4gbV90b3VjaEV2ZW50czsKICAgICBIYXNoU2V0 PHVuc2lnbmVkLCBEZWZhdWx0SGFzaDx1bnNpZ25lZD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tl eUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBtX3VwZGF0ZWRUb3VjaEV2ZW50czsKICNlbmRpZgorI2Vu ZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXVFIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRm b3JtV1BFLmNtYWtlCmluZGV4IDIwMTRiYTJlMTE2NC4uZjZiNTlkYjNjMGVlIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtV1BFLmNtYWtlCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XUEUuY21ha2UKQEAgLTYsOCArNiw5IEBAIGxpc3QoQVBQ RU5EIFdlYktpdFRlc3RSdW5uZXJfREVQRU5ERU5DSUVTIFdlYktpdFRlc3RSdW5uZXItZm9yd2Fy ZGluZy1oZWFkZXJzKQogbGlzdChBUFBFTkQgV2ViS2l0VGVzdFJ1bm5lcl9TT1VSQ0VTCiAgICAg Y2Fpcm8vVGVzdEludm9jYXRpb25DYWlyby5jcHAKIAotICAgIHdwZS9FdmVudFNlbmRlclByb3h5 V1BFLmNwcAotICAgIHdwZS9QbGF0Zm9ybVdlYlZpZXdXUEUuY3BwCisgICAgbGlid3BlL0V2ZW50 U2VuZGVyUHJveHlMaWJXUEUuY3BwCisgICAgbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5j cHAKKwogICAgIHdwZS9UZXN0Q29udHJvbGxlcldQRS5jcHAKICAgICB3cGUvVUlTY3JpcHRDb250 cm9sbGVyV1BFLmNwcAogICAgIHdwZS9tYWluLmNwcApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxh dGZvcm1XZWJWaWV3LmgKaW5kZXggYjlkMGFkZmY0ZDlhLi5lZTVhMjlhMzdhZjggMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1XZWJWaWV3LmgKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaApAQCAtNDAsMjggKzQwLDI3IEBAIE9C SkNfQ0xBU1MgV0tXZWJWaWV3Q29uZmlndXJhdGlvbjsKIE9CSkNfQ0xBU1MgV2ViS2l0VGVzdFJ1 bm5lcldpbmRvdzsKIHR5cGVkZWYgc3RydWN0IENHSW1hZ2UgKkNHSW1hZ2VSZWY7CiAKLXR5cGVk ZWYgVGVzdFJ1bm5lcldLV2ViVmlldyAqUGxhdGZvcm1XS1ZpZXc7Ci10eXBlZGVmIFdlYktpdFRl c3RSdW5uZXJXaW5kb3cgKlBsYXRmb3JtV2luZG93OwotdHlwZWRlZiBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gUGxhdGZvcm1JbWFnZTsKK3VzaW5nIFBsYXRmb3JtV0tWaWV3ID0gVGVzdFJ1bm5lcldL V2ViVmlldyo7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9IFdlYktpdFRlc3RSdW5uZXJXaW5kb3cq OwordXNpbmcgUGxhdGZvcm1JbWFnZSA9IFJldGFpblB0cjxDR0ltYWdlUmVmPjsKICNlbGlmIGRl ZmluZWQoQlVJTERJTkdfR1RLX18pCiB0eXBlZGVmIHN0cnVjdCBfR3RrV2lkZ2V0IEd0a1dpZGdl dDsKIHR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwogdHlwZWRlZiBHdGtXaWRnZXQq IFBsYXRmb3JtV2luZG93OwotI2VsaWYgUExBVEZPUk0oV1BFKQorI2VsaWYgVVNFKExJQldQRSkK IG5hbWVzcGFjZSBXUEVUb29saW5nQmFja2VuZHMgewogY2xhc3MgSGVhZGxlc3NWaWV3QmFja2Vu ZDsKIH0KLXR5cGVkZWYgV0tWaWV3UmVmIFBsYXRmb3JtV0tWaWV3OwotdHlwZWRlZiBXUEVUb29s aW5nQmFja2VuZHM6OkhlYWRsZXNzVmlld0JhY2tlbmQqIFBsYXRmb3JtV2luZG93OwordXNpbmcg UGxhdGZvcm1XS1ZpZXcgPSBXS1ZpZXdSZWY7Cit1c2luZyBQbGF0Zm9ybVdpbmRvdyA9IFdQRVRv b2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZCo7CiAjZWxpZiBQTEFURk9STShXSU4p Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KLWNsYXNzIFRlc3RSdW5uZXJXaW5kb3c7Ci10eXBlZGVmIEhX TkQgUGxhdGZvcm1XaW5kb3c7Ci10eXBlZGVmIFdLVmlld1JlZiBQbGF0Zm9ybVdLVmlldzsKK3Vz aW5nIFBsYXRmb3JtV0tWaWV3ID0gV0tWaWV3UmVmOwordXNpbmcgUGxhdGZvcm1XaW5kb3cgPSBI V05EOwogI2VuZGlmCiAKICNpZiBVU0UoQ0FJUk8pCi10eXBlZGVmIGNhaXJvX3N1cmZhY2VfdCog UGxhdGZvcm1JbWFnZTsKKyNpbmNsdWRlIDxjYWlyby5oPgordXNpbmcgUGxhdGZvcm1JbWFnZSA9 IGNhaXJvX3N1cmZhY2VfdCo7CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdUUiB7CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3dwZS9FdmVudFNlbmRlclByb3h5V1BFLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbGlid3BlL0V2ZW50U2VuZGVyUHJveHlMaWJXUEUuY3BwCnNp bWlsYXJpdHkgaW5kZXggOTklCnJlbmFtZSBmcm9tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvd3Bl L0V2ZW50U2VuZGVyUHJveHlXUEUuY3BwCnJlbmFtZSB0byBUb29scy9XZWJLaXRUZXN0UnVubmVy L2xpYndwZS9FdmVudFNlbmRlclByb3h5TGliV1BFLmNwcAppbmRleCAyZjY0ZWRjZDY1Y2EuLmM3 ZjYyODA0OWFmYSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvRXZlbnRT ZW5kZXJQcm94eVdQRS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvRXZl bnRTZW5kZXJQcm94eUxpYldQRS5jcHAKQEAgLTE3NiwxMSArMTc2LDExIEBAIHZvaWQgRXZlbnRT ZW5kZXJQcm94eTo6bW91c2VTY3JvbGxCeShpbnQgaG9yaXpvbnRhbCwgaW50IHZlcnRpY2FsKQog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoaG9yaXpvbnRhbCkgewotICAgICAgICBzdHJ1Y3Qg d3BlX2lucHV0X2F4aXNfZXZlbnQgZXZlbnQgPSB7IHdwZV9pbnB1dF9heGlzX2V2ZW50X3R5cGVf bW90aW9uLCBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIHN0YXRpY19jYXN0PGludD4obV9wb3Np dGlvbi54KSwgc3RhdGljX2Nhc3Q8aW50PihtX3Bvc2l0aW9uLnkpLCBIb3Jpem9udGFsU2Nyb2xs LCBob3Jpem9udGFsLCAwfTsKKyAgICAgICAgc3RydWN0IHdwZV9pbnB1dF9heGlzX2V2ZW50IGV2 ZW50ID0geyB3cGVfaW5wdXRfYXhpc19ldmVudF90eXBlX21vdGlvbiwgc2VjVG9Nc1RpbWVzdGFt cChtX3RpbWUpLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcG9zaXRpb24ueCksIHN0YXRpY19jYXN0PGlu dD4obV9wb3NpdGlvbi55KSwgSG9yaXpvbnRhbFNjcm9sbCwgaG9yaXpvbnRhbCwgMCB9OwogICAg ICAgICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX2F4aXNfZXZlbnQodmlld0JhY2tlbmQoKm1f dGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwogICAgIH0KICAgICBpZiAodmVydGljYWwpIHsKLSAg ICAgICAgc3RydWN0IHdwZV9pbnB1dF9heGlzX2V2ZW50IGV2ZW50ID0gIHsgd3BlX2lucHV0X2F4 aXNfZXZlbnRfdHlwZV9tb3Rpb24sIHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwgc3RhdGljX2Nh c3Q8aW50PihtX3Bvc2l0aW9uLngpLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcG9zaXRpb24ueSksIFZl cnRpY2FsU2Nyb2xsLCB2ZXJ0aWNhbCwgMH07CisgICAgICAgIHN0cnVjdCB3cGVfaW5wdXRfYXhp c19ldmVudCBldmVudCA9ICB7IHdwZV9pbnB1dF9heGlzX2V2ZW50X3R5cGVfbW90aW9uLCBzZWNU b01zVGltZXN0YW1wKG1fdGltZSksIHN0YXRpY19jYXN0PGludD4obV9wb3NpdGlvbi54KSwgc3Rh dGljX2Nhc3Q8aW50PihtX3Bvc2l0aW9uLnkpLCBWZXJ0aWNhbFNjcm9sbCwgdmVydGljYWwsIDAg fTsKICAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9heGlzX2V2ZW50KHZpZXdCYWNr ZW5kKCptX3Rlc3RDb250cm9sbGVyKSwgJmV2ZW50KTsKICAgICB9CiB9CkBAIC0zMjAsNyArMzIw LDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtleVJlZiwg V0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKICAgICBzdHJ1Y3Qgd3BlX2lucHV0X3hrYl9r ZXltYXBfZW50cnkqIGVudHJpZXM7CiAgICAgdWludDMyX3QgZW50cmllc0NvdW50OwogICAgIHdw ZV9pbnB1dF94a2JfY29udGV4dF9nZXRfZW50cmllc19mb3Jfa2V5X2NvZGUod3BlX2lucHV0X3hr Yl9jb250ZXh0X2dldF9kZWZhdWx0KCksIGtleVN5bSwgJmVudHJpZXMsICZlbnRyaWVzQ291bnQp OwotICAgIHN0cnVjdCB3cGVfaW5wdXRfa2V5Ym9hcmRfZXZlbnQgZXZlbnQgeyBzZWNUb01zVGlt ZXN0YW1wKG1fdGltZSksIGtleVN5bSwgZW50cmllc0NvdW50ID8gZW50cmllc1swXS5oYXJkd2Fy ZV9rZXlfY29kZSA6IDAsIHRydWUsIG1vZGlmaWVyc307CisgICAgc3RydWN0IHdwZV9pbnB1dF9r ZXlib2FyZF9ldmVudCBldmVudCB7IHNlY1RvTXNUaW1lc3RhbXAobV90aW1lKSwga2V5U3ltLCBl bnRyaWVzQ291bnQgPyBlbnRyaWVzWzBdLmhhcmR3YXJlX2tleV9jb2RlIDogMCwgdHJ1ZSwgbW9k aWZpZXJzIH07CiAgICAgd3BlX3ZpZXdfYmFja2VuZF9kaXNwYXRjaF9rZXlib2FyZF9ldmVudCh2 aWV3QmFja2VuZCgqbV90ZXN0Q29udHJvbGxlciksICZldmVudCk7CiAgICAgZXZlbnQucHJlc3Nl ZCA9IGZhbHNlOwogICAgIHdwZV92aWV3X2JhY2tlbmRfZGlzcGF0Y2hfa2V5Ym9hcmRfZXZlbnQo dmlld0JhY2tlbmQoKm1fdGVzdENvbnRyb2xsZXIpLCAmZXZlbnQpOwpAQCAtMzM1LDYgKzMzNSw4 IEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmF3S2V5VXAoV0tTdHJpbmdSZWYga2V5LCBXS0V2 ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgdW5zCiB7CiB9CiAKKyNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQorCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmFkZFRvdWNoUG9pbnQoaW50IHgsIGludCB5 KQogewogICAgIHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3IHJhd0V2ZW50IHsgd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfZG93biwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCBz dGF0aWNfY2FzdDxpbnQ+KG1fdG91Y2hFdmVudHMuc2l6ZSgpKSwgc3RhdGljX2Nhc3Q8aW50MzJf dD4oeCksIHN0YXRpY19jYXN0PGludDMyX3Q+KHkpIH07CkBAIC0zNjQsMzMgKzM2Niw2IEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6c2V0VG91Y2hQb2ludFJhZGl1cyhpbnQsIGludCkKICAgICBu b3RJbXBsZW1lbnRlZCgpOwogfQogCi1WZWN0b3I8c3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVu dF9yYXc+IEV2ZW50U2VuZGVyUHJveHk6OmdldFVwZGF0ZWRUb3VjaEV2ZW50cygpCi17Ci0gICAg VmVjdG9yPHdwZV9pbnB1dF90b3VjaF9ldmVudF9yYXc+IGV2ZW50czsKLSAgICBmb3IgKGF1dG8g aWQgOiBtX3VwZGF0ZWRUb3VjaEV2ZW50cykKLSAgICAgICAgZXZlbnRzLmFwcGVuZChtX3RvdWNo RXZlbnRzW2lkXSk7Ci0gICAgcmV0dXJuIGV2ZW50czsKLX0KLQotdm9pZCBFdmVudFNlbmRlclBy b3h5OjpyZW1vdmVVcGRhdGVkVG91Y2hFdmVudHMoKQotewotICAgIGZvciAoYXV0byBpZCA6IG1f dXBkYXRlZFRvdWNoRXZlbnRzKQotICAgICAgICBtX3RvdWNoRXZlbnRzW2lkXS50eXBlID0gd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfbnVsbDsKLSAgICBtX3RvdWNoRXZlbnRzLnJlbW92ZUFs bE1hdGNoaW5nKFtdIChhdXRvIGN1cnJlbnQpIHsKLSAgICAgICAgcmV0dXJuIGN1cnJlbnQudHlw ZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfdHlwZV9udWxsOwotICAgICAgICB9KTsKLX0KLQot dm9pZCBFdmVudFNlbmRlclByb3h5OjpwcmVwYXJlQW5kRGlzcGF0Y2hUb3VjaEV2ZW50KGVudW0g d3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGUgZXZlbnRUeXBlKQotewotICAgIGF1dG8gdXBkYXRl ZEV2ZW50cyA9IGdldFVwZGF0ZWRUb3VjaEV2ZW50cygpOwotICAgIHN0cnVjdCB3cGVfaW5wdXRf dG91Y2hfZXZlbnQgZXZlbnQgPSB7IHVwZGF0ZWRFdmVudHMuZGF0YSgpLCB1cGRhdGVkRXZlbnRz LnNpemUoKSwgZXZlbnRUeXBlLCAwLCBzZWNUb01zVGltZXN0YW1wKG1fdGltZSksIDAgfTsKLSAg ICB3cGVfdmlld19iYWNrZW5kX2Rpc3BhdGNoX3RvdWNoX2V2ZW50KHZpZXdCYWNrZW5kKCptX3Rl c3RDb250cm9sbGVyKSwgJmV2ZW50KTsKLSAgICBpZiAoZXZlbnRUeXBlID09IHdwZV9pbnB1dF90 b3VjaF9ldmVudF90eXBlX3VwKQotICAgICAgICByZW1vdmVVcGRhdGVkVG91Y2hFdmVudHMoKTsK LSAgICBtX3VwZGF0ZWRUb3VjaEV2ZW50cy5jbGVhcigpOwotfQotCiB2b2lkIEV2ZW50U2VuZGVy UHJveHk6OnRvdWNoU3RhcnQoKQogewogICAgIHByZXBhcmVBbmREaXNwYXRjaFRvdWNoRXZlbnQo d3BlX2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfZG93bik7CkBAIC00MzIsNCArNDA3LDMzIEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6Y2FuY2VsVG91Y2hQb2ludChpbnQpCiAgICAgbm90SW1wbGVt ZW50ZWQoKTsKIH0KIAorVmVjdG9yPHN0cnVjdCB3cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBF dmVudFNlbmRlclByb3h5OjpnZXRVcGRhdGVkVG91Y2hFdmVudHMoKQoreworICAgIFZlY3Rvcjx3 cGVfaW5wdXRfdG91Y2hfZXZlbnRfcmF3PiBldmVudHM7CisgICAgZm9yIChhdXRvIGlkIDogbV91 cGRhdGVkVG91Y2hFdmVudHMpCisgICAgICAgIGV2ZW50cy5hcHBlbmQobV90b3VjaEV2ZW50c1tp ZF0pOworICAgIHJldHVybiBldmVudHM7Cit9CisKK3ZvaWQgRXZlbnRTZW5kZXJQcm94eTo6cmVt b3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCkKK3sKKyAgICBmb3IgKGF1dG8gaWQgOiBtX3VwZGF0ZWRU b3VjaEV2ZW50cykKKyAgICAgICAgbV90b3VjaEV2ZW50c1tpZF0udHlwZSA9IHdwZV9pbnB1dF90 b3VjaF9ldmVudF90eXBlX251bGw7CisgICAgbV90b3VjaEV2ZW50cy5yZW1vdmVBbGxNYXRjaGlu ZyhbXSAoYXV0byBjdXJyZW50KSB7CisgICAgICAgIHJldHVybiBjdXJyZW50LnR5cGUgPT0gd3Bl X2lucHV0X3RvdWNoX2V2ZW50X3R5cGVfbnVsbDsKKyAgICAgICAgfSk7Cit9CisKK3ZvaWQgRXZl bnRTZW5kZXJQcm94eTo6cHJlcGFyZUFuZERpc3BhdGNoVG91Y2hFdmVudChlbnVtIHdwZV9pbnB1 dF90b3VjaF9ldmVudF90eXBlIGV2ZW50VHlwZSkKK3sKKyAgICBhdXRvIHVwZGF0ZWRFdmVudHMg PSBnZXRVcGRhdGVkVG91Y2hFdmVudHMoKTsKKyAgICBzdHJ1Y3Qgd3BlX2lucHV0X3RvdWNoX2V2 ZW50IGV2ZW50ID0geyB1cGRhdGVkRXZlbnRzLmRhdGEoKSwgdXBkYXRlZEV2ZW50cy5zaXplKCks IGV2ZW50VHlwZSwgMCwgc2VjVG9Nc1RpbWVzdGFtcChtX3RpbWUpLCAwIH07CisgICAgd3BlX3Zp ZXdfYmFja2VuZF9kaXNwYXRjaF90b3VjaF9ldmVudCh2aWV3QmFja2VuZCgqbV90ZXN0Q29udHJv bGxlciksICZldmVudCk7CisgICAgaWYgKGV2ZW50VHlwZSA9PSB3cGVfaW5wdXRfdG91Y2hfZXZl bnRfdHlwZV91cCkKKyAgICAgICAgcmVtb3ZlVXBkYXRlZFRvdWNoRXZlbnRzKCk7CisgICAgbV91 cGRhdGVkVG91Y2hFdmVudHMuY2xlYXIoKTsKK30KKworI2VuZGlmIC8vIEVOQUJMRShUT1VDSF9F VkVOVFMpCisKIH0gLy8gbmFtZXNwYWNlIFdUUgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BFLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvbGlid3BlL1BsYXRmb3JtV2ViVmlld0xpYldQRS5jcHAKc2ltaWxhcml0eSBpbmRleCA5NiUK cmVuYW1lIGZyb20gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BF LmNwcApyZW5hbWUgdG8gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9saWJ3cGUvUGxhdGZvcm1XZWJW aWV3TGliV1BFLmNwcAppbmRleCBmZDFmMWNmYmJlOTguLmRmYTI0YzY1ZWIwMiAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93cGUvUGxhdGZvcm1XZWJWaWV3V1BFLmNwcAorKysg Yi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2xpYndwZS9QbGF0Zm9ybVdlYlZpZXdMaWJXUEUuY3Bw CkBAIC0yNywxMCArMjcsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2ViVmlldy5oIgogCiAjaW5j bHVkZSA8V1BFVG9vbGluZ0JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuaD4KLSNpbmNsdWRl IDxXZWJLaXQvV0tJbWFnZUNhaXJvLmg+Ci0jaW5jbHVkZSA8Y2Fpcm8uaD4KICNpbmNsdWRlIDxj c3RkaW8+Ci0jaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTExNSw3ICsxMTIsNyBAQCB2b2lkIFBs YXRmb3JtV2ViVmlldzo6bWFrZVdlYlZpZXdGaXJzdFJlc3BvbmRlcigpCiB7CiB9CiAKLWNhaXJv X3N1cmZhY2VfdCogUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKK1BsYXRm b3JtSW1hZ2UgUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKIHsKICAgICB7 CiAgICAgICAgIHN0cnVjdCBUaW1lb3V0VGltZXIgewo=