217858 2020-10-16 17:29:05 -0700 Web Inspector: rename `Highlight` so it doesn't conflict with CSS `Highlight` 2020-10-17 00:37:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi ews-watchlist hi inspector-bugzilla-changes joepeck megan_gardner webkit-bug-importer oldest_to_newest 1698835 0 hi 2020-10-16 17:29:05 -0700 `Highlight` should really be something like `InspectorOverlay::Highlight` 1698840 1 411637 hi 2020-10-16 17:50:55 -0700 Created attachment 411637 Patch 1698908 2 ews-feeder 2020-10-16 21:39:58 -0700 Committed r268635: <https://trac.webkit.org/changeset/268635> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411637. 1698909 3 webkit-bug-importer 2020-10-16 21:40:21 -0700 <rdar://problem/70402394> 411637 2020-10-16 17:50:55 -0700 2020-10-17 00:37:24 -0700 Patch bug-217858-20201016175054.patch text/plain 46222 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNzczZGNiNTRhNDc4ODlhYmM2MmUxNDQ4NjdmODA3YjUyNDI1OWIxLi44 YzdiMjE1ZmRjNGY1YmIzNmY4MjNkYmJjYmUwNjE1ZWI0YmUxNTFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsNDYgQEAKKzIwMjAtMTAtMTYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbmFtZSBgSGlnaGxpZ2h0YCBzbyBpdCBkb2Vz bid0IGNvbmZsaWN0IHdpdGggQ1NTIGBIaWdobGlnaHRgCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc4NTgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgdGhlcmUgaXMgbm8gYmVo YXZpb3IgY2hhbmdlIHNpbmNlIHRoaXMgaXMgcHVyZWx5IGEgcmVuYW1lLgorCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ck92ZXJsYXk6OkhpZ2hsaWdodDo6c2V0RGF0YUZyb21Db25maWcpOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkhpZ2hsaWdodDo6SGlnaGxpZ2h0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkhpZ2hsaWdodDo6c2V0RGF0YUZyb21Db25maWcpOiBEZWxldGVkLgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkUmVu ZGVyZXJIaWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGROb2RlSGlnaGxpZ2h0KToK KyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkUXVhZEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpxdWFkVG9QYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdPdXRsaW5lZFF1YWRXaXRoQ2xp cCk6CisgICAgICAgIChXZWJDb3JlOjpkcmF3T3V0bGluZWRRdWFkKToKKyAgICAgICAgKFdlYkNv cmU6OmRyYXdGcmFnbWVudEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpkcmF3U2hhcGVI aWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6Z2V0SGlnaGxp Z2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OmhpZ2hsaWdo dE5vZGVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OmhpZ2hsaWdo dE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6aGlnaGxpZ2h0UXVh ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpkcmF3UXVhZEhpZ2hsaWdo dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpkcmF3Qm91bmRzKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OmRyYXdFbGVtZW50VGl0bGUpOgorCisg ICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oOgorICAgICAgICAq IGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3Qp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmlubmVySGlnaGxpZ2h0UXVh ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Tm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Tm9kZUxpc3Qp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodEZyYW1lKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckNvbnRyb2xsZXI6OmdldEhpZ2hsaWdodCBjb25zdCk6CisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjppbnNwZWN0b3JIaWdo bGlnaHRSZWN0cyk6CisKIDIwMjAtMTAtMTUgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIExlc3NlbiB0aGUgcmVsaWFuY2Ugb24gVlBBVEggaW4gV2ViQ29yZS9E ZXJpdmVkU291cmNlcy5tYWtlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI3YmQyOTgwN2I1NGRmZWE1NWFkY2EyNzU2 YWE4NjM5MDk3ZjVlNGUuLjQ5ZmYyNjQ1NTEwNTE4OGFlZjdmMzQzMjUzM2NhMmYxZTRkNTE3YjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMjAtMTAtMTYgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbmFtZSBgSGlnaGxp Z2h0YCBzbyBpdCBkb2Vzbid0IGNvbmZsaWN0IHdpdGggQ1NTIGBIaWdobGlnaHRgCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc4NTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMg dGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlIHNpbmNlIHRoaXMgaXMgcHVyZWx5IGEgcmVuYW1l LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHk6CisgICAgICAgICogU2hh cmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oOgorICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJn dW1lbnRDb2RlcnMuY3BwOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPEluc3BlY3Rvck92 ZXJsYXk6OkhpZ2hsaWdodD46OmVuY29kZSk6IEFkZGVkLgorICAgICAgICAoSVBDOjpBcmd1bWVu dENvZGVyPEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodD46OmRlY29kZSk6IEFkZGVkLgorICAg ICAgICAoSVBDOjpBcmd1bWVudENvZGVyPEhpZ2hsaWdodD46OmVuY29kZSk6IERlbGV0ZWQuCisg ICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8SGlnaGxpZ2h0Pjo6ZGVjb2RlKTogRGVsZXRlZC4K KworICAgICAgICAqIFdlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvckNsaWVudC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvckNsaWVudDo6aGlnaGxpZ2h0KToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2hv d0luc3BlY3RvckhpZ2hsaWdodCk6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgX3Nob3dJbnNwZWN0b3JIaWdobGlnaHQ6XSk6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJ T1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2hvd0luc3BlY3RvckhpZ2hs aWdodCk6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Q YWdlQ2xpZW50SW1wbElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnNo b3dJbnNwZWN0b3JIaWdobGlnaHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3IvaW9z L1dLSW5zcGVjdG9ySGlnaGxpZ2h0Vmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0 b3IvaW9zL1dLSW5zcGVjdG9ySGlnaGxpZ2h0Vmlldy5tbToKKyAgICAgICAgKC1bV0tJbnNwZWN0 b3JIaWdobGlnaHRWaWV3IF9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0Om9mZnNldDpdKToKKyAgICAg ICAgKC1bV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3IF9sYXlvdXRGb3JOb2RlTGlzdEhpZ2hsaWdo dDpdKToKKyAgICAgICAgKC1bV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3IF9sYXlvdXRGb3JSZWN0 c0hpZ2hsaWdodDpdKToKKyAgICAgICAgKC1bV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3IHVwZGF0 ZTpdKToKKwogMjAyMC0xMC0xNSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgog CiAgICAgICAgIHYyOiBXZWJLaXQ6OlhQQ1NlcnZpY2VFdmVudEhhbmRsZXIgYmxvY2sgc2hvdWxk IGNhbGwgZXhpdCgpIG9uIHRoZSBtYWluIHRocmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n CmluZGV4IDk0MzBmZjE5Zjc0MWYwMzg4YmVlZGIzMmQzNzdmYTE0ZGY4M2IzYWMuLmY2MGQ5ODZj ODY3YTgyMWQzYWE4MmFiYmVlM2IzZGJmYzE3OGI2OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMC0xMC0xNiAgRGV2aW4gUm91c3NvICA8ZHJvdXNz b0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVuYW1lIGBIaWdobGlnaHRg IHNvIGl0IGRvZXNuJ3QgY29uZmxpY3Qgd2l0aCBDU1MgYEhpZ2hsaWdodGAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzg1OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGVy ZSBpcyBubyBiZWhhdmlvciBjaGFuZ2Ugc2luY2UgdGhpcyBpcyBwdXJlbHkgYSByZW5hbWUuCisK KyAgICAgICAgKiBXZWJJbnNwZWN0b3IvV2ViTm9kZUhpZ2hsaWdodFZpZXcubW06CisgICAgICAg ICgtW1dlYk5vZGVIaWdobGlnaHRWaWV3IF9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0OnBhcmVudDpd KToKKyAgICAgICAgKC1bV2ViTm9kZUhpZ2hsaWdodFZpZXcgX2xheW91dEZvclJlY3RzSGlnaGxp Z2h0OnBhcmVudDpdKToKKyAgICAgICAgKC1bV2ViTm9kZUhpZ2hsaWdodFZpZXcgbGF5b3V0U3Vi bGF5ZXJzOl0pOgorCiAyMDIwLTEwLTEzICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgbGVmdG92ZXIgTUFDT1NYX0RFUExPWU1FTlRfVEFSR0VUX21h Y29zeCBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5jcHAKaW5kZXggNjMwZGY3MTc5MGM2M2I2ZTc1ODczNDUxYTE3NDBmODZmNjdlMDJk ZS4uNzM0ZThiNzg1NGZkMDMxODczNDI4YWNlODg1MDQ5ZGRlNjYxNzMyYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMzU2LDcg KzM1Niw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZHJhd0hpZ2hsaWdodChHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQpIGNvbnN0CiAgICAgbV9vdmVybGF5LT5wYWludChjb250ZXh0KTsK IH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRIaWdobGlnaHQoSGlnaGxpZ2h0JiBo aWdobGlnaHQsIEluc3BlY3Rvck92ZXJsYXk6OkNvb3JkaW5hdGVTeXN0ZW0gY29vcmRpbmF0ZVN5 c3RlbSkgY29uc3QKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Z2V0SGlnaGxpZ2h0KEluc3Bl Y3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYgaGlnaGxpZ2h0LCBJbnNwZWN0b3JPdmVybGF5OjpDb29y ZGluYXRlU3lzdGVtIGNvb3JkaW5hdGVTeXN0ZW0pIGNvbnN0CiB7CiAgICAgbV9vdmVybGF5LT5n ZXRIaWdobGlnaHQoaGlnaGxpZ2h0LCBjb29yZGluYXRlU3lzdGVtKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCmluZGV4IGIzMTE4MDgwYWM1 ZjYxYjIzM2E1ZjQ5OThlYTlhNjNkYzk1Y2NhNzUuLjFjYmQ0NTJmZmYzZmMzODYwNTBkYjhhMGVh ZDMzYjUwMTE2ZDgxZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaApAQCAtOTIsNyArOTIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbnNwZWN0 KE5vZGUqKTsKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNob3VsZFNob3dPdmVybGF5KCkgY29u c3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBkcmF3SGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4 dCYpIGNvbnN0OwotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZ2V0SGlnaGxpZ2h0KEhpZ2hsaWdo dCYsIEluc3BlY3Rvck92ZXJsYXk6OkNvb3JkaW5hdGVTeXN0ZW0pIGNvbnN0OworICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgZ2V0SGlnaGxpZ2h0KEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYs IEluc3BlY3Rvck92ZXJsYXk6OkNvb3JkaW5hdGVTeXN0ZW0pIGNvbnN0OwogICAgIHZvaWQgaGlk ZUhpZ2hsaWdodCgpOwogICAgIE5vZGUqIGhpZ2hsaWdodGVkTm9kZSgpIGNvbnN0OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKaW5kZXggNDg5MjA1 Y2U2NzE0NTE0OWY2OWZkYTIzNzQwZThjOWZiZGY1ZDIzYi4uNzQ3OTYxNzAwODNmZGJlNjMyZjhk NzZmMjAyMTM0ZDVhODUzM2YzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JPdmVybGF5LmNwcApAQCAtMTE2LDcgKzExNiw3IEBAIHN0YXRpYyBFbGVtZW50KiBlZmZl Y3RpdmVFbGVtZW50Rm9yTm9kZShOb2RlJiBub2RlKQogICAgIHJldHVybiBlbGVtZW50OwogfQog Ci1zdGF0aWMgdm9pZCBidWlsZFJlbmRlcmVySGlnaGxpZ2h0KFJlbmRlck9iamVjdCogcmVuZGVy ZXIsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxpZ2h0Q29uZmlnLCBIaWdobGlnaHQmIGhp Z2hsaWdodCwgSW5zcGVjdG9yT3ZlcmxheTo6Q29vcmRpbmF0ZVN5c3RlbSBjb29yZGluYXRlU3lz dGVtKQorc3RhdGljIHZvaWQgYnVpbGRSZW5kZXJlckhpZ2hsaWdodChSZW5kZXJPYmplY3QqIHJl bmRlcmVyLCBjb25zdCBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6OkNvbmZpZyYgaGlnaGxp Z2h0Q29uZmlnLCBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQmIGhpZ2hsaWdodCwgSW5zcGVj dG9yT3ZlcmxheTo6Q29vcmRpbmF0ZVN5c3RlbSBjb29yZGluYXRlU3lzdGVtKQogewogICAgIEZy YW1lKiBjb250YWluaW5nRnJhbWUgPSByZW5kZXJlci0+ZG9jdW1lbnQoKS5mcmFtZSgpOwogICAg IGlmICghY29udGFpbmluZ0ZyYW1lKQpAQCAtMTMwLDcgKzEzMCw3IEBAIHN0YXRpYyB2b2lkIGJ1 aWxkUmVuZGVyZXJIaWdobGlnaHQoUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgY29uc3QgSGlnaGxp Z2h0Q29uZmlnCiAgICAgYm9vbCBpc1NWR1JlbmRlcmVyID0gcmVuZGVyZXItPm5vZGUoKSAmJiBy ZW5kZXJlci0+bm9kZSgpLT5pc1NWR0VsZW1lbnQoKSAmJiAhcmVuZGVyZXItPmlzU1ZHUm9vdCgp OwogCiAgICAgaWYgKGlzU1ZHUmVuZGVyZXIpIHsKLSAgICAgICAgaGlnaGxpZ2h0LnR5cGUgPSBI aWdobGlnaHRUeXBlOjpSZWN0czsKKyAgICAgICAgaGlnaGxpZ2h0LnR5cGUgPSBJbnNwZWN0b3JP dmVybGF5OjpIaWdobGlnaHQ6OlR5cGU6OlJlY3RzOwogICAgICAgICByZW5kZXJlci0+YWJzb2x1 dGVRdWFkcyhoaWdobGlnaHQucXVhZHMpOwogICAgICAgICBmb3IgKGF1dG8mIHF1YWQgOiBoaWdo bGlnaHQucXVhZHMpCiAgICAgICAgICAgICBjb250ZW50c1F1YWRUb0Nvb3JkaW5hdGVTeXN0ZW0o bWFpblZpZXcsIGNvbnRhaW5pbmdWaWV3LCBxdWFkLCBjb29yZGluYXRlU3lzdGVtKTsKQEAgLTE3 NSw3ICsxNzUsNyBAQCBzdGF0aWMgdm9pZCBidWlsZFJlbmRlcmVySGlnaGxpZ2h0KFJlbmRlck9i amVjdCogcmVuZGVyZXIsIGNvbnN0IEhpZ2hsaWdodENvbmZpZwogICAgICAgICBjb250ZW50c1F1 YWRUb0Nvb3JkaW5hdGVTeXN0ZW0obWFpblZpZXcsIGNvbnRhaW5pbmdWaWV3LCBhYnNCb3JkZXJR dWFkLCBjb29yZGluYXRlU3lzdGVtKTsKICAgICAgICAgY29udGVudHNRdWFkVG9Db29yZGluYXRl U3lzdGVtKG1haW5WaWV3LCBjb250YWluaW5nVmlldywgYWJzTWFyZ2luUXVhZCwgY29vcmRpbmF0 ZVN5c3RlbSk7CiAKLSAgICAgICAgaGlnaGxpZ2h0LnR5cGUgPSBIaWdobGlnaHRUeXBlOjpOb2Rl OworICAgICAgICBoaWdobGlnaHQudHlwZSA9IEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodDo6 VHlwZTo6Tm9kZTsKICAgICAgICAgaGlnaGxpZ2h0LnF1YWRzLmFwcGVuZChhYnNNYXJnaW5RdWFk KTsKICAgICAgICAgaGlnaGxpZ2h0LnF1YWRzLmFwcGVuZChhYnNCb3JkZXJRdWFkKTsKICAgICAg ICAgaGlnaGxpZ2h0LnF1YWRzLmFwcGVuZChhYnNQYWRkaW5nUXVhZCk7CkBAIC0xODMsNyArMTgz LDcgQEAgc3RhdGljIHZvaWQgYnVpbGRSZW5kZXJlckhpZ2hsaWdodChSZW5kZXJPYmplY3QqIHJl bmRlcmVyLCBjb25zdCBIaWdobGlnaHRDb25maWcKICAgICB9CiB9CiAKLXN0YXRpYyB2b2lkIGJ1 aWxkTm9kZUhpZ2hsaWdodChOb2RlJiBub2RlLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhpZ2hs aWdodENvbmZpZywgSGlnaGxpZ2h0JiBoaWdobGlnaHQsIEluc3BlY3Rvck92ZXJsYXk6OkNvb3Jk aW5hdGVTeXN0ZW0gY29vcmRpbmF0ZVN5c3RlbSkKK3N0YXRpYyB2b2lkIGJ1aWxkTm9kZUhpZ2hs aWdodChOb2RlJiBub2RlLCBjb25zdCBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6OkNvbmZp ZyYgaGlnaGxpZ2h0Q29uZmlnLCBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQmIGhpZ2hsaWdo dCwgSW5zcGVjdG9yT3ZlcmxheTo6Q29vcmRpbmF0ZVN5c3RlbSBjb29yZGluYXRlU3lzdGVtKQog ewogICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBub2RlLnJlbmRlcmVyKCk7CiAgICAgaWYg KCFyZW5kZXJlcikKQEAgLTE5MiwxNCArMTkyLDE0IEBAIHN0YXRpYyB2b2lkIGJ1aWxkTm9kZUhp Z2hsaWdodChOb2RlJiBub2RlLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhpZ2hsaWdodENvbmZp CiAgICAgYnVpbGRSZW5kZXJlckhpZ2hsaWdodChyZW5kZXJlciwgaGlnaGxpZ2h0Q29uZmlnLCBo aWdobGlnaHQsIGNvb3JkaW5hdGVTeXN0ZW0pOwogfQogCi1zdGF0aWMgdm9pZCBidWlsZFF1YWRI aWdobGlnaHQoY29uc3QgRmxvYXRRdWFkJiBxdWFkLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhp Z2hsaWdodENvbmZpZywgSGlnaGxpZ2h0JiBoaWdobGlnaHQpCitzdGF0aWMgdm9pZCBidWlsZFF1 YWRIaWdobGlnaHQoY29uc3QgRmxvYXRRdWFkJiBxdWFkLCBjb25zdCBJbnNwZWN0b3JPdmVybGF5 OjpIaWdobGlnaHQ6OkNvbmZpZyYgaGlnaGxpZ2h0Q29uZmlnLCBJbnNwZWN0b3JPdmVybGF5OjpI aWdobGlnaHQmIGhpZ2hsaWdodCkKIHsKICAgICBoaWdobGlnaHQuc2V0RGF0YUZyb21Db25maWco aGlnaGxpZ2h0Q29uZmlnKTsKLSAgICBoaWdobGlnaHQudHlwZSA9IEhpZ2hsaWdodFR5cGU6OlJl Y3RzOworICAgIGhpZ2hsaWdodC50eXBlID0gSW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpU eXBlOjpSZWN0czsKICAgICBoaWdobGlnaHQucXVhZHMuYXBwZW5kKHF1YWQpOwogfQogCi1zdGF0 aWMgUGF0aCBxdWFkVG9QYXRoKGNvbnN0IEZsb2F0UXVhZCYgcXVhZCwgSGlnaGxpZ2h0OjpCb3Vu ZHMmIGJvdW5kcykKK3N0YXRpYyBQYXRoIHF1YWRUb1BhdGgoY29uc3QgRmxvYXRRdWFkJiBxdWFk LCBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6OkJvdW5kcyYgYm91bmRzKQogewogICAgIFBh dGggcGF0aDsKICAgICBwYXRoLm1vdmVUbyhxdWFkLnAxKCkpOwpAQCAtMjEzLDcgKzIxMyw3IEBA IHN0YXRpYyBQYXRoIHF1YWRUb1BhdGgoY29uc3QgRmxvYXRRdWFkJiBxdWFkLCBIaWdobGlnaHQ6 OkJvdW5kcyYgYm91bmRzKQogICAgIHJldHVybiBwYXRoOwogfQogCi1zdGF0aWMgdm9pZCBkcmF3 T3V0bGluZWRRdWFkV2l0aENsaXAoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9h dFF1YWQmIHF1YWQsIGNvbnN0IEZsb2F0UXVhZCYgY2xpcFF1YWQsIGNvbnN0IENvbG9yJiBmaWxs Q29sb3IsIEhpZ2hsaWdodDo6Qm91bmRzJiBib3VuZHMpCitzdGF0aWMgdm9pZCBkcmF3T3V0bGlu ZWRRdWFkV2l0aENsaXAoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFF1YWQm IHF1YWQsIGNvbnN0IEZsb2F0UXVhZCYgY2xpcFF1YWQsIGNvbnN0IENvbG9yJiBmaWxsQ29sb3Is IEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodDo6Qm91bmRzJiBib3VuZHMpCiB7CiAgICAgR3Jh cGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNvbnRleHQpOwogCkBAIC0yMjYsNyAr MjI2LDcgQEAgc3RhdGljIHZvaWQgZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwKEdyYXBoaWNzQ29u dGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRRdWFkJgogICAgIGNvbnRleHQuZmlsbFBhdGgocXVh ZFRvUGF0aChjbGlwUXVhZCwgYm91bmRzKSk7CiB9CiAKLXN0YXRpYyB2b2lkIGRyYXdPdXRsaW5l ZFF1YWQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFF1YWQmIHF1YWQsIGNv bnN0IENvbG9yJiBmaWxsQ29sb3IsIGNvbnN0IENvbG9yJiBvdXRsaW5lQ29sb3IsIEhpZ2hsaWdo dDo6Qm91bmRzJiBib3VuZHMpCitzdGF0aWMgdm9pZCBkcmF3T3V0bGluZWRRdWFkKEdyYXBoaWNz Q29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRRdWFkJiBxdWFkLCBjb25zdCBDb2xvciYgZmls bENvbG9yLCBjb25zdCBDb2xvciYgb3V0bGluZUNvbG9yLCBJbnNwZWN0b3JPdmVybGF5OjpIaWdo bGlnaHQ6OkJvdW5kcyYgYm91bmRzKQogewogICAgIFBhdGggcGF0aCA9IHF1YWRUb1BhdGgocXVh ZCwgYm91bmRzKTsKIApAQCAtMjQzLDkgKzI0Myw5IEBAIHN0YXRpYyB2b2lkIGRyYXdPdXRsaW5l ZFF1YWQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFF1YWQmIHF1YWQsIGNv CiAgICAgY29udGV4dC5zdHJva2VQYXRoKHBhdGgpOwogfQogCi1zdGF0aWMgdm9pZCBkcmF3RnJh Z21lbnRIaWdobGlnaHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2RlLCBjb25z dCBIaWdobGlnaHRDb25maWcmIGhpZ2hsaWdodENvbmZpZywgSGlnaGxpZ2h0OjpCb3VuZHMmIGJv dW5kcykKK3N0YXRpYyB2b2lkIGRyYXdGcmFnbWVudEhpZ2hsaWdodChHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIE5vZGUmIG5vZGUsIGNvbnN0IEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodDo6 Q29uZmlnJiBoaWdobGlnaHRDb25maWcsIEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodDo6Qm91 bmRzJiBib3VuZHMpCiB7Ci0gICAgSGlnaGxpZ2h0IGhpZ2hsaWdodDsKKyAgICBJbnNwZWN0b3JP dmVybGF5OjpIaWdobGlnaHQgaGlnaGxpZ2h0OwogICAgIGJ1aWxkTm9kZUhpZ2hsaWdodChub2Rl LCBoaWdobGlnaHRDb25maWcsIGhpZ2hsaWdodCwgSW5zcGVjdG9yT3ZlcmxheTo6Q29vcmRpbmF0 ZVN5c3RlbTo6RG9jdW1lbnQpOwogCiAgICAgRmxvYXRRdWFkIG1hcmdpblF1YWQ7CkBAIC0yNzYs NyArMjc2LDcgQEAgc3RhdGljIHZvaWQgZHJhd0ZyYWdtZW50SGlnaGxpZ2h0KEdyYXBoaWNzQ29u dGV4dCYgY29udGV4dCwgTm9kZSYgbm9kZSwgY29uc3QgSGkKICAgICAgICAgZHJhd091dGxpbmVk UXVhZChjb250ZXh0LCBjb250ZW50UXVhZCwgaGlnaGxpZ2h0LmNvbnRlbnRDb2xvciwgaGlnaGxp Z2h0LmNvbnRlbnRPdXRsaW5lQ29sb3IsIGJvdW5kcyk7CiB9CiAKLXN0YXRpYyB2b2lkIGRyYXdT aGFwZUhpZ2hsaWdodChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIE5vZGUmIG5vZGUsIEhpZ2hs aWdodDo6Qm91bmRzJiBib3VuZHMpCitzdGF0aWMgdm9pZCBkcmF3U2hhcGVIaWdobGlnaHQoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2RlLCBJbnNwZWN0b3JPdmVybGF5OjpIaWdo bGlnaHQ6OkJvdW5kcyYgYm91bmRzKQogewogICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBu b2RlLnJlbmRlcmVyKCk7CiAgICAgaWYgKCFyZW5kZXJlciB8fCAhaXM8UmVuZGVyQm94PihyZW5k ZXJlcikpCkBAIC00MTYsMjMgKzQxNiwyMyBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnBhaW50 KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKICAgICAgICAgZHJhd1J1bGVycyhjb250ZXh0LCBy dWxlckV4Y2x1c2lvbik7CiB9CiAKLXZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6Z2V0SGlnaGxpZ2h0 KEhpZ2hsaWdodCYgaGlnaGxpZ2h0LCBJbnNwZWN0b3JPdmVybGF5OjpDb29yZGluYXRlU3lzdGVt IGNvb3JkaW5hdGVTeXN0ZW0pIGNvbnN0Cit2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmdldEhpZ2hs aWdodChJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQmIGhpZ2hsaWdodCwgSW5zcGVjdG9yT3Zl cmxheTo6Q29vcmRpbmF0ZVN5c3RlbSBjb29yZGluYXRlU3lzdGVtKSBjb25zdAogewogICAgIGlm ICghbV9oaWdobGlnaHROb2RlICYmICFtX2hpZ2hsaWdodFF1YWQgJiYgIW1faGlnaGxpZ2h0Tm9k ZUxpc3QpCiAgICAgICAgIHJldHVybjsKIAotICAgIGhpZ2hsaWdodC50eXBlID0gSGlnaGxpZ2h0 VHlwZTo6UmVjdHM7CisgICAgaGlnaGxpZ2h0LnR5cGUgPSBJbnNwZWN0b3JPdmVybGF5OjpIaWdo bGlnaHQ6OlR5cGU6OlJlY3RzOwogICAgIGlmIChtX2hpZ2hsaWdodE5vZGUpCiAgICAgICAgIGJ1 aWxkTm9kZUhpZ2hsaWdodCgqbV9oaWdobGlnaHROb2RlLCBtX25vZGVIaWdobGlnaHRDb25maWcs IGhpZ2hsaWdodCwgY29vcmRpbmF0ZVN5c3RlbSk7CiAgICAgZWxzZSBpZiAobV9oaWdobGlnaHRO b2RlTGlzdCkgewogICAgICAgICBoaWdobGlnaHQuc2V0RGF0YUZyb21Db25maWcobV9ub2RlSGln aGxpZ2h0Q29uZmlnKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1faGlnaGxp Z2h0Tm9kZUxpc3QtPmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgICAgIEhpZ2hsaWdodCBub2Rl SGlnaGxpZ2h0OworICAgICAgICAgICAgSW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0IG5vZGVI aWdobGlnaHQ7CiAgICAgICAgICAgICBidWlsZE5vZGVIaWdobGlnaHQoKihtX2hpZ2hsaWdodE5v ZGVMaXN0LT5pdGVtKGkpKSwgbV9ub2RlSGlnaGxpZ2h0Q29uZmlnLCBub2RlSGlnaGxpZ2h0LCBj b29yZGluYXRlU3lzdGVtKTsKLSAgICAgICAgICAgIGlmIChub2RlSGlnaGxpZ2h0LnR5cGUgPT0g SGlnaGxpZ2h0VHlwZTo6Tm9kZSkKKyAgICAgICAgICAgIGlmIChub2RlSGlnaGxpZ2h0LnR5cGUg PT0gSW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpUeXBlOjpOb2RlKQogICAgICAgICAgICAg ICAgIGhpZ2hsaWdodC5xdWFkcy5hcHBlbmRWZWN0b3Iobm9kZUhpZ2hsaWdodC5xdWFkcyk7CiAg ICAgICAgIH0KLSAgICAgICAgaGlnaGxpZ2h0LnR5cGUgPSBIaWdobGlnaHRUeXBlOjpOb2RlTGlz dDsKKyAgICAgICAgaGlnaGxpZ2h0LnR5cGUgPSBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6 OlR5cGU6Ok5vZGVMaXN0OwogICAgIH0gZWxzZQogICAgICAgICBidWlsZFF1YWRIaWdobGlnaHQo Km1faGlnaGxpZ2h0UXVhZCwgbV9xdWFkSGlnaGxpZ2h0Q29uZmlnLCBoaWdobGlnaHQpOwogfQpA QCAtNDQ1LDcgKzQ0NSw3IEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6aGlkZUhpZ2hsaWdodCgp CiAgICAgdXBkYXRlKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6aGlnaGxpZ2h0Tm9k ZUxpc3QoUmVmUHRyPE5vZGVMaXN0PiYmIG5vZGVzLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhp Z2hsaWdodENvbmZpZykKK3ZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6aGlnaGxpZ2h0Tm9kZUxpc3Qo UmVmUHRyPE5vZGVMaXN0PiYmIG5vZGVzLCBjb25zdCBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGln aHQ6OkNvbmZpZyYgaGlnaGxpZ2h0Q29uZmlnKQogewogICAgIG1fbm9kZUhpZ2hsaWdodENvbmZp ZyA9IGhpZ2hsaWdodENvbmZpZzsKICAgICBtX2hpZ2hsaWdodE5vZGVMaXN0ID0gV1RGTW92ZShu b2Rlcyk7CkBAIC00NTMsNyArNDUzLDcgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpoaWdobGln aHROb2RlTGlzdChSZWZQdHI8Tm9kZUxpc3Q+JiYgbm9kZXMsIGNvbnN0IEhpZ2hsaWcKICAgICB1 cGRhdGUoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpoaWdobGlnaHROb2RlKE5vZGUq IG5vZGUsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxpZ2h0Q29uZmlnKQordm9pZCBJbnNw ZWN0b3JPdmVybGF5OjpoaWdobGlnaHROb2RlKE5vZGUqIG5vZGUsIGNvbnN0IEluc3BlY3Rvck92 ZXJsYXk6OkhpZ2hsaWdodDo6Q29uZmlnJiBoaWdobGlnaHRDb25maWcpCiB7CiAgICAgbV9ub2Rl SGlnaGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmlnOwogICAgIG1faGlnaGxpZ2h0Tm9kZSA9 IG5vZGU7CkBAIC00NjEsNyArNDYxLDcgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpoaWdobGln aHROb2RlKE5vZGUqIG5vZGUsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxpZ2gKICAgICB1 cGRhdGUoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpoaWdobGlnaHRRdWFkKHN0ZDo6 dW5pcXVlX3B0cjxGbG9hdFF1YWQ+IHF1YWQsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxp Z2h0Q29uZmlnKQordm9pZCBJbnNwZWN0b3JPdmVybGF5OjpoaWdobGlnaHRRdWFkKHN0ZDo6dW5p cXVlX3B0cjxGbG9hdFF1YWQ+IHF1YWQsIGNvbnN0IEluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdo dDo6Q29uZmlnJiBoaWdobGlnaHRDb25maWcpCiB7CiAgICAgaWYgKGhpZ2hsaWdodENvbmZpZy51 c2VQYWdlQ29vcmRpbmF0ZXMpCiAgICAgICAgICpxdWFkIC09IHRvSW50U2l6ZShtX3BhZ2UubWFp bkZyYW1lKCkudmlldygpLT5zY3JvbGxQb3NpdGlvbigpKTsKQEAgLTU5NCw3ICs1OTQsNyBAQCBJ bnNwZWN0b3JPdmVybGF5OjpSdWxlckV4Y2x1c2lvbiBJbnNwZWN0b3JPdmVybGF5OjpkcmF3UXVh ZEhpZ2hsaWdodChHcmFwaGljc0NvbgogewogICAgIFJ1bGVyRXhjbHVzaW9uIHJ1bGVyRXhjbHVz aW9uOwogCi0gICAgSGlnaGxpZ2h0IGhpZ2hsaWdodDsKKyAgICBJbnNwZWN0b3JPdmVybGF5OjpI aWdobGlnaHQgaGlnaGxpZ2h0OwogICAgIGJ1aWxkUXVhZEhpZ2hsaWdodChxdWFkLCBtX3F1YWRI aWdobGlnaHRDb25maWcsIGhpZ2hsaWdodCk7CiAKICAgICBpZiAoaGlnaGxpZ2h0LnF1YWRzLnNp emUoKSA+PSAxKSB7CkBAIC02MTgsNyArNjE4LDcgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5Ojpk cmF3UGFpbnRSZWN0cyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IERlcXVlPFRpbWUK ICAgICAgICAgY29udGV4dC5maWxsUmVjdChwYWlyLnNlY29uZCk7CiB9CiAKLXZvaWQgSW5zcGVj dG9yT3ZlcmxheTo6ZHJhd0JvdW5kcyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEhp Z2hsaWdodDo6Qm91bmRzJiBib3VuZHMpCit2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdCb3Vu ZHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnNwZWN0b3JPdmVybGF5OjpIaWdo bGlnaHQ6OkJvdW5kcyYgYm91bmRzKQogewogICAgIEZyYW1lVmlldyogcGFnZVZpZXcgPSBtX3Bh Z2UubWFpbkZyYW1lKCkudmlldygpOwogICAgIEZsb2F0U2l6ZSB2aWV3cG9ydFNpemUgPSBwYWdl Vmlldy0+c2l6ZUZvclZpc2libGVDb250ZW50KCk7CkBAIC04OTIsNyArODkyLDcgQEAgdm9pZCBJ bnNwZWN0b3JPdmVybGF5OjpkcmF3UnVsZXJzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29u c3QgSW5zcGVjdG9yT3ZlcmwKICAgICB9CiB9CiAKLVBhdGggSW5zcGVjdG9yT3ZlcmxheTo6ZHJh d0VsZW1lbnRUaXRsZShHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIE5vZGUmIG5vZGUsIGNvbnN0 IEhpZ2hsaWdodDo6Qm91bmRzJiBib3VuZHMpCitQYXRoIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdF bGVtZW50VGl0bGUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2RlLCBjb25zdCBJ bnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6OkJvdW5kcyYgYm91bmRzKQogewogICAgIGlmIChi b3VuZHMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKaW5kZXggMjFlN2Y1NTczY2U2MmI3YTBhMzkxYzMx MzI1N2EyY2E2ODRmOTY0YS4uMjQyMjAzNDcyNDBiYzA2ODJhNzVkNjJlMGIxNTBmNTVhNDc3M2Rk NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXku aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oCkBAIC00 OSw1NiArNDksNTUgQEAgY2xhc3MgTm9kZTsKIGNsYXNzIE5vZGVMaXN0OwogY2xhc3MgUGFnZTsK IAotc3RydWN0IEhpZ2hsaWdodENvbmZpZyB7Ci0gICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7 Ci1wdWJsaWM6Ci0gICAgQ29sb3IgY29udGVudDsKLSAgICBDb2xvciBjb250ZW50T3V0bGluZTsK LSAgICBDb2xvciBwYWRkaW5nOwotICAgIENvbG9yIGJvcmRlcjsKLSAgICBDb2xvciBtYXJnaW47 Ci0gICAgYm9vbCBzaG93SW5mbzsKLSAgICBib29sIHVzZVBhZ2VDb29yZGluYXRlczsKLX07Ci0K LWVudW0gY2xhc3MgSGlnaGxpZ2h0VHlwZSB7Ci0gICAgTm9kZSwgLy8gUHJvdmlkZXMgNCBxdWFk czogbWFyZ2luLCBib3JkZXIsIHBhZGRpbmcsIGNvbnRlbnQuCi0gICAgTm9kZUxpc3QsIC8vIFBy b3ZpZGVzIGEgbGlzdCBvZiBub2Rlcy4KLSAgICBSZWN0cywgLy8gUHJvdmlkZXMgYSBsaXN0IG9m IHF1YWRzLgotfTsKLQotc3RydWN0IEhpZ2hsaWdodCB7Ci0gICAgSGlnaGxpZ2h0KCkgeyB9Ci0K LSAgICB2b2lkIHNldERhdGFGcm9tQ29uZmlnKGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxp Z2h0Q29uZmlnKQotICAgIHsKLSAgICAgICAgY29udGVudENvbG9yID0gaGlnaGxpZ2h0Q29uZmln LmNvbnRlbnQ7Ci0gICAgICAgIGNvbnRlbnRPdXRsaW5lQ29sb3IgPSBoaWdobGlnaHRDb25maWcu Y29udGVudE91dGxpbmU7Ci0gICAgICAgIHBhZGRpbmdDb2xvciA9IGhpZ2hsaWdodENvbmZpZy5w YWRkaW5nOwotICAgICAgICBib3JkZXJDb2xvciA9IGhpZ2hsaWdodENvbmZpZy5ib3JkZXI7Ci0g ICAgICAgIG1hcmdpbkNvbG9yID0gaGlnaGxpZ2h0Q29uZmlnLm1hcmdpbjsKLSAgICAgICAgdXNl UGFnZUNvb3JkaW5hdGVzID0gaGlnaGxpZ2h0Q29uZmlnLnVzZVBhZ2VDb29yZGluYXRlczsKLSAg ICB9Ci0KLSAgICBDb2xvciBjb250ZW50Q29sb3I7Ci0gICAgQ29sb3IgY29udGVudE91dGxpbmVD b2xvcjsKLSAgICBDb2xvciBwYWRkaW5nQ29sb3I7Ci0gICAgQ29sb3IgYm9yZGVyQ29sb3I7Ci0g ICAgQ29sb3IgbWFyZ2luQ29sb3I7Ci0KLSAgICBIaWdobGlnaHRUeXBlIHR5cGUge0hpZ2hsaWdo dFR5cGU6Ok5vZGV9OwotICAgIFZlY3RvcjxGbG9hdFF1YWQ+IHF1YWRzOwotICAgIGJvb2wgdXNl UGFnZUNvb3JkaW5hdGVzIHt0cnVlfTsKLQotICAgIHVzaW5nIEJvdW5kcyA9IEZsb2F0UmVjdDsK LX07Ci0KIGNsYXNzIEluc3BlY3Rvck92ZXJsYXkgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOwogcHVibGljOgogICAgIEluc3BlY3Rvck92ZXJsYXkoUGFnZSYsIEluc3BlY3RvckNsaWVu dCopOwogICAgIH5JbnNwZWN0b3JPdmVybGF5KCk7CiAKKyAgICBzdHJ1Y3QgSGlnaGxpZ2h0IHsK KyAgICAgICAgV1RGX01BS0VfU1RSVUNUX0ZBU1RfQUxMT0NBVEVEOworCisgICAgICAgIGVudW0g Y2xhc3MgVHlwZSB7CisgICAgICAgICAgICBOb2RlLCAvLyBQcm92aWRlcyA0IHF1YWRzOiBtYXJn aW4sIGJvcmRlciwgcGFkZGluZywgY29udGVudC4KKyAgICAgICAgICAgIE5vZGVMaXN0LCAvLyBQ cm92aWRlcyBhIGxpc3Qgb2Ygbm9kZXMuCisgICAgICAgICAgICBSZWN0cywgLy8gUHJvdmlkZXMg YSBsaXN0IG9mIHF1YWRzLgorICAgICAgICB9OworCisgICAgICAgIHN0cnVjdCBDb25maWcgewor ICAgICAgICAgICAgV1RGX01BS0VfU1RSVUNUX0ZBU1RfQUxMT0NBVEVEOworICAgICAgICAgICAg Q29sb3IgY29udGVudDsKKyAgICAgICAgICAgIENvbG9yIGNvbnRlbnRPdXRsaW5lOworICAgICAg ICAgICAgQ29sb3IgcGFkZGluZzsKKyAgICAgICAgICAgIENvbG9yIGJvcmRlcjsKKyAgICAgICAg ICAgIENvbG9yIG1hcmdpbjsKKyAgICAgICAgICAgIGJvb2wgc2hvd0luZm87CisgICAgICAgICAg ICBib29sIHVzZVBhZ2VDb29yZGluYXRlczsKKyAgICAgICAgfTsKKworICAgICAgICB2b2lkIHNl dERhdGFGcm9tQ29uZmlnKGNvbnN0IENvbmZpZyYgY29uZmlnKQorICAgICAgICB7CisgICAgICAg ICAgICBjb250ZW50Q29sb3IgPSBjb25maWcuY29udGVudDsKKyAgICAgICAgICAgIGNvbnRlbnRP dXRsaW5lQ29sb3IgPSBjb25maWcuY29udGVudE91dGxpbmU7CisgICAgICAgICAgICBwYWRkaW5n Q29sb3IgPSBjb25maWcucGFkZGluZzsKKyAgICAgICAgICAgIGJvcmRlckNvbG9yID0gY29uZmln LmJvcmRlcjsKKyAgICAgICAgICAgIG1hcmdpbkNvbG9yID0gY29uZmlnLm1hcmdpbjsKKyAgICAg ICAgICAgIHVzZVBhZ2VDb29yZGluYXRlcyA9IGNvbmZpZy51c2VQYWdlQ29vcmRpbmF0ZXM7Cisg ICAgICAgIH0KKworICAgICAgICBDb2xvciBjb250ZW50Q29sb3I7CisgICAgICAgIENvbG9yIGNv bnRlbnRPdXRsaW5lQ29sb3I7CisgICAgICAgIENvbG9yIHBhZGRpbmdDb2xvcjsKKyAgICAgICAg Q29sb3IgYm9yZGVyQ29sb3I7CisgICAgICAgIENvbG9yIG1hcmdpbkNvbG9yOworCisgICAgICAg IFR5cGUgdHlwZSB7VHlwZTo6Tm9kZX07CisgICAgICAgIFZlY3RvcjxGbG9hdFF1YWQ+IHF1YWRz OworICAgICAgICBib29sIHVzZVBhZ2VDb29yZGluYXRlcyB7dHJ1ZX07CisKKyAgICAgICAgdXNp bmcgQm91bmRzID0gRmxvYXRSZWN0OworICAgIH07CisKICAgICBlbnVtIGNsYXNzIENvb3JkaW5h dGVTeXN0ZW0gewogICAgICAgICBWaWV3LCAvLyBBZGp1c3RzIGZvciB0aGUgbWFpbiBmcmFtZSdz IHNjcm9sbCBvZmZzZXQuCiAgICAgICAgIERvY3VtZW50LCAvLyBEb2VzIG5vdCBhZGp1c3QgZm9y IHRoZSBtYWluIGZyYW1lJ3Mgc2Nyb2xsIG9mZnNldC4KQEAgLTExMCw5ICsxMDksOSBAQCBwdWJs aWM6CiAgICAgYm9vbCBzaG91bGRTaG93T3ZlcmxheSgpIGNvbnN0OwogCiAgICAgdm9pZCBoaWRl SGlnaGxpZ2h0KCk7Ci0gICAgdm9pZCBoaWdobGlnaHROb2RlTGlzdChSZWZQdHI8Tm9kZUxpc3Q+ JiYsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYpOwotICAgIHZvaWQgaGlnaGxpZ2h0Tm9kZShOb2Rl KiwgY29uc3QgSGlnaGxpZ2h0Q29uZmlnJik7Ci0gICAgdm9pZCBoaWdobGlnaHRRdWFkKHN0ZDo6 dW5pcXVlX3B0cjxGbG9hdFF1YWQ+LCBjb25zdCBIaWdobGlnaHRDb25maWcmKTsKKyAgICB2b2lk IGhpZ2hsaWdodE5vZGVMaXN0KFJlZlB0cjxOb2RlTGlzdD4mJiwgY29uc3QgSGlnaGxpZ2h0OjpD b25maWcmKTsKKyAgICB2b2lkIGhpZ2hsaWdodE5vZGUoTm9kZSosIGNvbnN0IEhpZ2hsaWdodDo6 Q29uZmlnJik7CisgICAgdm9pZCBoaWdobGlnaHRRdWFkKHN0ZDo6dW5pcXVlX3B0cjxGbG9hdFF1 YWQ+LCBjb25zdCBIaWdobGlnaHQ6OkNvbmZpZyYpOwogCiAgICAgdm9pZCBzZXRTaG93UGFpbnRS ZWN0cyhib29sKTsKICAgICB2b2lkIHNob3dQYWludFJlY3QoY29uc3QgRmxvYXRSZWN0Jik7CkBA IC0xNDksMTAgKzE0OCwxMCBAQCBwcml2YXRlOgogCiAgICAgUmVmUHRyPE5vZGU+IG1faGlnaGxp Z2h0Tm9kZTsKICAgICBSZWZQdHI8Tm9kZUxpc3Q+IG1faGlnaGxpZ2h0Tm9kZUxpc3Q7Ci0gICAg SGlnaGxpZ2h0Q29uZmlnIG1fbm9kZUhpZ2hsaWdodENvbmZpZzsKKyAgICBIaWdobGlnaHQ6OkNv bmZpZyBtX25vZGVIaWdobGlnaHRDb25maWc7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RmxvYXRR dWFkPiBtX2hpZ2hsaWdodFF1YWQ7Ci0gICAgSGlnaGxpZ2h0Q29uZmlnIG1fcXVhZEhpZ2hsaWdo dENvbmZpZzsKKyAgICBIaWdobGlnaHQ6OkNvbmZpZyBtX3F1YWRIaWdobGlnaHRDb25maWc7CiAK ICAgICBEZXF1ZTxUaW1lUmVjdFBhaXI+IG1fcGFpbnRSZWN0czsKICAgICBUaW1lciBtX3BhaW50 UmVjdFVwZGF0ZVRpbWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBmNmM4M2VhNDNiODFlNTk4MTYxMzAyNjlh MjhiMWE2NjIzYjk5ODU0Li5hYjBkZDIxY2Q5NTA0NWZkODFjOTM2Y2I2YjllZDM0MDIzODg0MzAx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRP TUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ckRPTUFnZW50LmNwcApAQCAtODAsNyArODAsNiBAQAogI2luY2x1ZGUgIkluc3BlY3RvckNvbnRy b2xsZXIuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JIaXN0b3J5LmgiCiAjaW5jbHVkZSAiSW5zcGVj dG9yTm9kZUZpbmRlci5oIgotI2luY2x1ZGUgIkluc3BlY3Rvck92ZXJsYXkuaCIKICNpbmNsdWRl ICJJbnNwZWN0b3JQYWdlQWdlbnQuaCIKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgi CiAjaW5jbHVkZSAiSW50UmVjdC5oIgpAQCAtMTIyNywxNCArMTIyNiwxNCBAQCB2b2lkIEluc3Bl Y3RvckRPTUFnZW50OjpzZXRTZWFyY2hpbmdGb3JOb2RlKFByb3RvY29sOjpFcnJvclN0cmluZyYg ZXJyb3JTdHJpbmcsCiAgICAgICAgIGNsaWVudC0+ZWxlbWVudFNlbGVjdGlvbkNoYW5nZWQobV9z ZWFyY2hpbmdGb3JOb2RlKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPEhpZ2hsaWdodENvbmZpZz4g SW5zcGVjdG9yRE9NQWdlbnQ6OmhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoUHJv dG9jb2w6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgUmVmUHRyPEpTT046Ok9iamVjdD4mJiBo aWdobGlnaHRJbnNwZWN0b3JPYmplY3QpCitzdGQ6OnVuaXF1ZV9wdHI8SW5zcGVjdG9yT3Zlcmxh eTo6SGlnaGxpZ2h0OjpDb25maWc+IEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRDb25maWdG cm9tSW5zcGVjdG9yT2JqZWN0KFByb3RvY29sOjpFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIFJl ZlB0cjxKU09OOjpPYmplY3Q+JiYgaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KQogewogICAgIGlm ICghaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSB7CiAgICAgICAgIGVycm9yU3RyaW5nID0gIklu dGVybmFsIGVycm9yOiBoaWdobGlnaHQgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXIgaXMgbWlzc2lu ZyJfczsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgYXV0byBoaWdobGln aHRDb25maWcgPSBtYWtlVW5pcXVlPEhpZ2hsaWdodENvbmZpZz4oKTsKKyAgICBhdXRvIGhpZ2hs aWdodENvbmZpZyA9IG1ha2VVbmlxdWU8SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpDb25m aWc+KCk7CiAgICAgaGlnaGxpZ2h0Q29uZmlnLT5zaG93SW5mbyA9IGhpZ2hsaWdodEluc3BlY3Rv ck9iamVjdC0+Z2V0Qm9vbGVhbihQcm90b2NvbDo6RE9NOjpIaWdobGlnaHRDb25maWc6OnNob3dJ bmZvS2V5KS52YWx1ZU9yKGZhbHNlKTsKICAgICBoaWdobGlnaHRDb25maWctPmNvbnRlbnQgPSBw YXJzZUNvbmZpZ0NvbG9yKFByb3RvY29sOjpET006OkhpZ2hsaWdodENvbmZpZzo6Y29udGVudENv bG9yS2V5LCAqaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKICAgICBoaWdobGlnaHRDb25maWct PnBhZGRpbmcgPSBwYXJzZUNvbmZpZ0NvbG9yKFByb3RvY29sOjpET006OkhpZ2hsaWdodENvbmZp Zzo6cGFkZGluZ0NvbG9yS2V5LCAqaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KTsKQEAgLTEyOTAs NyArMTI4OSw3IEBAIFByb3RvY29sOjpFcnJvclN0cmluZ09yPHZvaWQ+IEluc3BlY3RvckRPTUFn ZW50OjpoaWdobGlnaHRRdWFkKFJlZjxKU09OOjpBcnJheT4mCiAKIHZvaWQgSW5zcGVjdG9yRE9N QWdlbnQ6OmlubmVySGlnaGxpZ2h0UXVhZChzdGQ6OnVuaXF1ZV9wdHI8RmxvYXRRdWFkPiBxdWFk LCBSZWZQdHI8SlNPTjo6T2JqZWN0PiYmIGNvbG9yLCBSZWZQdHI8SlNPTjo6T2JqZWN0PiYmIG91 dGxpbmVDb2xvciwgT3B0aW9uYWw8Ym9vbD4mJiB1c2VQYWdlQ29vcmRpbmF0ZXMpCiB7Ci0gICAg YXV0byBoaWdobGlnaHRDb25maWcgPSBtYWtlVW5pcXVlPEhpZ2hsaWdodENvbmZpZz4oKTsKKyAg ICBhdXRvIGhpZ2hsaWdodENvbmZpZyA9IG1ha2VVbmlxdWU8SW5zcGVjdG9yT3ZlcmxheTo6SGln aGxpZ2h0OjpDb25maWc+KCk7CiAgICAgaGlnaGxpZ2h0Q29uZmlnLT5jb250ZW50ID0gcGFyc2VD b2xvcihXVEZNb3ZlKGNvbG9yKSk7CiAgICAgaGlnaGxpZ2h0Q29uZmlnLT5jb250ZW50T3V0bGlu ZSA9IHBhcnNlQ29sb3IoV1RGTW92ZShvdXRsaW5lQ29sb3IpKTsKICAgICBoaWdobGlnaHRDb25m aWctPnVzZVBhZ2VDb29yZGluYXRlcyA9IHVzZVBhZ2VDb29yZGluYXRlcyA/ICp1c2VQYWdlQ29v cmRpbmF0ZXMgOiBmYWxzZTsKQEAgLTE0MDIsNyArMTQwMSw3IEBAIFByb3RvY29sOjpFcnJvclN0 cmluZ09yPHZvaWQ+IEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHROb2RlKFJlZjxKU09OOjpP YmplY3Q+CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gbWFrZVVuZXhwZWN0ZWQoZXJy b3JTdHJpbmcpOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEhpZ2hsaWdodENvbmZpZz4gaGlnaGxp Z2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChlcnJvclN0cmlu ZywgV1RGTW92ZShoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpKTsKKyAgICBzdGQ6OnVuaXF1ZV9w dHI8SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpDb25maWc+IGhpZ2hsaWdodENvbmZpZyA9 IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoZXJyb3JTdHJpbmcsIFdURk1vdmUo aGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSk7CiAgICAgaWYgKCFoaWdobGlnaHRDb25maWcpCiAg ICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChlcnJvclN0cmluZyk7CiAKQEAgLTE0MzMsNyAr MTQzMiw3IEBAIFByb3RvY29sOjpFcnJvclN0cmluZ09yPHZvaWQ+IEluc3BlY3RvckRPTUFnZW50 OjpoaWdobGlnaHROb2RlTGlzdChSZWY8SlNPTjo6QXJyCiAgICAgICAgIG5vZGVzLmFwcGVuZCgq bm9kZSk7CiAgICAgfQogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEhpZ2hsaWdodENvbmZpZz4gaGln aGxpZ2h0Q29uZmlnID0gaGlnaGxpZ2h0Q29uZmlnRnJvbUluc3BlY3Rvck9iamVjdChlcnJvclN0 cmluZywgV1RGTW92ZShoaWdobGlnaHRJbnNwZWN0b3JPYmplY3QpKTsKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpDb25maWc+IGhpZ2hsaWdodENvbmZp ZyA9IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoZXJyb3JTdHJpbmcsIFdURk1v dmUoaGlnaGxpZ2h0SW5zcGVjdG9yT2JqZWN0KSk7CiAgICAgaWYgKCFoaWdobGlnaHRDb25maWcp CiAgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChlcnJvclN0cmluZyk7CiAKQEAgLTE0NTUs NyArMTQ1NCw3IEBAIFByb3RvY29sOjpFcnJvclN0cmluZ09yPHZvaWQ+IEluc3BlY3RvckRPTUFn ZW50OjpoaWdobGlnaHRGcmFtZShjb25zdCBQcm90b2NvbDo6CiAgICAgICAgIHJldHVybiBtYWtl VW5leHBlY3RlZChlcnJvclN0cmluZyk7CiAKICAgICBpZiAoZnJhbWUtPm93bmVyRWxlbWVudCgp KSB7Ci0gICAgICAgIGF1dG8gaGlnaGxpZ2h0Q29uZmlnID0gbWFrZVVuaXF1ZTxIaWdobGlnaHRD b25maWc+KCk7CisgICAgICAgIGF1dG8gaGlnaGxpZ2h0Q29uZmlnID0gbWFrZVVuaXF1ZTxJbnNw ZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6OkNvbmZpZz4oKTsKICAgICAgICAgaGlnaGxpZ2h0Q29u ZmlnLT5zaG93SW5mbyA9IHRydWU7IC8vIEFsd2F5cyBzaG93IHRvb2x0aXBzIGZvciBmcmFtZXMu CiAgICAgICAgIGhpZ2hsaWdodENvbmZpZy0+Y29udGVudCA9IHBhcnNlQ29sb3IoV1RGTW92ZShj b2xvcikpOwogICAgICAgICBoaWdobGlnaHRDb25maWctPmNvbnRlbnRPdXRsaW5lID0gcGFyc2VD b2xvcihXVEZNb3ZlKG91dGxpbmVDb2xvcikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IDdmMjg3MmRmNDllMGQ0MGFi MDIwY2Q5ODg0ZGVkMDAzMDhmMWEyYTYuLjg3ZDZiOTFhYzk1M2QyYjlhZjRiMmNiZDQyNzBkZjQ5 MzI2NDdhZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yRE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3RvckRPTUFnZW50LmgKQEAgLTMwLDYgKzMwLDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5j bHVkZSAiRXZlbnRUYXJnZXQuaCIKKyNpbmNsdWRlICJJbnNwZWN0b3JPdmVybGF5LmgiCiAjaW5j bHVkZSAiSW5zcGVjdG9yV2ViQWdlbnRCYXNlLmgiCiAjaW5jbHVkZSAiVGltZXIuaCIKICNpbmNs dWRlIDxKYXZhU2NyaXB0Q29yZS9CcmVha3BvaW50Lmg+CkBAIC02Myw3ICs2NCw2IEBAIGNsYXNz IEV4Y2VwdGlvbjsKIGNsYXNzIEZsb2F0UXVhZDsKIGNsYXNzIEZyYW1lOwogY2xhc3MgSW5zcGVj dG9ySGlzdG9yeTsKLWNsYXNzIEluc3BlY3Rvck92ZXJsYXk7CiAjaWYgRU5BQkxFKFZJREVPKQog Y2xhc3MgSFRNTE1lZGlhRWxlbWVudDsKICNlbmRpZgpAQCAtNzQsOCArNzQsNiBAQCBjbGFzcyBQ c2V1ZG9FbGVtZW50OwogY2xhc3MgUmV2YWxpZGF0ZVN0eWxlQXR0cmlidXRlVGFzazsKIGNsYXNz IFNoYWRvd1Jvb3Q7CiAKLXN0cnVjdCBIaWdobGlnaHRDb25maWc7Ci0KIGNsYXNzIEluc3BlY3Rv ckRPTUFnZW50IGZpbmFsIDogcHVibGljIEluc3BlY3RvckFnZW50QmFzZSwgcHVibGljIEluc3Bl Y3Rvcjo6RE9NQmFja2VuZERpc3BhdGNoZXJIYW5kbGVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZ QUJMRShJbnNwZWN0b3JET01BZ2VudCk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CkBA IC0yMTQsNyArMjEyLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgaGlnaGxpZ2h0TW91c2VkT3Zl ck5vZGUoKTsKICAgICB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoSW5zcGVjdG9yOjpQcm90b2Nv bDo6RXJyb3JTdHJpbmcmLCBib29sIGVuYWJsZWQsIFJlZlB0cjxKU09OOjpPYmplY3Q+JiYgaGln aGxpZ2h0Q29uZmlnLCBib29sIHNob3dSdWxlcnMpOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxIaWdo bGlnaHRDb25maWc+IGhpZ2hsaWdodENvbmZpZ0Zyb21JbnNwZWN0b3JPYmplY3QoSW5zcGVjdG9y OjpQcm90b2NvbDo6RXJyb3JTdHJpbmcmLCBSZWZQdHI8SlNPTjo6T2JqZWN0PiYmIGhpZ2hsaWdo dEluc3BlY3Rvck9iamVjdCk7CisgICAgc3RkOjp1bmlxdWVfcHRyPEluc3BlY3Rvck92ZXJsYXk6 OkhpZ2hsaWdodDo6Q29uZmlnPiBoaWdobGlnaHRDb25maWdGcm9tSW5zcGVjdG9yT2JqZWN0KElu c3BlY3Rvcjo6UHJvdG9jb2w6OkVycm9yU3RyaW5nJiwgUmVmUHRyPEpTT046Ok9iamVjdD4mJiBo aWdobGlnaHRJbnNwZWN0b3JPYmplY3QpOwogCiAgICAgLy8gTm9kZS1yZWxhdGVkIG1ldGhvZHMu CiAgICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxOb2RlPiwgSW5zcGVjdG9yOjpQcm90b2NvbDo6 RE9NOjpOb2RlSWQ+IE5vZGVUb0lkTWFwOwpAQCAtMjYwLDcgKzI1OCw3IEBAIHByaXZhdGU6CiAg ICAgUmVmUHRyPE5vZGU+IG1fbm9kZVRvRm9jdXM7CiAgICAgUmVmUHRyPE5vZGU+IG1fbW91c2Vk T3Zlck5vZGU7CiAgICAgUmVmUHRyPE5vZGU+IG1faW5zcGVjdGVkTm9kZTsKLSAgICBzdGQ6OnVu aXF1ZV9wdHI8SGlnaGxpZ2h0Q29uZmlnPiBtX2luc3BlY3RNb2RlSGlnaGxpZ2h0Q29uZmlnOwor ICAgIHN0ZDo6dW5pcXVlX3B0cjxJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6OkNvbmZpZz4g bV9pbnNwZWN0TW9kZUhpZ2hsaWdodENvbmZpZzsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW5zcGVj dG9ySGlzdG9yeT4gbV9oaXN0b3J5OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxET01FZGl0b3I+IG1f ZG9tRWRpdG9yOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggYTA5MzA1 ZjI4NGNlY2E2NWQ2ODQ2MTg5ZTk3ZGRhYjc3NTUxMDZkNi4uNzlmYmI0YzBjOTcxMjBlYjFlYTc0 MDhjODViMDE1ZTliZWNlYzMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApA QCAtMTY1NSw3ICsxNjU1LDcgQEAgRXhjZXB0aW9uT3I8UmVmPERPTVJlY3RMaXN0Pj4gSW50ZXJu YWxzOjppbnNwZWN0b3JIaWdobGlnaHRSZWN0cygpCiAgICAgaWYgKCFkb2N1bWVudCB8fCAhZG9j dW1lbnQtPnBhZ2UoKSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IEludmFsaWRBY2Nlc3NF cnJvciB9OwogCi0gICAgSGlnaGxpZ2h0IGhpZ2hsaWdodDsKKyAgICBJbnNwZWN0b3JPdmVybGF5 OjpIaWdobGlnaHQgaGlnaGxpZ2h0OwogICAgIGRvY3VtZW50LT5wYWdlKCktPmluc3BlY3RvckNv bnRyb2xsZXIoKS5nZXRIaWdobGlnaHQoaGlnaGxpZ2h0LCBJbnNwZWN0b3JPdmVybGF5OjpDb29y ZGluYXRlU3lzdGVtOjpWaWV3KTsKICAgICByZXR1cm4gRE9NUmVjdExpc3Q6OmNyZWF0ZShoaWdo bGlnaHQucXVhZHMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtp dC9tZXNzYWdlcy5weSBiL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHkK aW5kZXggYTFkYjI2YzA4ODdkZDg5MDRhYmQxNjYxNDJkMTE0MDIxMDQxNzE5NC4uYmNhMjlhZTA1 OGY5NjYwMzVjNTAxMGU1YzVjMGVmMjBiMTlkZDFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weQorKysgYi9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMv d2Via2l0L21lc3NhZ2VzLnB5CkBAIC02MDcsMTAgKzYwNywxMCBAQCBkZWYgaGVhZGVyc19mb3Jf dHlwZSh0eXBlKToKICAgICAgICAgJ1dlYkNvcmU6OkdlbmVyaWNDdWVEYXRhJzogWyc8V2ViQ29y ZS9JbmJhbmRHZW5lcmljQ3VlLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpHcmFtbWFyRGV0YWls JzogWyc8V2ViQ29yZS9UZXh0Q2hlY2tlckNsaWVudC5oPiddLAogICAgICAgICAnV2ViQ29yZTo6 SGFzSW5zZWN1cmVDb250ZW50JzogWyc8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+J10sCi0g ICAgICAgICdXZWJDb3JlOjpIaWdobGlnaHQnOiBbJzxXZWJDb3JlL0luc3BlY3Rvck92ZXJsYXku aD4nXSwKICAgICAgICAgJ1dlYkNvcmU6OkluY2x1ZGVTZWN1cmVDb29raWVzJzogWyc8V2ViQ29y ZS9Db29raWVKYXIuaD4nXSwKICAgICAgICAgJ1dlYkNvcmU6OkluZGV4ZWREQjo6T2JqZWN0U3Rv cmVPdmVyd3JpdGVNb2RlJzogWyc8V2ViQ29yZS9JbmRleGVkREIuaD4nXSwKICAgICAgICAgJ1dl YkNvcmU6OklucHV0TW9kZSc6IFsnPFdlYkNvcmUvSW5wdXRNb2RlLmg+J10sCisgICAgICAgICdX ZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQnOiBbJzxXZWJDb3JlL0luc3BlY3Rv ck92ZXJsYXkuaD4nXSwKICAgICAgICAgJ1dlYkNvcmU6OktleWZyYW1lVmFsdWVMaXN0JzogWyc8 V2ViQ29yZS9HcmFwaGljc0xheWVyLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpLZXlwcmVzc0Nv bW1hbmQnOiBbJzxXZWJDb3JlL0tleWJvYXJkRXZlbnQuaD4nXSwKICAgICAgICAgJ1dlYkNvcmU6 OkxlZ2FjeUNETVNlc3Npb25DbGllbnQ6Ok1lZGlhS2V5RXJyb3JDb2RlJzogWyc8V2ViQ29yZS9M ZWdhY3lDRE1TZXNzaW9uLmg+J10sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFy Z3VtZW50Q29kZXJzLmNwcAppbmRleCBlMGJiYmJjNWJhMjMxOGJmYThlNjMxOTZkNTRlZWJiODkw MzY0NDQxLi4wODExMjE0YTEwODM3N2IxNzc1ZDJjZmI3NjQ4NDY0MWUyM2QxZDNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTEwMCw3 ICsxMDAsNiBAQAogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICNpbmNsdWRlIDxXZWJDb3Jl L0Zsb2F0UXVhZC5oPgotI2luY2x1ZGUgPFdlYkNvcmUvSW5zcGVjdG9yT3ZlcmxheS5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvU2VsZWN0aW9uUmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2hhcmVk QnVmZmVyLmg+CiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTE3MjMsNyArMTcy Miw3IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxQYXN0ZWJvYXJkVVJMPjo6ZGVjb2RlKERlY29kZXIm IGRlY29kZXIsIFBhc3RlYm9hcmRVUkwmIGNvbnRlCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogCi12b2lkIEFyZ3VtZW50Q29kZXI8SGlnaGxpZ2h0Pjo6ZW5jb2RlKEVuY29kZXImIGVuY29k ZXIsIGNvbnN0IEhpZ2hsaWdodCYgaGlnaGxpZ2h0KQordm9pZCBBcmd1bWVudENvZGVyPEluc3Bl Y3Rvck92ZXJsYXk6OkhpZ2hsaWdodD46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBJ bnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQmIGhpZ2hsaWdodCkKIHsKICAgICBlbmNvZGVyIDw8 IHN0YXRpY19jYXN0PHVpbnQzMl90PihoaWdobGlnaHQudHlwZSk7CiAgICAgZW5jb2RlciA8PCBo aWdobGlnaHQudXNlUGFnZUNvb3JkaW5hdGVzOwpAQCAtMTczNSwxMiArMTczNCwxMiBAQCB2b2lk IEFyZ3VtZW50Q29kZXI8SGlnaGxpZ2h0Pjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0 IEhpZ2hsaWdodCYgaGlnaGxpZwogICAgIGVuY29kZXIgPDwgaGlnaGxpZ2h0LnF1YWRzOwogfQog Ci1ib29sIEFyZ3VtZW50Q29kZXI8SGlnaGxpZ2h0Pjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIs IEhpZ2hsaWdodCYgaGlnaGxpZ2h0KQorYm9vbCBBcmd1bWVudENvZGVyPEluc3BlY3Rvck92ZXJs YXk6OkhpZ2hsaWdodD46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBJbnNwZWN0b3JPdmVybGF5 OjpIaWdobGlnaHQmIGhpZ2hsaWdodCkKIHsKICAgICB1aW50MzJfdCB0eXBlOwogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUodHlwZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBoaWdobGln aHQudHlwZSA9IChIaWdobGlnaHRUeXBlKXR5cGU7CisgICAgaGlnaGxpZ2h0LnR5cGUgPSAoSW5z cGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpUeXBlKXR5cGU7CiAKICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKGhpZ2hsaWdodC51c2VQYWdlQ29vcmRpbmF0ZXMpKQogICAgICAgICByZXR1cm4gZmFs c2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2Rl cnMuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oCmluZGV4 IDA1ZDAzNTU0YjllY2E5YTA0MWMzNjhlZjQ1Mzg4MjQ0MzRjZTZlMjMuLjVjNTIzZTg4MmUwM2Rm N2U1Y2NmYzEyZTQ1ZDc4ZmI0MTAzM2JiOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YkNvcmVBcmd1bWVudENvZGVycy5oCkBAIC02Miw2ICs2MiwxMCBAQAogI2luY2x1ZGUgPFdlYkNv cmUvQ0RNSW5zdGFuY2VTZXNzaW9uLmg+CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKElPU19GQU1J TFkpCisjaW5jbHVkZSA8V2ViQ29yZS9JbnNwZWN0b3JPdmVybGF5Lmg+CisjZW5kaWYKKwogI2lm IFBMQVRGT1JNKEdUSykKICNpbmNsdWRlICJBcmd1bWVudENvZGVyc0d0ay5oIgogI2VuZGlmCkBA IC0xNjMsNyArMTY3LDYgQEAgc3RydWN0IEtleXByZXNzQ29tbWFuZDsKICNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQogY2xhc3MgRmxvYXRRdWFkOwogY2xhc3MgU2VsZWN0aW9uUmVjdDsKLXN0cnVj dCBIaWdobGlnaHQ7CiBzdHJ1Y3QgUGFzdGVib2FyZEltYWdlOwogc3RydWN0IFBhc3RlYm9hcmRX ZWJDb250ZW50OwogI2VuZGlmCkBAIC00ODYsOSArNDg5LDkgQEAgdGVtcGxhdGU8PiBzdHJ1Y3Qg QXJndW1lbnRDb2RlcjxXZWJDb3JlOjpTZWxlY3Rpb25SZWN0PiB7CiAgICAgc3RhdGljIE9wdGlv bmFsPFdlYkNvcmU6OlNlbGVjdGlvblJlY3Q+IGRlY29kZShEZWNvZGVyJik7CiB9OwogCi10ZW1w bGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkhpZ2hsaWdodD4gewotICAgIHN0 YXRpYyB2b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6SGlnaGxpZ2h0Jik7Ci0g ICAgc3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZShEZWNvZGVyJiwgV2ViQ29y ZTo6SGlnaGxpZ2h0Jik7Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6 Okluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodD4geworICAgIHN0YXRpYyB2b2lkIGVuY29kZShF bmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0Jik7Cisg ICAgc3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZShEZWNvZGVyJiwgV2ViQ29y ZTo6SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0Jik7CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVj dCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlBhc3RlYm9hcmRXZWJDb250ZW50PiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvaW9zL1dLSW5zcGVjdG9ySGln aGxpZ2h0Vmlldy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2lvcy9XS0lu c3BlY3RvckhpZ2hsaWdodFZpZXcuaAppbmRleCBhOTgzOTFjNDIwYzU0NTU4YzhlYWU3NmYzYmMx NjZlZTFjYTRjZTEyLi4zMDFiYWIxMTA5Y2U3ZmY2NzRhMzYyM2FiMWNhMTlhOTA2NzJlZjQ1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvaW9zL1dLSW5zcGVj dG9ySGlnaGxpZ2h0Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rv ci9pb3MvV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3LmgKQEAgLTI2LDE1ICsyNiwxMiBAQAogI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCiAKICNpbXBvcnQgPFVJS2l0L1VJS2l0Lmg+Ci0KLW5hbWVz cGFjZSBXZWJDb3JlIHsKLXN0cnVjdCBIaWdobGlnaHQ7Ci19CisjaW1wb3J0IDxXZWJDb3JlL0lu c3BlY3Rvck92ZXJsYXkuaD4KIAogQGludGVyZmFjZSBXS0luc3BlY3RvckhpZ2hsaWdodFZpZXcg OiBVSVZpZXcgewogICAgIE5TTXV0YWJsZUFycmF5ICpfbGF5ZXJzOyAvLyBDQVNoYXBlTGF5ZXJz LgogfQotLSAodm9pZCl1cGRhdGU6KGNvbnN0IFdlYkNvcmU6OkhpZ2hsaWdodCYpaGlnaGxpZ2h0 OworLSAodm9pZCl1cGRhdGU6KGNvbnN0IFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OkhpZ2hs aWdodCYpaGlnaGxpZ2h0OwogQGVuZAogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0luc3BlY3Rvci9pb3MvV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3Lm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2lvcy9XS0luc3BlY3RvckhpZ2hsaWdo dFZpZXcubW0KaW5kZXggMDY1ZjBjMDNlMzM1Mjc1ZTZiYzE2MjIyMzMzNjQ5NWMyYjFlMzk1Mi4u NmJhZjY2YjlmM2MyMmU3MzYyODMzYzUzZTU1ZWVhYzQ0NjMyM2FlOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2lvcy9XS0luc3BlY3RvckhpZ2hsaWdodFZp ZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2lvcy9XS0luc3Bl Y3RvckhpZ2hsaWdodFZpZXcubW0KQEAgLTMwLDcgKzMwLDYgQEAKIAogI2ltcG9ydCA8V2ViQ29y ZS9GbG9hdFF1YWQuaD4KICNpbXBvcnQgPFdlYkNvcmUvR2VvbWV0cnlVdGlsaXRpZXMuaD4KLSNp bXBvcnQgPFdlYkNvcmUvSW5zcGVjdG9yT3ZlcmxheS5oPgogCiBAaW1wbGVtZW50YXRpb24gV0tJ bnNwZWN0b3JIaWdobGlnaHRWaWV3CiAKQEAgLTIxMCw3ICsyMDksNyBAQCBzdGF0aWMgdm9pZCBs YXllclBhdGgoQ0FTaGFwZUxheWVyICpsYXllciwgY29uc3QgV2ViQ29yZTo6RmxvYXRRdWFkJiBv dXRlclF1YWQpCiAgICAgQ0dQYXRoUmVsZWFzZShwYXRoKTsKIH0KIAotLSAodm9pZClfbGF5b3V0 Rm9yTm9kZUhpZ2hsaWdodDooY29uc3QgV2ViQ29yZTo6SGlnaGxpZ2h0JiloaWdobGlnaHQgb2Zm c2V0Oih1bnNpZ25lZClvZmZzZXQKKy0gKHZvaWQpX2xheW91dEZvck5vZGVIaWdobGlnaHQ6KGNv bnN0IFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYpaGlnaGxpZ2h0IG9mZnNl dDoodW5zaWduZWQpb2Zmc2V0CiB7CiAgICAgQVNTRVJUKFtfbGF5ZXJzIGNvdW50XSA+PSBvZmZz ZXQgKyA0KTsKICAgICBBU1NFUlQoaGlnaGxpZ2h0LnF1YWRzLnNpemUoKSA+PSBvZmZzZXQgKyA0 KTsKQEAgLTIzOCw3ICsyMzcsNyBAQCAtICh2b2lkKV9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0Oihj b25zdCBXZWJDb3JlOjpIaWdobGlnaHQmKWhpZ2hsaWdodCBvZmZzZXQ6KHVucwogICAgIGxheWVy UGF0aChjb250ZW50TGF5ZXIsIGNvbnRlbnRRdWFkKTsKIH0KIAotLSAodm9pZClfbGF5b3V0Rm9y Tm9kZUxpc3RIaWdobGlnaHQ6KGNvbnN0IFdlYkNvcmU6OkhpZ2hsaWdodCYpaGlnaGxpZ2h0Cist ICh2b2lkKV9sYXlvdXRGb3JOb2RlTGlzdEhpZ2hsaWdodDooY29uc3QgV2ViQ29yZTo6SW5zcGVj dG9yT3ZlcmxheTo6SGlnaGxpZ2h0JiloaWdobGlnaHQKIHsKICAgICBpZiAoIWhpZ2hsaWdodC5x dWFkcy5zaXplKCkpIHsKICAgICAgICAgW3NlbGYgX3JlbW92ZUFsbExheWVyc107CkBAIC0yNTIs NyArMjUxLDcgQEAgLSAodm9pZClfbGF5b3V0Rm9yTm9kZUxpc3RIaWdobGlnaHQ6KGNvbnN0IFdl YkNvcmU6OkhpZ2hsaWdodCYpaGlnaGxpZ2h0CiAgICAgICAgIFtzZWxmIF9sYXlvdXRGb3JOb2Rl SGlnaGxpZ2h0OmhpZ2hsaWdodCBvZmZzZXQ6aSAqIDRdOwogfQogCi0tICh2b2lkKV9sYXlvdXRG b3JSZWN0c0hpZ2hsaWdodDooY29uc3QgV2ViQ29yZTo6SGlnaGxpZ2h0JiloaWdobGlnaHQKKy0g KHZvaWQpX2xheW91dEZvclJlY3RzSGlnaGxpZ2h0Oihjb25zdCBXZWJDb3JlOjpJbnNwZWN0b3JP dmVybGF5OjpIaWdobGlnaHQmKWhpZ2hsaWdodAogewogICAgIE5TVUludGVnZXIgbnVtTGF5ZXJz ID0gaGlnaGxpZ2h0LnF1YWRzLnNpemUoKTsKICAgICBpZiAoIW51bUxheWVycykgewpAQCAtMjcw LDExICsyNjksMTEgQEAgLSAodm9pZClfbGF5b3V0Rm9yUmVjdHNIaWdobGlnaHQ6KGNvbnN0IFdl YkNvcmU6OkhpZ2hsaWdodCYpaGlnaGxpZ2h0CiAgICAgfQogfQogCi0tICh2b2lkKXVwZGF0ZToo Y29uc3QgV2ViQ29yZTo6SGlnaGxpZ2h0JiloaWdobGlnaHQKKy0gKHZvaWQpdXBkYXRlOihjb25z dCBXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQmKWhpZ2hsaWdodAogewotICAg IGlmIChoaWdobGlnaHQudHlwZSA9PSBXZWJDb3JlOjpIaWdobGlnaHRUeXBlOjpOb2RlIHx8IGhp Z2hsaWdodC50eXBlID09IFdlYkNvcmU6OkhpZ2hsaWdodFR5cGU6Ok5vZGVMaXN0KQorICAgIGlm IChoaWdobGlnaHQudHlwZSA9PSBXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQ6 OlR5cGU6Ok5vZGUgfHwgaGlnaGxpZ2h0LnR5cGUgPT0gV2ViQ29yZTo6SW5zcGVjdG9yT3Zlcmxh eTo6SGlnaGxpZ2h0OjpUeXBlOjpOb2RlTGlzdCkKICAgICAgICAgW3NlbGYgX2xheW91dEZvck5v ZGVMaXN0SGlnaGxpZ2h0OmhpZ2hsaWdodF07Ci0gICAgZWxzZSBpZiAoaGlnaGxpZ2h0LnR5cGUg PT0gV2ViQ29yZTo6SGlnaGxpZ2h0VHlwZTo6UmVjdHMpCisgICAgZWxzZSBpZiAoaGlnaGxpZ2h0 LnR5cGUgPT0gV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0OjpUeXBlOjpSZWN0 cykKICAgICAgICAgW3NlbGYgX2xheW91dEZvclJlY3RzSGlnaGxpZ2h0OmhpZ2hsaWdodF07CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCA1YmVmYzRkZjIwMDFmODdh OWE3ZWViNGQ2ODdmMTNlOTQ2ZDcwM2YzLi43MTA5NThiZjhiOGEzN2JiOWQyMjQxMGM4ZGE1MWU5 ZWZhMDZiMDhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC01Miw2ICs1 MiwxMCBAQAogI2luY2x1ZGUgIlJlbW90ZUxheWVyVHJlZU5vZGUuaCIKICNpbmNsdWRlICJXS0Zv dW5kYXRpb24uaCIKIAorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisjaW5jbHVkZSA8V2ViQ29y ZS9JbnNwZWN0b3JPdmVybGF5Lmg+CisjZW5kaWYKKwogT0JKQ19DTEFTUyBDQUxheWVyOwogT0JK Q19DTEFTUyBOU0ZpbGVXcmFwcGVyOwogT0JKQ19DTEFTUyBOU01lbnU7CkBAIC05OCw3ICsxMDIs NiBAQCBlbnVtIGNsYXNzIFRleHRJbmRpY2F0b3JXaW5kb3dEaXNtaXNzYWxBbmltYXRpb24gOiB1 aW50OF90OwogZW51bSBjbGFzcyBET01QYXN0ZUFjY2Vzc1Jlc3BvbnNlIDogdWludDhfdDsKIAog c3RydWN0IERpY3Rpb25hcnlQb3B1cEluZm87Ci1zdHJ1Y3QgSGlnaGxpZ2h0Owogc3RydWN0IFRl eHRJbmRpY2F0b3JEYXRhOwogc3RydWN0IFZpZXdwb3J0QXR0cmlidXRlczsKIHN0cnVjdCBTaGFy ZURhdGFXaXRoUGFyc2VkVVJMOwpAQCAtNDUwLDcgKzQ1Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIHZvaWQgc2Nyb2xsaW5nTm9kZVNjcm9sbERpZEVuZFNjcm9sbCgpID0gMDsKICAgICB2aXJ0 dWFsIFZlY3RvcjxTdHJpbmc+IG1pbWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzKCkg PSAwOwogCi0gICAgdmlydHVhbCB2b2lkIHNob3dJbnNwZWN0b3JIaWdobGlnaHQoY29uc3QgV2Vi Q29yZTo6SGlnaGxpZ2h0JikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzaG93SW5zcGVjdG9ySGln aGxpZ2h0KGNvbnN0IFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYpID0gMDsK ICAgICB2aXJ0dWFsIHZvaWQgaGlkZUluc3BlY3RvckhpZ2hsaWdodCgpID0gMDsKIAogICAgIHZp cnR1YWwgdm9pZCBzaG93SW5zcGVjdG9ySW5kaWNhdGlvbigpID0gMDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMmJmZDI5NjcwNWY5YWNlNjg4YTk1N2QzYTMwNTVj OWY0MGU3ZGNkMy4uNzY2ZGIwNDIwNDY3ZmNmNzVhMTE1NTI2ZDY2OTY2ZjRkYzI0MDIyZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTEyNSw2ICsxMjUsNyBAQAog I2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAjaW5jbHVkZSAiR2VzdHVyZVR5cGVzLmgiCiAjaW5j bHVkZSAiV2ViQXV0b2NvcnJlY3Rpb25Db250ZXh0LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9JbnNw ZWN0b3JPdmVybGF5Lmg+CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQpAQCAt MjIxMCw3ICsyMjExLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJlbGVhc2VBbGxUb3VjaFBv aW50cygpOwogICAgIHZvaWQgZGlkVXBkYXRlRWRpdG9yU3RhdGUoKTsKIAotICAgIHZvaWQgc2hv d0luc3BlY3RvckhpZ2hsaWdodChjb25zdCBXZWJDb3JlOjpIaWdobGlnaHQmKTsKKyAgICB2b2lk IHNob3dJbnNwZWN0b3JIaWdobGlnaHQoY29uc3QgV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6 SGlnaGxpZ2h0Jik7CiAgICAgdm9pZCBoaWRlSW5zcGVjdG9ySGlnaGxpZ2h0KCk7CiAKICAgICB2 b2lkIGVuYWJsZUluc3BlY3Rvck5vZGVTZWFyY2goKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCA0MjE0NWYyYzVjMDRiMzM4YWIw NDFmYjA2ZDY5Njg2YzJmNTc5MTUyLi40MjRkNzdlYjZhMTM2YjgzYjQ3NWVmOGM2NzViNDU5NGU1 N2RmY2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku bWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluCkBAIC00MDYsNyArNDA2LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsK ICAgICBGb2N1c2VkRWxlbWVudERpZENoYW5nZUlucHV0TW9kZShlbnVtOnVpbnQ4X3QgV2ViQ29y ZTo6SW5wdXRNb2RlIG1vZGUpCiAgICAgU2Nyb2xsaW5nTm9kZVNjcm9sbFdpbGxTdGFydFNjcm9s bCgpCiAgICAgU2Nyb2xsaW5nTm9kZVNjcm9sbERpZEVuZFNjcm9sbCgpCi0gICAgU2hvd0luc3Bl Y3RvckhpZ2hsaWdodChzdHJ1Y3QgV2ViQ29yZTo6SGlnaGxpZ2h0IGhpZ2hsaWdodCkKKyAgICBT aG93SW5zcGVjdG9ySGlnaGxpZ2h0KHN0cnVjdCBXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpI aWdobGlnaHQgaGlnaGxpZ2h0KQogICAgIEhpZGVJbnNwZWN0b3JIaWdobGlnaHQoKQogICAgIEZv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb25DYWxsYmFjayhzdHJ1Y3QgV2ViS2l0OjpGb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uIGluZm9ybWF0aW9uLCBXZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJ RCkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJ bXBsSU9TLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1Mu aAppbmRleCAyMTM2OWFmZTY3YzY5ZThiZmM3MDFkZTUxMTk2MzAwMzg3YWQzMDJhLi43N2FmY2Fm YzQwNDBmYjllYzk4OGM3ZjFhZWQ2MmY2ZWQxODU0MmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MuaApAQCAtMjksNiArMjksNyBAQAogCiAj aW1wb3J0ICJQYWdlQ2xpZW50SW1wbENvY29hLmgiCiAjaW1wb3J0ICJXZWJGdWxsU2NyZWVuTWFu YWdlclByb3h5LmgiCisjaW1wb3J0IDxXZWJDb3JlL0luc3BlY3Rvck92ZXJsYXkuaD4KICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbXBvcnQgPHd0Zi9XZWFrT2JqQ1B0ci5oPgogCkBAIC0x ODMsNyArMTg0LDcgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbWluaW11bVpvb21TY2FsZSgpIGNv bnN0IG92ZXJyaWRlOwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBkb2N1bWVudFJlY3QoKSBjb25z dCBvdmVycmlkZTsKIAotICAgIHZvaWQgc2hvd0luc3BlY3RvckhpZ2hsaWdodChjb25zdCBXZWJD b3JlOjpIaWdobGlnaHQmKSBvdmVycmlkZTsKKyAgICB2b2lkIHNob3dJbnNwZWN0b3JIaWdobGln aHQoY29uc3QgV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0Jikgb3ZlcnJpZGU7 CiAgICAgdm9pZCBoaWRlSW5zcGVjdG9ySGlnaGxpZ2h0KCkgb3ZlcnJpZGU7CiAKICAgICB2b2lk IHNob3dJbnNwZWN0b3JJbmRpY2F0aW9uKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KaW5kZXggYjNkMWIzODkxZDgxOWQ0 ZDFkNGYyYWM5MWIyYzQ5NTE5MDQ0MzViOS4uNDdmYTI4NDIyNzY3MDQzN2IyOTZhNDMwNWZlZTBk Njc5MTk5ZGYyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1BhZ2VD bGllbnRJbXBsSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QYWdlQ2xp ZW50SW1wbElPUy5tbQpAQCAtNjQwLDcgKzY0MCw3IEBAIGJvb2wgUGFnZUNsaWVudEltcGw6OnNo b3dTaGFyZVNoZWV0KGNvbnN0IFNoYXJlRGF0YVdpdGhQYXJzZWRVUkwmIHNoYXJlRGF0YSwgV1RG CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUGFnZUNsaWVudEltcGw6OnNob3dJbnNwZWN0 b3JIaWdobGlnaHQoY29uc3QgV2ViQ29yZTo6SGlnaGxpZ2h0JiBoaWdobGlnaHQpCit2b2lkIFBh Z2VDbGllbnRJbXBsOjpzaG93SW5zcGVjdG9ySGlnaGxpZ2h0KGNvbnN0IFdlYkNvcmU6Okluc3Bl Y3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYgaGlnaGxpZ2h0KQogewogICAgIFttX2NvbnRlbnRWaWV3 IF9zaG93SW5zcGVjdG9ySGlnaGxpZ2h0OmhpZ2hsaWdodF07CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaAppbmRleCA5NmIwMTZhYWFjNDI5OGZhNWQxOTVm M2ExNzA0NDJiYWE1MzJlOThhLi5kOTQ4OTA4OWU4ZmUzYjExYmQ2NDUwOTg0ZmJkM2JhMjU1OTY1 MTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll dy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKQEAg LTI4LDYgKzI4LDcgQEAKICNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5oIgog I2ltcG9ydCAiV0tCcm93c2luZ0NvbnRleHRHcm91cC5oIgogI2ltcG9ydCAiV0tQcm9jZXNzR3Jv dXAuaCIKKyNpbXBvcnQgPFdlYkNvcmUvSW5zcGVjdG9yT3ZlcmxheS5oPgogI2ltcG9ydCA8d3Rm L05ha2VkUmVmLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0IDx3dGYvV2Vh a09iakNQdHIuaD4KQEAgLTQxLDcgKzQyLDYgQEAgY2xhc3MgUGFnZUNvbmZpZ3VyYXRpb247CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEZsb2F0UmVjdDsKLXN0cnVjdCBIaWdobGlnaHQ7 CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtMTA4LDcgKzEwOCw3IEBAIGNsYXNzIFdlYlBy b2Nlc3NQb29sOwogI2VuZGlmCiAtICh2b2lkKV9zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nUm9v dFZpZXc6KFVJVmlldyAqKXJvb3RWaWV3OwogCi0tICh2b2lkKV9zaG93SW5zcGVjdG9ySGlnaGxp Z2h0Oihjb25zdCBXZWJDb3JlOjpIaWdobGlnaHQmKWhpZ2hsaWdodDsKKy0gKHZvaWQpX3Nob3dJ bnNwZWN0b3JIaWdobGlnaHQ6KGNvbnN0IFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OkhpZ2hs aWdodCYpaGlnaGxpZ2h0OwogLSAodm9pZClfaGlkZUluc3BlY3RvckhpZ2hsaWdodDsKIAogLSAo dm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uJilsYXllclRyZWVUcmFuc2FjdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggZjk2YjMwMjNiZmU4ZTRjZDUzMTAyNzNmMDRl MWI4YWVjNjE2YmNlNy4uOGYxZmY0MDZkOThlODljZDk0OGM4YTc0NDUzOTE0OGVmNWZjMzhhOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KQEAgLTM1 NCw3ICszNTQsNyBAQCAtIChCT09MKWlzRm9jdXNpbmdFbGVtZW50CiAgICAgcmV0dXJuIFtzZWxm IGlzRWRpdGFibGVdOwogfQogCi0tICh2b2lkKV9zaG93SW5zcGVjdG9ySGlnaGxpZ2h0Oihjb25z dCBXZWJDb3JlOjpIaWdobGlnaHQmKWhpZ2hsaWdodAorLSAodm9pZClfc2hvd0luc3BlY3Rvckhp Z2hsaWdodDooY29uc3QgV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0JiloaWdo bGlnaHQKIHsKICAgICBpZiAoIV9pbnNwZWN0b3JIaWdobGlnaHRWaWV3KSB7CiAgICAgICAgIF9p bnNwZWN0b3JIaWdobGlnaHRWaWV3ID0gYWRvcHROUyhbW1dLSW5zcGVjdG9ySGlnaGxpZ2h0Vmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQppbmRleCAzYjQxNGUzMDU3NGNlN2NjODA5 NjE1ZTU4ZDY2NTcxMDZiNjQ3YzQzLi5hNjJlYmYwODZhNWY5YThlOGMzNGYyNzEwMDdhYTQ1N2Jk YmMzNGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVBy b3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJ T1MubW0KQEAgLTEwMjYsNyArMTAyNiw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjphdXRvZmlsbExv Z2luQ3JlZGVudGlhbHMoY29uc3QgU3RyaW5nJiB1c2VybmFtZSwgY29uc3QgU3RyaW5nCiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpBdXRvZmlsbExvZ2luQ3JlZGVudGlh bHModXNlcm5hbWUsIHBhc3N3b3JkKSwgbV93ZWJQYWdlSUQpOwogfQogCi12b2lkIFdlYlBhZ2VQ cm94eTo6c2hvd0luc3BlY3RvckhpZ2hsaWdodChjb25zdCBXZWJDb3JlOjpIaWdobGlnaHQmIGhp Z2hsaWdodCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzaG93SW5zcGVjdG9ySGlnaGxpZ2h0KGNvbnN0 IFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYgaGlnaGxpZ2h0KQogewogICAg IHBhZ2VDbGllbnQoKS5zaG93SW5zcGVjdG9ySGlnaGxpZ2h0KGhpZ2hsaWdodCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvckNs aWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3Rv ckNsaWVudC5jcHAKaW5kZXggNjZlNGIzN2M5M2Y1Y2YxYzFhODRjY2RmNzY2YmZjYWVkOTMzZjcy Yi4uN2NkOTY2ZmZjMjQyNmY2M2U0YWU3ZGJhZmZkM2U1ZGMxZTQ0M2MzOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JDbGllbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yQ2xp ZW50LmNwcApAQCAtMTMyLDcgKzEzMiw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50OjpoaWdo bGlnaHQoKQogICAgICAgICBtX2hpZ2hsaWdodE92ZXJsYXktPnNldE5lZWRzRGlzcGxheSgpOwog ICAgIH0KICNlbHNlCi0gICAgSGlnaGxpZ2h0IGhpZ2hsaWdodDsKKyAgICBJbnNwZWN0b3JPdmVy bGF5OjpIaWdobGlnaHQgaGlnaGxpZ2h0OwogICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVj dG9yQ29udHJvbGxlcigpLmdldEhpZ2hsaWdodChoaWdobGlnaHQsIEluc3BlY3Rvck92ZXJsYXk6 OkNvb3JkaW5hdGVTeXN0ZW06OkRvY3VtZW50KTsKICAgICBtX3BhZ2UtPnNob3dJbnNwZWN0b3JI aWdobGlnaHQoaGlnaGxpZ2h0KTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCmluZGV4IGYxMjI5NWE0ZGVhZTM0ODlmZGM0Y2U0ZGQwOTQwOGJlYWFh YTk2NGUuLmY0MTcwZjY2YWQwYWQ0MThlOTEwMjAyYjc1ZmM2M2JiM2ZmZDhkNjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTExNSw2ICsxMTUsNyBA QCB0eXBlZGVmIHN0cnVjdCBfQXRrT2JqZWN0IEF0a09iamVjdDsKIAogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCiAjaW5jbHVkZSAiR2VzdHVyZVR5cGVzLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9J bnNwZWN0b3JPdmVybGF5Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRQb2ludEhhc2guaD4KICNp bmNsdWRlIDxXZWJDb3JlL1dLQ29udGVudE9ic2VydmF0aW9uLmg+CiAjZW5kaWYKQEAgLTIxOSw3 ICsyMjAsNiBAQCBzdHJ1Y3QgRGljdGF0aW9uQWx0ZXJuYXRpdmU7CiBzdHJ1Y3QgRWxlbWVudENv bnRleHQ7CiBzdHJ1Y3QgR2xvYmFsRnJhbWVJZGVudGlmaWVyOwogc3RydWN0IEdsb2JhbFdpbmRv d0lkZW50aWZpZXI7Ci1zdHJ1Y3QgSGlnaGxpZ2h0Owogc3RydWN0IEtleXByZXNzQ29tbWFuZDsK IHN0cnVjdCBNZWRpYVVzYWdlSW5mbzsKIHN0cnVjdCBQcm9taXNlZEF0dGFjaG1lbnRJbmZvOwpA QCAtNzY1LDcgKzc2NSw3IEBAIHB1YmxpYzoKIAogICAgIFNlY29uZHMgZXZlbnRUaHJvdHRsaW5n RGVsYXkoKSBjb25zdDsKIAotICAgIHZvaWQgc2hvd0luc3BlY3RvckhpZ2hsaWdodChjb25zdCBX ZWJDb3JlOjpIaWdobGlnaHQmKTsKKyAgICB2b2lkIHNob3dJbnNwZWN0b3JIaWdobGlnaHQoY29u c3QgV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6SGlnaGxpZ2h0Jik7CiAgICAgdm9pZCBoaWRl SW5zcGVjdG9ySGlnaGxpZ2h0KCk7CiAKICAgICB2b2lkIHNob3dJbnNwZWN0b3JJbmRpY2F0aW9u KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdl SU9TLm1tCmluZGV4IGExNzZlMWE5ZWQ5YmQ2NWE4MTg1NjVkYTc1YzMxYmVlNTk1NmQ2ZGQuLjJj YjgzMGM1NWExZjY2NDBlNjljODI3M2IzMTZjMDkyMWJkNWY4YmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0xMjY3LDcg KzEyNjcsNyBAQCB2b2lkIFdlYlBhZ2U6OnNldEZvY3VzZWRFbGVtZW50U2VsZWN0ZWRJbmRleCh1 aW50MzJfdCBpbmRleCwgYm9vbCBhbGxvd011bHRpcGxlUwogICAgICAgICBkb3duY2FzdDxIVE1M U2VsZWN0RWxlbWVudD4oKm1fZm9jdXNlZEVsZW1lbnQpLm9wdGlvblNlbGVjdGVkQnlVc2VyKGlu ZGV4LCB0cnVlLCBhbGxvd011bHRpcGxlU2VsZWN0aW9uKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpz aG93SW5zcGVjdG9ySGlnaGxpZ2h0KGNvbnN0IFdlYkNvcmU6OkhpZ2hsaWdodCYgaGlnaGxpZ2h0 KQordm9pZCBXZWJQYWdlOjpzaG93SW5zcGVjdG9ySGlnaGxpZ2h0KGNvbnN0IFdlYkNvcmU6Oklu c3BlY3Rvck92ZXJsYXk6OkhpZ2hsaWdodCYgaGlnaGxpZ2h0KQogewogICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6U2hvd0luc3BlY3RvckhpZ2hsaWdodChoaWdobGlnaHQpKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkluc3BlY3Rvci9XZWJOb2Rl SGlnaGxpZ2h0Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkluc3BlY3Rvci9X ZWJOb2RlSGlnaGxpZ2h0Vmlldy5tbQppbmRleCA1ZTRmMTBlMjI5ZWZlOTE4OTUyZjVjODNlY2Nj NThmMzZlZjY2MTc5Li4xNzI3YzY3ZjM5NDRmMmQ2ZmUyODhmYjg4N2M1MTRhMjdhMzdkM2M0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJJbnNwZWN0b3IvV2ViTm9kZUhp Z2hsaWdodFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViSW5zcGVjdG9y L1dlYk5vZGVIaWdobGlnaHRWaWV3Lm1tCkBAIC0yNjEsNyArMjYxLDcgQEAgc3RhdGljIHZvaWQg bGF5ZXJQYXRoKENBU2hhcGVMYXllciAqbGF5ZXIsIGNvbnN0IEZsb2F0UXVhZCYgb3V0ZXJRdWFk KQogICAgIENHUGF0aFJlbGVhc2UocGF0aCk7CiB9CiAKLS0gKHZvaWQpX2xheW91dEZvck5vZGVI aWdobGlnaHQ6KEhpZ2hsaWdodCopaGlnaGxpZ2h0IHBhcmVudDooQ0FMYXllciAqKXBhcmVudExh eWVyCistICh2b2lkKV9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0OihJbnNwZWN0b3JPdmVybGF5OjpI aWdobGlnaHQqKWhpZ2hsaWdodCBwYXJlbnQ6KENBTGF5ZXIgKilwYXJlbnRMYXllcgogewogICAg IGlmICghaGlnaGxpZ2h0LT5xdWFkcy5zaXplKCkpIHsKICAgICAgICAgW3NlbGYgX3JlbW92ZUFs bExheWVyc107CkBAIC0yOTEsNyArMjkxLDcgQEAgLSAodm9pZClfbGF5b3V0Rm9yTm9kZUhpZ2hs aWdodDooSGlnaGxpZ2h0KiloaWdobGlnaHQgcGFyZW50OihDQUxheWVyICopcGFyZW50TGEKICAg ICBsYXllclBhdGgoY29udGVudExheWVyLCBjb250ZW50UXVhZCk7CiB9CiAKLS0gKHZvaWQpX2xh eW91dEZvclJlY3RzSGlnaGxpZ2h0OihIaWdobGlnaHQqKWhpZ2hsaWdodCBwYXJlbnQ6KENBTGF5 ZXIgKilwYXJlbnRMYXllcgorLSAodm9pZClfbGF5b3V0Rm9yUmVjdHNIaWdobGlnaHQ6KEluc3Bl Y3Rvck92ZXJsYXk6OkhpZ2hsaWdodCopaGlnaGxpZ2h0IHBhcmVudDooQ0FMYXllciAqKXBhcmVu dExheWVyCiB7CiAgICAgTlNVSW50ZWdlciBudW1MYXllcnMgPSBoaWdobGlnaHQtPnF1YWRzLnNp emUoKTsKICAgICBpZiAoIW51bUxheWVycykgewpAQCAtMzE5LDEyICszMTksMTIgQEAgLSAodm9p ZClsYXlvdXRTdWJsYXllcnM6KENBTGF5ZXIgKilwYXJlbnRMYXllcgogICAgIGlmICghW193ZWJO b2RlSGlnaGxpZ2h0IGluc3BlY3RvckNvbnRyb2xsZXJdKQogICAgICAgICByZXR1cm47CiAKLSAg ICBIaWdobGlnaHQgaDsKKyAgICBJbnNwZWN0b3JPdmVybGF5OjpIaWdobGlnaHQgaDsKICAgICBb X3dlYk5vZGVIaWdobGlnaHQgaW5zcGVjdG9yQ29udHJvbGxlcl0tPmdldEhpZ2hsaWdodChoLCBJ bnNwZWN0b3JPdmVybGF5OjpDb29yZGluYXRlU3lzdGVtOjpWaWV3KTsKIAotICAgIGlmIChoLnR5 cGUgPT0gSGlnaGxpZ2h0VHlwZTo6Tm9kZSkKKyAgICBpZiAoaC50eXBlID09IEluc3BlY3Rvck92 ZXJsYXk6OkhpZ2hsaWdodDo6VHlwZTo6Tm9kZSkKICAgICAgICAgW3NlbGYgX2xheW91dEZvck5v ZGVIaWdobGlnaHQ6JmggcGFyZW50OnBhcmVudExheWVyXTsKLSAgICBlbHNlIGlmIChoLnR5cGUg PT0gSGlnaGxpZ2h0VHlwZTo6UmVjdHMpCisgICAgZWxzZSBpZiAoaC50eXBlID09IEluc3BlY3Rv ck92ZXJsYXk6OkhpZ2hsaWdodDo6VHlwZTo6UmVjdHMpCiAgICAgICAgIFtzZWxmIF9sYXlvdXRG b3JSZWN0c0hpZ2hsaWdodDomaCBwYXJlbnQ6cGFyZW50TGF5ZXJdOwogfQogI2VuZGlmCg==