221167 2021-01-29 16:50:06 -0800 Check activeDocumentLoader() for null consistently everywhere 2021-01-30 15:35:52 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 darin darin andersca beidson cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim japhet kangil.han rniwa webkit-bug-importer oldest_to_newest 1723953 0 darin 2021-01-29 16:50:06 -0800 Check activeDocumentLoader() for null consistently everywhere 1723956 1 418787 darin 2021-01-29 16:59:25 -0800 Created attachment 418787 Patch 1723957 2 darin 2021-01-29 16:59:43 -0800 rdar://73151777 1723971 3 418792 darin 2021-01-29 17:24:59 -0800 Created attachment 418792 Patch 1724066 4 darin 2021-01-30 15:35:52 -0800 Committed r272122: <https://trac.webkit.org/changeset/272122> 418787 2021-01-29 16:59:25 -0800 2021-01-29 17:09:53 -0800 Patch bug-221167-20210129165924.patch text/plain 18772 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI4NzFjMGQ2NWEwMGI2 OTZjYTM5NzYyOThlYzBhNWNiMjhiYTk1My4uNmRmMzZiOTJkZWVjOGZhNjlkMTJiYjNkOWEyNTk5 MTUyOWVmY2M3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYxIEBACisyMDIxLTAxLTI5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBDaGVjayBhY3RpdmVEb2N1bWVu dExvYWRlcigpIGZvciBudWxsIGNvbnNpc3RlbnRseSBldmVyeXdoZXJlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjExNjcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdWRpdGVkIGFsbCBhY3RpdmVEb2N1 bWVudExvYWRlcigpIGNhbGxzIHRvIHNlZSBpZiB0aGV5IGNoZWNrCisgICAgICAgIGZvciBudWxs LiBNYW55IHdlcmUgbWlzc2luZyBhIG51bGwgY2hlY2sgYW5kIG9ubHkgYSB2ZXJ5IGZldyBoYWQK KyAgICAgICAgYSBnb29kIHNvbGlkIHJlYXNvbiB0aGV5IGRvbid0IG5lZWQgb25lIChuZXdseS1j cmVhdGVkIGZyYW1lcywgYmFzaWNhbGx5KS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVDYWNoZWRSZXNvdXJjZUxvYWRlcik6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OkRvY3VtZW50KTogVXNlIHRoZSBjcmVhdGVDYWNo ZWRSZXNvdXJjZUxvYWRlciwgd2hpY2gKKyAgICAgICAgYWRkc2QgYSBudWxsIGNoZWNrIGZvciB0 aGUgYWN0aXZlIGRvY3VtZW50IGxvYWRlci4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpp bml0U2VjdXJpdHlDb250ZXh0KTogUmVtb3ZlIGNhbGwgdG8KKyAgICAgICAgc2hvdWxkRW5mb3Jj ZVF1aWNrTG9va1NhbmRib3gsIHNpbmNlIHRoYXQgbG9naWMgaGFzIG5vdyBiZWVuIG1vdmVkCisg ICAgICAgIGluc2lkZSBhcHBseVF1aWNrTG9va1NhbmRib3guCisgICAgICAgIChXZWJDb3JlOjpE b2N1bWVudDo6c2hvdWxkRW5mb3JjZVF1aWNrTG9va1NhbmRib3ggY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmFwcGx5UXVpY2tMb29rU2FuZGJveCk6IE1lcmdl ZCBpbiB0aGUgbG9naWMgZnJvbQorICAgICAgICBzaG91bGRFbmZvcmNlUXVpY2tMb29rU2FuZGJv eCwgaW5jbHVkZSB0aGUgbnVsbCBjaGVjayBvZiBhY3RpdmVEb2N1bWVudExvYWRlcigpLgorICAg ICAgICAqIGRvbS9Eb2N1bWVudC5oOiBSZW1vdmVkIHNob3VsZEVuZm9yY2VRdWlja0xvb2tTYW5k Ym94LgorCisgICAgICAgICogaHRtbC9QbHVnaW5Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQbHVnaW5Eb2N1bWVudFBhcnNlcjo6YXBwZW5kQnl0ZXMpOiBBZGRlZCBhIG51bGwgY2hl Y2sgYmVmb3JlCisgICAgICAgIGNhbGxpbmcgc2V0TWFpblJlc291cmNlRGF0YUJ1ZmZlcmluZ1Bv bGljeS4gQWxzbyB0d2Vha2VkIHN0eWxlIGEgYml0LgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu RG9jdW1lbnQ6OmNhbmNlbE1hbnVhbFBsdWdpbkxvYWQpOiBBZGRlZCBhIG51bGwgY2hlY2sKKyAg ICAgICAgYmVmb3JlIGNhbGxpbmcgY2FuY2VsTWFpblJlc291cmNlTG9hZC4KKworICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 aW5pdGlhbFJlcXVlc3QgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6Om9yaWdpbmFsUmVxdWVzdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVy L0ZyYW1lTG9hZGVyLmg6IERlbGV0ZWQgdGhlIGluaXRpYWxSZXF1ZXN0IGFuZCBvcmlnaW5hbFJl cXVlc3QKKyAgICAgICAgZnVuY3Rpb25zLiBCb3RoIHdlcmUgdXNpbmcgYWN0aXZlRG9jdW1lbnRM b2FkZXIoKSB3aXRob3V0IG51bGwgY2hlY2tzLAorICAgICAgICBidXQgYm90aCBhbHNvIHdlcmUg dW51c2VkLgorCisgICAgICAgICogbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OlBvbGljeUNoZWNrZXI6OmNoZWNrTmF2aWdhdGlvblBvbGlj eSk6CisgICAgICAgIEFkZGVkIG51bGwgY2hlY2sgYmVmb3JlIGNhbGxpbmcgY29udGludWVBZnRl clN1YnN0aXR1dGVEYXRhUmVxdWVzdC4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOiBBZGRlZCBu dWxsIGNoZWNrIGJlZm9yZSBjYWxsaW5nCisgICAgICAgIHNjaGVkdWxlQXJjaGl2ZUxvYWQgYW5k IG51bGwgY2hlY2sgYmVmb3JlIGNhbGxsaW5nCisgICAgICAgIGFwcGxpY2F0aW9uQ2FjaGVIb3N0 KCkubWF5YmVMb2FkUmVzb3VyY2UoKS4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVy Ojp3aWxsU3dpdGNoVG9TdWJzdGl0dXRlUmVzb3VyY2UpOiBBZGRlZAorICAgICAgICBudWxsIGNo ZWNrIGluc2lkZSBhbiBhc3NlcnRpb24uCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRl cjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwpOiBBZGRlZCBudWxsIGNoZWNrCisgICAgICAgIGJl Zm9yZSBjYWxsaW5nIHByZXZpZXdDb252ZXJ0ZXIgYW5kIGlzQ29tbWl0dGVkLgorCisgICAgICAg ICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OnNlbGVjdENhY2hlKTogQWRkZWQgbnVsbCBj aGVjayBiZWZvcmUKKyAgICAgICAgY2FsbGluZyByZXF1ZXN0LgorCisgICAgICAgICogcGFnZS9E T01XaW5kb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjpwcmludCk6IEFkZGVk IG51bGwgY2hlY2sgYmVmb3JlIGNhbGxpbmcgaXNMb2FkaW5nLgorICAgICAgICAoV2ViQ29yZTo6 RE9NV2luZG93OjpmaW5pc2hlZExvYWRpbmcpOiBBZGRlZCBudWxsIGNoZWNrIGJlZm9yZSBjYWxs aW5nCisgICAgICAgIG1haW5Eb2N1bWVudEVycm9yLgorCiAyMDIxLTAxLTI4ICBQZW5nIExpdSAg PHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdW01TRV0gQSB2aWRlbyBlbGVt ZW50IGRvZXMgbm90IGZpcmUg4oCcY2FucGxheXRocm91Z2jigJ0gZXZlbnQgaWYgU291cmNlQnVm ZmVyLmFib3J0KCkgaXMgY2FsbGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkNjRhYmY2YTQ5NDYwNzZhZWI2NjRi NTI2YTUzYTYzMTkzZTQwNTYuLmQ1ZjYwZWMwMWI1ZmI4MGI5Mjk2YTA4ZDU4ZjUzYWU2NDRiNTY4 ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMjkgIERhcmluIEFkbGVyICA8 ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIENoZWNrIGFjdGl2ZURvY3VtZW50TG9hZGVyKCkg Zm9yIG51bGwgY29uc2lzdGVudGx5IGV2ZXJ5d2hlcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTE2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpjYW5jZWxNYW51YWxTdHJlYW1Mb2Fk KTogQWRkZWQgbnVsbCBjaGVjayBiZWZvcmUgY2FsbGluZworICAgICAgICBpc0xvYWRpbmdNYWlu UmVzb3VyY2UuCisKIDIwMjEtMDEtMjggIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2ViQXV0aG5dIEFkb3B0IG5ldyBTUEkgdG8gc2hvdyBubyBjcmVkZW50 aWFscyBlcnJvciBmb3IgdGhlIHBsYXRmb3JtIGF1dGhlbnRpY2F0b3IKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0NoYW5nZUxvZwppbmRleCA1ZjNmMTFlN2NkMGUyZjMwNjRkMmJhNWNiZjgxNDg5YjRiMGEzYjRm Li4wN2EzNjIwYTdlNTgxM2QyNGUxOTQ2OWUzM2RiM2E4ZmQ5Mzk0ZWI3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMjkgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIENoZWNrIGFjdGl2ZURvY3VtZW50TG9hZGVy KCkgZm9yIG51bGwgY29uc2lzdGVudGx5IGV2ZXJ5d2hlcmUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTE2NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblN0 cmVhbS5tbToKKyAgICAgICAgKFdlYk5ldHNjYXBlUGx1Z2luU3RyZWFtOjpjYW5jZWxMb2FkV2l0 aEVycm9yKTogQWRkZWQgbnVsbCBjaGVjayBiZWZvcmUgY2FsbGluZworICAgICAgICBpc0xvYWRp bmdNYWluUmVzb3VyY2UuCisKIDIwMjEtMDEtMjYgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjY3NjQxKTogV2ViS2l0RGV2ZWxvcGVyRXh0cmFzIHBy ZWZlcmVuY2UgaGFzIG5vIGVmZmVjdCBmb3IgV2ViS2l0TGVnYWN5IGNsaWVudHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCmluZGV4IDI0NThlZDg2ZjQ5MDMwZDg4ZTNkNjY3Yzg1OWFmZTg3MTc5ZTgz OWUuLjBhNjkxNjU0N2UzYWI5NDJkNjhmNWU1YzI2MzQ4OTIxMDllOWJjMGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcApAQCAtNTkwLDEzICs1OTAsMjIgQEAgc3RhdGljIGlubGluZSBpbnQgY3Vy cmVudE9yaWVudGF0aW9uKEZyYW1lKiBmcmFtZSkKICAgICByZXR1cm4gMDsKIH0KIAorc3RhdGlj IFJlZjxDYWNoZWRSZXNvdXJjZUxvYWRlcj4gY3JlYXRlQ2FjaGVkUmVzb3VyY2VMb2FkZXIoRnJh bWUqIGZyYW1lKQoreworICAgIGlmIChmcmFtZSkgeworICAgICAgICBpZiAoYXV0byBsb2FkZXIg PSBmcmFtZS0+bG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKSkKKyAgICAgICAgICAgIHJl dHVybiBsb2FkZXItPmNhY2hlZFJlc291cmNlTG9hZGVyKCk7CisgICAgfQorICAgIHJldHVybiBD YWNoZWRSZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKG51bGxwdHIpOworfQorCiBEb2N1bWVudDo6RG9j dW1lbnQoRnJhbWUqIGZyYW1lLCBjb25zdCBTZXR0aW5ncyYgc2V0dGluZ3MsIGNvbnN0IFVSTCYg dXJsLCBEb2N1bWVudENsYXNzRmxhZ3MgZG9jdW1lbnRDbGFzc2VzLCB1bnNpZ25lZCBjb25zdHJ1 Y3Rpb25GbGFncykKICAgICA6IENvbnRhaW5lck5vZGUoKnRoaXMsIENyZWF0ZURvY3VtZW50KQog ICAgICwgVHJlZVNjb3BlKCp0aGlzKQogICAgICwgRnJhbWVEZXN0cnVjdGlvbk9ic2VydmVyKGZy YW1lKQogICAgICwgbV9zZXR0aW5ncyhzZXR0aW5ncykKICAgICAsIG1fcXVpcmtzKG1ha2VVbmlx dWVSZWY8UXVpcmtzPigqdGhpcykpCi0gICAgLCBtX2NhY2hlZFJlc291cmNlTG9hZGVyKG1fZnJh bWUgPyBSZWY8Q2FjaGVkUmVzb3VyY2VMb2FkZXI+KG1fZnJhbWUtPmxvYWRlcigpLmFjdGl2ZURv Y3VtZW50TG9hZGVyKCktPmNhY2hlZFJlc291cmNlTG9hZGVyKCkpIDogQ2FjaGVkUmVzb3VyY2VM b2FkZXI6OmNyZWF0ZShudWxscHRyKSkKKyAgICAsIG1fY2FjaGVkUmVzb3VyY2VMb2FkZXIoY3Jl YXRlQ2FjaGVkUmVzb3VyY2VMb2FkZXIoZnJhbWUpKQogICAgICwgbV9kb21UcmVlVmVyc2lvbigr K3NfZ2xvYmFsVHJlZVZlcnNpb24pCiAgICAgLCBtX3N0eWxlU2NvcGUobWFrZVVuaXF1ZTxTdHls ZTo6U2NvcGU+KCp0aGlzKSkKICAgICAsIG1fZXh0ZW5zaW9uU3R5bGVTaGVldHMobWFrZVVuaXF1 ZTxFeHRlbnNpb25TdHlsZVNoZWV0cz4oKnRoaXMpKQpAQCAtNjA3Nyw4ICs2MDg2LDcgQEAgdm9p ZCBEb2N1bWVudDo6aW5pdFNlY3VyaXR5Q29udGV4dCgpCiAgICAgICAgIGNvbnRlbnRTZWN1cml0 eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5 LCBDb250ZW50U2VjdXJpdHlQb2xpY3lIZWFkZXJUeXBlOjpFbmZvcmNlLCBDb250ZW50U2VjdXJp dHlQb2xpY3k6OlBvbGljeUZyb206OkFQSSwgcmVmZXJyZXIoKSwgZG9jdW1lbnRMb2FkZXIgPyBk b2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRwU3RhdHVzQ29kZSgpIDogMCk7CiAKICNpZiBV U0UoUVVJQ0tfTE9PSykKLSAgICBpZiAoc2hvdWxkRW5mb3JjZVF1aWNrTG9va1NhbmRib3goKSkK LSAgICAgICAgYXBwbHlRdWlja0xvb2tTYW5kYm94KCk7CisgICAgYXBwbHlRdWlja0xvb2tTYW5k Ym94KCk7CiAjZW5kaWYKIAogICAgIGlmIChzaG91bGRFbmZvcmNlSFRUUDA5U2FuZGJveCgpKSB7 CkBAIC03NTU4LDE5ICs3NTY2LDE4IEBAIGJvb2wgRG9jdW1lbnQ6OnNob3VsZEVuZm9yY2VIVFRQ MDlTYW5kYm94KCkgY29uc3QKIAogI2lmIFVTRShRVUlDS19MT09LKQogCi1ib29sIERvY3VtZW50 OjpzaG91bGRFbmZvcmNlUXVpY2tMb29rU2FuZGJveCgpIGNvbnN0Citib29sIERvY3VtZW50Ojph cHBseVF1aWNrTG9va1NhbmRib3goKQogewogICAgIGlmIChtX2lzU3ludGhlc2l6ZWQgfHwgIW1f ZnJhbWUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1l bnRMb2FkZXIgPSBtX2ZyYW1lLT5sb2FkZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigpOwotICAg IHJldHVybiBkb2N1bWVudExvYWRlciAmJiBkb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5pc1F1 aWNrTG9vaygpOwotfQorICAgICAgICByZXR1cm47CisgICAgYXV0byBsb2FkZXIgPSBtX2ZyYW1l LT5sb2FkZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigpOworICAgIGlmICghbG9hZGVyKQorICAg ICAgICByZXR1cm47CisgICAgaWYgKCFsb2FkZXItPnJlc3BvbnNlKCkuaXNRdWlja0xvb2soKSkK KyAgICAgICAgcmV0dXJuOwogCi12b2lkIERvY3VtZW50OjphcHBseVF1aWNrTG9va1NhbmRib3go KQotewotICAgIGF1dG8mIGRvY3VtZW50TG9hZGVyID0gKm1fZnJhbWUtPmxvYWRlcigpLmFjdGl2 ZURvY3VtZW50TG9hZGVyKCk7Ci0gICAgYXV0byBkb2N1bWVudFVSTCA9IGRvY3VtZW50TG9hZGVy LmRvY3VtZW50VVJMKCk7Ci0gICAgYXV0byYgcmVzcG9uc2VVUkwgPSBkb2N1bWVudExvYWRlci5y ZXNwb25zZVVSTCgpOworICAgIGF1dG8gZG9jdW1lbnRVUkwgPSBsb2FkZXItPmRvY3VtZW50VVJM KCk7CisgICAgYXV0byYgcmVzcG9uc2VVUkwgPSBsb2FkZXItPnJlc3BvbnNlVVJMKCk7CiAgICAg QVNTRVJUKCFkb2N1bWVudFVSTC5wcm90b2NvbElzKFFMUHJldmlld1Byb3RvY29sKSk7CiAgICAg QVNTRVJUKHJlc3BvbnNlVVJMLnByb3RvY29sSXMoUUxQcmV2aWV3UHJvdG9jb2wpKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuaAppbmRleCA0OTRjOGYwZWVmN2Y3MjA3NGU5YmE0MDRlMDFlMDFmN2M4NTlm OWNhLi5iMWNiNzhhYTUwZTBkMDdjZGZmMzllMjAwZDYyZDFkODQwMWVhMjE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaApAQCAtMTcwMiw3ICsxNzAyLDYgQEAgcHJpdmF0ZToKICAgICBib29sIGlzTmF2 aWdhdGlvbkJsb2NrZWRCeVRoaXJkUGFydHlJRnJhbWVSZWRpcmVjdEJsb2NraW5nKEZyYW1lJiB0 YXJnZXRGcmFtZSwgY29uc3QgVVJMJiBkZXN0aW5hdGlvblVSTCk7CiAKICNpZiBVU0UoUVVJQ0tf TE9PSykKLSAgICBib29sIHNob3VsZEVuZm9yY2VRdWlja0xvb2tTYW5kYm94KCkgY29uc3Q7CiAg ICAgdm9pZCBhcHBseVF1aWNrTG9va1NhbmRib3goKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL1BsdWdpbkRvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvUGx1Z2luRG9jdW1lbnQuY3BwCmluZGV4IGYxZWZjYWQ1MTFiYjhkMjliYWJkOGQzYjJjYzY1 MjBjMWM2ZjIwNTUuLmQ1ODgyZmIyODU1ZDk3OGQzNDE2MWI0NWNhZGZkMzEwYzYwMjBmYTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCkBAIC0xMzAsMTMgKzEzMCwxNSBA QCB2b2lkIFBsdWdpbkRvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRlcyhEb2N1bWVudFdyaXRlciYs IGNvbnN0IGNoYXIqLCBzaXplX3QpCiAgICAgLy8gY2FuIHN5bmNocm9ub3VzbHkgcmVkaXJlY3Qg ZGF0YSB0byB0aGUgcGx1Z2luLgogICAgIGZyYW1lLT52aWV3KCktPmZsdXNoQW55UGVuZGluZ1Bv c3RMYXlvdXRUYXNrcygpOwogCi0gICAgaWYgKFJlbmRlcldpZGdldCogcmVuZGVyZXIgPSBtX2Vt YmVkRWxlbWVudC0+cmVuZGVyV2lkZ2V0KCkpIHsKLSAgICAgICAgaWYgKFJlZlB0cjxXaWRnZXQ+ IHdpZGdldCA9IHJlbmRlcmVyLT53aWRnZXQoKSkgeworICAgIGlmIChhdXRvIHJlbmRlcmVyID0g bV9lbWJlZEVsZW1lbnQtPnJlbmRlcldpZGdldCgpKSB7CisgICAgICAgIGlmIChhdXRvIHdpZGdl dCA9IG1ha2VSZWZQdHIocmVuZGVyZXItPndpZGdldCgpKSkgewogICAgICAgICAgICAgZnJhbWUt PmxvYWRlcigpLmNsaWVudCgpLnJlZGlyZWN0RGF0YVRvUGx1Z2luKCp3aWRnZXQpOworCiAgICAg ICAgICAgICAvLyBJbiBhIHBsdWdpbiBkb2N1bWVudCwgdGhlIG1haW4gcmVzb3VyY2UgaXMgdGhl IHBsdWdpbi4gSWYgd2UgaGF2ZSBhIG51bGwgd2lkZ2V0LCB0aGF0IG1lYW5zCiAgICAgICAgICAg ICAvLyB0aGUgbG9hZGluZyBvZiB0aGUgcGx1Z2luIHdhcyBjYW5jZWxsZWQsIHdoaWNoIGdpdmVz IHVzIGEgbnVsbCBtYWluUmVzb3VyY2VMb2FkZXIoKSwgc28gd2UKICAgICAgICAgICAgIC8vIG5l ZWQgdG8gaGF2ZSB0aGlzIGNhbGwgaW4gYSBudWxsIGNoZWNrIG9mIHRoZSB3aWRnZXQgb3Igb2Yg bWFpblJlc291cmNlTG9hZGVyKCkuCi0gICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCkuYWN0aXZl RG9jdW1lbnRMb2FkZXIoKS0+c2V0TWFpblJlc291cmNlRGF0YUJ1ZmZlcmluZ1BvbGljeShEYXRh QnVmZmVyaW5nUG9saWN5OjpEb05vdEJ1ZmZlckRhdGEpOworICAgICAgICAgICAgaWYgKGF1dG8g bG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLmFjdGl2ZURvY3VtZW50TG9hZGVyKCkpCisgICAgICAg ICAgICAgICAgbG9hZGVyLT5zZXRNYWluUmVzb3VyY2VEYXRhQnVmZmVyaW5nUG9saWN5KERhdGFC dWZmZXJpbmdQb2xpY3k6OkRvTm90QnVmZmVyRGF0YSk7CiAgICAgICAgIH0KICAgICB9CiB9CkBA IC0xODIsOCArMTg0LDggQEAgdm9pZCBQbHVnaW5Eb2N1bWVudDo6Y2FuY2VsTWFudWFsUGx1Z2lu TG9hZCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8mIGZyYW1lTG9hZGVyID0gZnJhbWUo KS0+bG9hZGVyKCk7Ci0gICAgYXV0byYgZG9jdW1lbnRMb2FkZXIgPSAqZnJhbWVMb2FkZXIuYWN0 aXZlRG9jdW1lbnRMb2FkZXIoKTsKLSAgICBkb2N1bWVudExvYWRlci5jYW5jZWxNYWluUmVzb3Vy Y2VMb2FkKGZyYW1lTG9hZGVyLmNhbmNlbGxlZEVycm9yKGRvY3VtZW50TG9hZGVyLnJlcXVlc3Qo KSkpOworICAgIGlmIChhdXRvIGRvY3VtZW50TG9hZGVyID0gZnJhbWVMb2FkZXIuYWN0aXZlRG9j dW1lbnRMb2FkZXIoKSkKKyAgICAgICAgZG9jdW1lbnRMb2FkZXItPmNhbmNlbE1haW5SZXNvdXJj ZUxvYWQoZnJhbWVMb2FkZXIuY2FuY2VsbGVkRXJyb3IoZG9jdW1lbnRMb2FkZXItPnJlcXVlc3Qo KSkpOwogICAgIG1fc2hvdWxkTG9hZFBsdWdpbk1hbnVhbGx5ID0gZmFsc2U7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDM5NTJjOTMzMjc4ZTE2MzY5NDA5Mzkw YjFkYjgwZGVhOTQ5NWQ2MjQuLjNiZmI5YTY4MWQ1NmIyYTUyNDM0NmNjNTRiN2ViYmMxNmIwZGIy NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTYzOSwxMSArMTYz OSw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnJlcG9ydExvY2FsTG9hZEZhaWxlZChGcmFtZSogZnJh bWUsIGNvbnN0IFN0cmluZyYgdXJsKQogICAgIGZyYW1lLT5kb2N1bWVudCgpLT5hZGRDb25zb2xl TWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgIk5v dCBhbGxvd2VkIHRvIGxvYWQgbG9jYWwgcmVzb3VyY2U6ICIgKyB1cmwpOwogfQogCi1jb25zdCBS ZXNvdXJjZVJlcXVlc3QmIEZyYW1lTG9hZGVyOjppbml0aWFsUmVxdWVzdCgpIGNvbnN0Ci17Ci0g ICAgcmV0dXJuIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPm9yaWdpbmFsUmVxdWVzdCgpOwotfQot CiBib29sIEZyYW1lTG9hZGVyOjp3aWxsTG9hZE1lZGlhRWxlbWVudFVSTChVUkwmIHVybCwgTm9k ZSYgaW5pdGlhdG9yTm9kZSkKIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpAQCAtMzExOCwx MSArMzExMyw2IEBAIHVuc2lnbmVkIGxvbmcgRnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1CiAgICAgcmV0dXJuIGlkZW50aWZp ZXI7CiB9CiAKLWNvbnN0IFJlc291cmNlUmVxdWVzdCYgRnJhbWVMb2FkZXI6Om9yaWdpbmFsUmVx dWVzdCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPm9yaWdp bmFsUmVxdWVzdENvcHkoKTsKLX0KLQogdm9pZCBGcmFtZUxvYWRlcjo6cmVjZWl2ZWRNYWluUmVz b3VyY2VFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKICAgICAvLyBSZXRhaW4g YmVjYXVzZSB0aGUgc3RvcCBtYXkgcmVsZWFzZSB0aGUgbGFzdCByZWZlcmVuY2UgdG8gaXQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IGE5NGEwNTljMWJmMDk1NGNkMDU2ZWM3 NGI2Nzc2OGJjOGU3NmJhMDkuLmFiNjhhNTRiN2JjYjA5NmM2YTMzYWJlYjA0ZTQ3ZDBiNjA3NGM3 ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0xNzQsOCArMTc0LDYgQEAg cHVibGljOgogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgUmV0YWluUHRyPENGRGljdGlv bmFyeVJlZj4gY29ubmVjdGlvblByb3BlcnRpZXMoUmVzb3VyY2VMb2FkZXIqKTsKICNlbmRpZgot ICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0KCkgY29uc3Q7Ci0gICAg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBpbml0aWFsUmVxdWVzdCgpIGNvbnN0OwogICAgIHZvaWQg cmVjZWl2ZWRNYWluUmVzb3VyY2VFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJik7CiAKICAgICBi b29sIHdpbGxMb2FkTWVkaWFFbGVtZW50VVJMKFVSTCYsIE5vZGUmKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Qb2xpY3lDaGVja2VyLmNwcAppbmRleCAyNzYxNDhhNjNmMzZjYzQ2YWUwY2YyYmI1MzVj MzNmMmFhMDdlMzBiLi4yMmIwNTg4YTYxYTg0ZDczY2QyMGJlYTI3NjRjZmNhZTQ3MzdiYTFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5Q2hlY2tlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCkBAIC0xNTAsNyArMTUwLDgg QEAgdm9pZCBGcmFtZUxvYWRlcjo6UG9saWN5Q2hlY2tlcjo6Y2hlY2tOYXZpZ2F0aW9uUG9saWN5 KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QKICAgICBpZiAoc3Vic3RpdHV0ZURhdGEuaXNWYWxp ZCgpICYmICFzdWJzdGl0dXRlRGF0YS5mYWlsaW5nVVJMKCkuaXNFbXB0eSgpKSB7CiAgICAgICAg IGJvb2wgc2hvdWxkQ29udGludWUgPSB0cnVlOwogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklO RykKLSAgICAgICAgc2hvdWxkQ29udGludWUgPSBDb250ZW50RmlsdGVyOjpjb250aW51ZUFmdGVy U3Vic3RpdHV0ZURhdGFSZXF1ZXN0KCptX2ZyYW1lLmxvYWRlcigpLmFjdGl2ZURvY3VtZW50TG9h ZGVyKCksIHN1YnN0aXR1dGVEYXRhKTsKKyAgICAgICAgaWYgKGF1dG8gbG9hZGVyID0gbV9mcmFt ZS5sb2FkZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigpKQorICAgICAgICAgICAgc2hvdWxkQ29u dGludWUgPSBDb250ZW50RmlsdGVyOjpjb250aW51ZUFmdGVyU3Vic3RpdHV0ZURhdGFSZXF1ZXN0 KCpsb2FkZXIsIHN1YnN0aXR1dGVEYXRhKTsKICNlbmRpZgogICAgICAgICBpZiAoaXNCYWNrRm9y d2FyZExvYWRUeXBlKG1fbG9hZFR5cGUpKQogICAgICAgICAgICAgbV9sb2FkVHlwZSA9IEZyYW1l TG9hZFR5cGU6OlJlbG9hZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3Bw CmluZGV4IDgwZGQxNTFkMmU5MThjODcyNmE5ZmFlNjgwZmRmNmNjZjUzY2M4MzUuLjlkNWFjNDg1 Y2E4NWI1NDc3ZDUzNmE4NTk0NzRiMGI3ZjUzNTQxNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZGVyLmNwcApAQCAtMTk5LDExICsxOTksMTEgQEAgdm9pZCBSZXNvdXJjZUxv YWRlcjo6c3RhcnQoKQogICAgIEFTU0VSVChmcmFtZUxvYWRlcigpKTsKIAogI2lmIEVOQUJMRShX RUJfQVJDSElWRSkgfHwgRU5BQkxFKE1IVE1MKQotICAgIGlmIChtX2RvY3VtZW50TG9hZGVyLT5z Y2hlZHVsZUFyY2hpdmVMb2FkKCp0aGlzLCBtX3JlcXVlc3QpKQorICAgIGlmIChtX2RvY3VtZW50 TG9hZGVyICYmIG1fZG9jdW1lbnRMb2FkZXItPnNjaGVkdWxlQXJjaGl2ZUxvYWQoKnRoaXMsIG1f cmVxdWVzdCkpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgogCi0gICAgaWYgKG1fZG9jdW1lbnRM b2FkZXItPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5YmVMb2FkUmVzb3VyY2UoKnRoaXMsIG1f cmVxdWVzdCwgbV9yZXF1ZXN0LnVybCgpKSkKKyAgICBpZiAobV9kb2N1bWVudExvYWRlciAmJiBt X2RvY3VtZW50TG9hZGVyLT5hcHBsaWNhdGlvbkNhY2hlSG9zdCgpLm1heWJlTG9hZFJlc291cmNl KCp0aGlzLCBtX3JlcXVlc3QsIG1fcmVxdWVzdC51cmwoKSkpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGlmIChtX2RlZmVyc0xvYWRpbmcpIHsKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIFJlc291 cmNlTG9hZGVyOjpzZXREYXRhQnVmZmVyaW5nUG9saWN5KERhdGFCdWZmZXJpbmdQb2xpY3kgZGF0 YUJ1ZmZlcmluZ1BvbAogCiB2b2lkIFJlc291cmNlTG9hZGVyOjp3aWxsU3dpdGNoVG9TdWJzdGl0 dXRlUmVzb3VyY2UoKQogewotICAgIEFTU0VSVCghbV9kb2N1bWVudExvYWRlci0+aXNTdWJzdGl0 dXRlTG9hZFBlbmRpbmcodGhpcykpOworICAgIEFTU0VSVChtX2RvY3VtZW50TG9hZGVyICYmICFt X2RvY3VtZW50TG9hZGVyLT5pc1N1YnN0aXR1dGVMb2FkUGVuZGluZyh0aGlzKSk7CiAgICAgcGxh dGZvcm1TdHJhdGVnaWVzKCktPmxvYWRlclN0cmF0ZWd5KCktPnJlbW92ZSh0aGlzKTsKICAgICBp ZiAobV9oYW5kbGUpCiAgICAgICAgIG1faGFuZGxlLT5jYW5jZWwoKTsKQEAgLTM5NCw4ICszOTQs MTAgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3Vy Y2VSZXF1ZXN0JiYgcmVxdWVzdCwgY29uc3QgUmUKICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjp3aWxsU2VuZFJlcXVlc3QobV9mcmFtZS5nZXQoKSwgbV9pZGVudGlmaWVyLCBtX2Zy YW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNl KTsKIAogI2lmIFVTRShRVUlDS19MT09LKQotICAgIGlmIChhdXRvIHByZXZpZXdDb252ZXJ0ZXIg PSBtX2RvY3VtZW50TG9hZGVyLT5wcmV2aWV3Q29udmVydGVyKCkpCi0gICAgICAgIHJlcXVlc3Qg PSBwcmV2aWV3Q29udmVydGVyLT5zYWZlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBpZiAobV9kb2N1 bWVudExvYWRlcikgeworICAgICAgICBpZiAoYXV0byBwcmV2aWV3Q29udmVydGVyID0gbV9kb2N1 bWVudExvYWRlci0+cHJldmlld0NvbnZlcnRlcigpKQorICAgICAgICAgICAgcmVxdWVzdCA9IHBy ZXZpZXdDb252ZXJ0ZXItPnNhZmVSZXF1ZXN0KHJlcXVlc3QpOworICAgIH0KICNlbmRpZgogCiAg ICAgYm9vbCBpc1JlZGlyZWN0ID0gIXJlZGlyZWN0UmVzcG9uc2UuaXNOdWxsKCk7CkBAIC00MDks NyArNDExLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwo UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgY29uc3QgUmUKIAogICAgIGlmIChpc1JlZGlyZWN0 KSB7CiAgICAgICAgIGF1dG8mIHJlZGlyZWN0VVJMID0gcmVxdWVzdC51cmwoKTsKLSAgICAgICAg aWYgKCFtX2RvY3VtZW50TG9hZGVyLT5pc0NvbW1pdHRlZCgpKQorICAgICAgICBpZiAobV9kb2N1 bWVudExvYWRlciAmJiAhbV9kb2N1bWVudExvYWRlci0+aXNDb21taXR0ZWQoKSkKICAgICAgICAg ICAgIGZyYW1lTG9hZGVyKCktPmNsaWVudCgpLmRpc3BhdGNoRGlkUmVjZWl2ZVNlcnZlclJlZGly ZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCk7CiAKICAgICAgICAgaWYgKHJlZGlyZWN0VVJMLnByb3Rv Y29sSXNEYXRhKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNo ZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNh Y2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKaW5kZXggNjVlZmViMjQwZGFjYTI2YjQ0Yjhk YjNkMDVlZmI4NDBlZDMyZGY1Ni4uNTNkZjhjOWIxOGI5N2ZjOTA2MzM2OGExZWUxMDQxMTFjZTli Mjk1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0 aW9uQ2FjaGVHcm91cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0Fw cGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKQEAgLTE4MCw4ICsxODAsMTAgQEAgdm9pZCBBcHBsaWNh dGlvbkNhY2hlR3JvdXA6OnNlbGVjdENhY2hlKEZyYW1lJiBmcmFtZSwgY29uc3QgVVJMJiBwYXNz ZWRNYW5pZmVzdFUKICAgICB9CiAKICAgICAvLyBUaGUgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9t IHRoZSBuZXR3b3JrLCBjaGVjayBpZiBpdCBpcyBhIEhUVFAvSFRUUFMgR0VULiAgICAKLSAgICBh dXRvJiByZXF1ZXN0ID0gZnJhbWUubG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+cmVx dWVzdCgpOwotCisgICAgYXV0byBsb2FkZXIgPSBmcmFtZS5sb2FkZXIoKS5hY3RpdmVEb2N1bWVu dExvYWRlcigpOworICAgIGlmICghbG9hZGVyKQorICAgICAgICByZXR1cm47CisgICAgYXV0byYg cmVxdWVzdCA9IGxvYWRlci0+cmVxdWVzdCgpOwogICAgIGlmICghQXBwbGljYXRpb25DYWNoZTo6 cmVxdWVzdElzSFRUUE9ySFRUUFNHZXQocmVxdWVzdCkpCiAgICAgICAgIHJldHVybjsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDczNjg0YjRlMmVhOTc4NTE4MTk2NjdiZTY4NDlj NTkzNjc0OTJkYTEuLjYzZGI2MjdhYWI1YzcwY2M4ODdjYzY4ZjcwZmU5YjkwMjZiNTcxMmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTEwNzMsNyArMTA3Myw3IEBAIHZvaWQgRE9N V2luZG93OjpwcmludCgpCiAgICAgaWYgKHBhZ2UtPmlzQ29udHJvbGxlZEJ5QXV0b21hdGlvbigp KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoZnJhbWUtPmxvYWRlcigpLmFjdGl2ZURvY3Vt ZW50TG9hZGVyKCktPmlzTG9hZGluZygpKSB7CisgICAgaWYgKGF1dG8gbG9hZGVyID0gZnJhbWUt PmxvYWRlcigpLmFjdGl2ZURvY3VtZW50TG9hZGVyKCk7IGxvYWRlciAmJiBsb2FkZXItPmlzTG9h ZGluZygpKSB7CiAgICAgICAgIG1fc2hvdWxkUHJpbnRXaGVuRmluaXNoZWRMb2FkaW5nID0gdHJ1 ZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIzMjYsNyArMjMyNiw3IEBAIHZvaWQgRE9N V2luZG93OjpmaW5pc2hlZExvYWRpbmcoKQogewogICAgIGlmIChtX3Nob3VsZFByaW50V2hlbkZp bmlzaGVkTG9hZGluZykgewogICAgICAgICBtX3Nob3VsZFByaW50V2hlbkZpbmlzaGVkTG9hZGlu ZyA9IGZhbHNlOwotICAgICAgICBpZiAoZnJhbWUoKS0+bG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRM b2FkZXIoKS0+bWFpbkRvY3VtZW50RXJyb3IoKS5pc051bGwoKSkKKyAgICAgICAgaWYgKGF1dG8g bG9hZGVyID0gZnJhbWUoKS0+bG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKTsgIWxvYWRl ciB8fCBsb2FkZXItPm1haW5Eb2N1bWVudEVycm9yKCkuaXNOdWxsKCkpCiAgICAgICAgICAgICBw cmludCgpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5jcHAKaW5kZXggY2NkZGRmNWI5OTVlMzFjMWIyNWFkNGRjN2ZjOGNmZmMzMDhh NWNlYS4uNmE1ZmMzODRmZGVlNmY3MjgwNGExYzJhZTU0MWRkZGEyYzRiYjJlMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTEzOTks OCArMTM5OSw3IEBAIHZvaWQgUGx1Z2luVmlldzo6Y2FuY2VsTWFudWFsU3RyZWFtTG9hZCgpCiAK ICAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFtZSgpLT5sb2FkZXIoKS5h Y3RpdmVEb2N1bWVudExvYWRlcigpOwogICAgIEFTU0VSVChkb2N1bWVudExvYWRlcik7Ci0gICAg Ci0gICAgaWYgKGRvY3VtZW50TG9hZGVyLT5pc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkKKyAgICBp ZiAoZG9jdW1lbnRMb2FkZXIgJiYgZG9jdW1lbnRMb2FkZXItPmlzTG9hZGluZ01haW5SZXNvdXJj ZSgpKQogICAgICAgICBkb2N1bWVudExvYWRlci0+Y2FuY2VsTWFpblJlc291cmNlTG9hZChmcmFt ZSgpLT5sb2FkZXIoKS5jYW5jZWxsZWRFcnJvcihtX3BhcmFtZXRlcnMudXJsKSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVn aW5TdHJlYW0ubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBl UGx1Z2luU3RyZWFtLm1tCmluZGV4IDllZWViZWJjNDQ0Y2U3ODEwMWRkZGRmOWEyYjQ4OTA2NTc4 YzBiNjIuLmE0ZmU5MGI2YWNhNTVkOTU4NjA5OWVmMTY0NDNjZjJmYTkzZjk4ZGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5TdHJl YW0ubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBs dWdpblN0cmVhbS5tbQpAQCAtNDc5LDE1ICs0NzksMTEgQEAgdm9pZCBXZWJOZXRzY2FwZVBsdWdp blN0cmVhbTo6Y2FuY2VsTG9hZFdpdGhFcnJvcihOU0Vycm9yICplcnJvcikKIHsKICAgICBpZiAo bV9mcmFtZUxvYWRlcikgewogICAgICAgICBBU1NFUlQoIW1fbG9hZGVyKTsKLSAgICAgICAgCi0g ICAgICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IG1fZnJhbWVMb2FkZXItPmFj dGl2ZURvY3VtZW50TG9hZGVyKCk7Ci0gICAgICAgIEFTU0VSVChkb2N1bWVudExvYWRlcik7Ci0g ICAgICAgIAotICAgICAgICBpZiAoZG9jdW1lbnRMb2FkZXItPmlzTG9hZGluZ01haW5SZXNvdXJj ZSgpKQorICAgICAgICBhdXRvIGRvY3VtZW50TG9hZGVyID0gbV9mcmFtZUxvYWRlci0+YWN0aXZl RG9jdW1lbnRMb2FkZXIoKTsKKyAgICAgICAgaWYgKGRvY3VtZW50TG9hZGVyICYmIGRvY3VtZW50 TG9hZGVyLT5pc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkKICAgICAgICAgICAgIGRvY3VtZW50TG9h ZGVyLT5jYW5jZWxNYWluUmVzb3VyY2VMb2FkKGVycm9yKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KLSAgICAKICAgICBpZiAoIW1fbG9hZGVyLT5pc0RvbmUoKSkKICAgICAgICAgbV9sb2FkZXIt PmNhbmNlbChlcnJvcik7CiB9Cg== 418792 2021-01-29 17:24:59 -0800 2021-01-29 18:13:25 -0800 Patch bug-221167-20210129172458.patch text/plain 16270 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI4NzFjMGQ2NWEwMGI2 OTZjYTM5NzYyOThlYzBhNWNiMjhiYTk1My4uMjVhMTE0NmFjZTFlMWNlMDRmZDlhODNiNzdjOGZk MjZlZWUwZGNiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDIxLTAxLTI5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBDaGVjayBhY3RpdmVEb2N1bWVu dExvYWRlcigpIGZvciBudWxsIGNvbnNpc3RlbnRseSBldmVyeXdoZXJlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjExNjcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdWRpdGVkIGFsbCBhY3RpdmVEb2N1 bWVudExvYWRlcigpIGNhbGxzIHRvIHNlZSBpZiB0aGV5IGNoZWNrCisgICAgICAgIGZvciBudWxs LiBNYW55IHdlcmUgbWlzc2luZyBhIG51bGwgY2hlY2sgYW5kIG9ubHkgYSB2ZXJ5IGZldyBoYWQK KyAgICAgICAgYSBnb29kIHNvbGlkIHJlYXNvbiB0aGV5IGRvbid0IG5lZWQgb25lIChuZXdseS1j cmVhdGVkIGZyYW1lcywgYmFzaWNhbGx5KS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVDYWNoZWRSZXNvdXJjZUxvYWRlcik6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OkRvY3VtZW50KTogVXNlIGNyZWF0ZUNhY2hlZFJl c291cmNlTG9hZGVyLCB3aGljaAorICAgICAgICBhZGRzIGEgbnVsbCBjaGVjayBmb3IgdGhlIGFj dGl2ZSBkb2N1bWVudCBsb2FkZXIuCisKKyAgICAgICAgKiBodG1sL1BsdWdpbkRvY3VtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRlcyk6 IEFkZGVkIGEgbnVsbCBjaGVjayBiZWZvcmUKKyAgICAgICAgY2FsbGluZyBzZXRNYWluUmVzb3Vy Y2VEYXRhQnVmZmVyaW5nUG9saWN5LiBBbHNvIHR3ZWFrZWQgc3R5bGUgYSBiaXQuCisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5Eb2N1bWVudDo6Y2FuY2VsTWFudWFsUGx1Z2luTG9hZCk6IEFkZGVk IGEgbnVsbCBjaGVjaworICAgICAgICBiZWZvcmUgY2FsbGluZyBjYW5jZWxNYWluUmVzb3VyY2VM b2FkLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjppbml0aWFsUmVxdWVzdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6b3JpZ2luYWxSZXF1ZXN0IGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDogRGVsZXRlZCB0aGUgaW5pdGlhbFJlcXVl c3QgYW5kIG9yaWdpbmFsUmVxdWVzdAorICAgICAgICBmdW5jdGlvbnMuIEJvdGggd2VyZSB1c2lu ZyBhY3RpdmVEb2N1bWVudExvYWRlcigpIHdpdGhvdXQgbnVsbCBjaGVja3MsCisgICAgICAgIGJ1 dCBib3RoIGFsc28gd2VyZSB1bnVzZWQuCisKKyAgICAgICAgKiBsb2FkZXIvUG9saWN5Q2hlY2tl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6UG9saWN5Q2hlY2tlcjo6Y2hl Y2tOYXZpZ2F0aW9uUG9saWN5KToKKyAgICAgICAgQWRkZWQgbnVsbCBjaGVjayBiZWZvcmUgY2Fs bGluZyBjb250aW51ZUFmdGVyU3Vic3RpdHV0ZURhdGFSZXF1ZXN0LgorCisgICAgICAgICogbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVy OjpzdGFydCk6IEFkZGVkIG51bGwgY2hlY2sgYmVmb3JlIGNhbGxpbmcKKyAgICAgICAgc2NoZWR1 bGVBcmNoaXZlTG9hZCBhbmQgbnVsbCBjaGVjayBiZWZvcmUgY2FsbGxpbmcKKyAgICAgICAgYXBw bGljYXRpb25DYWNoZUhvc3QoKS5tYXliZUxvYWRSZXNvdXJjZSgpLgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VMb2FkZXI6OndpbGxTd2l0Y2hUb1N1YnN0aXR1dGVSZXNvdXJjZSk6IEFkZGVk CisgICAgICAgIG51bGwgY2hlY2sgaW5zaWRlIGFuIGFzc2VydGlvbi4KKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3RJbnRlcm5hbCk6IEFkZGVkIG51bGwg Y2hlY2sKKyAgICAgICAgYmVmb3JlIGNhbGxpbmcgcHJldmlld0NvbnZlcnRlciBhbmQgaXNDb21t aXR0ZWQuCisKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3Vw LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2Fj aGUpOiBBZGRlZCBudWxsIGNoZWNrIGJlZm9yZQorICAgICAgICBjYWxsaW5nIHJlcXVlc3QuCisK KyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5k b3c6OnByaW50KTogQWRkZWQgbnVsbCBjaGVjayBiZWZvcmUgY2FsbGluZyBpc0xvYWRpbmcuCisg ICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmZpbmlzaGVkTG9hZGluZyk6IEFkZGVkIG51bGwg Y2hlY2sgYmVmb3JlIGNhbGxpbmcKKyAgICAgICAgbWFpbkRvY3VtZW50RXJyb3IuCisKIDIwMjEt MDEtMjggIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF1b TVNFXSBBIHZpZGVvIGVsZW1lbnQgZG9lcyBub3QgZmlyZSDigJxjYW5wbGF5dGhyb3VnaOKAnSBl dmVudCBpZiBTb3VyY2VCdWZmZXIuYWJvcnQoKSBpcyBjYWxsZWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMGQ2NGFi ZjZhNDk0NjA3NmFlYjY2NGI1MjZhNTNhNjMxOTNlNDA1Ni4uZDVmNjBlYzAxYjVmYjgwYjkyOTZh MDhkNThmNTNhZTY0NGI1Njg4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMS0y OSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hlY2sgYWN0aXZl RG9jdW1lbnRMb2FkZXIoKSBmb3IgbnVsbCBjb25zaXN0ZW50bHkgZXZlcnl3aGVyZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMTY3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OmNhbmNl bE1hbnVhbFN0cmVhbUxvYWQpOiBBZGRlZCBudWxsIGNoZWNrIGJlZm9yZSBjYWxsaW5nCisgICAg ICAgIGlzTG9hZGluZ01haW5SZXNvdXJjZS4KKwogMjAyMS0wMS0yOCAgSmlld2VuIFRhbiAgPGpp ZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0gQWRvcHQgbmV3IFNQSSB0 byBzaG93IG5vIGNyZWRlbnRpYWxzIGVycm9yIGZvciB0aGUgcGxhdGZvcm0gYXV0aGVudGljYXRv cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IDVmM2YxMWU3Y2QwZTJmMzA2NGQyYmE1 Y2JmODE0ODliNGIwYTNiNGYuLjA3YTM2MjBhN2U1ODEzZDI0ZTE5NDY5ZTMzZGIzYThmZDkzOTRl YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0w MS0yOSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hlY2sgYWN0 aXZlRG9jdW1lbnRMb2FkZXIoKSBmb3IgbnVsbCBjb25zaXN0ZW50bHkgZXZlcnl3aGVyZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMTY3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbHVnaW5zL1dl Yk5ldHNjYXBlUGx1Z2luU3RyZWFtLm1tOgorICAgICAgICAoV2ViTmV0c2NhcGVQbHVnaW5TdHJl YW06OmNhbmNlbExvYWRXaXRoRXJyb3IpOiBBZGRlZCBudWxsIGNoZWNrIGJlZm9yZSBjYWxsaW5n CisgICAgICAgIGlzTG9hZGluZ01haW5SZXNvdXJjZS4KKwogMjAyMS0wMS0yNiAgQkogQnVyZyAg PGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjc2NDEpOiBXZWJLaXRE ZXZlbG9wZXJFeHRyYXMgcHJlZmVyZW5jZSBoYXMgbm8gZWZmZWN0IGZvciBXZWJLaXRMZWdhY3kg Y2xpZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMjQ1OGVkODZmNDkwMzBkODhlM2Q2 NjdjODU5YWZlODcxNzllODM5ZS4uMjE0M2Y3NTFiOTFhYTFiMDdjMDIyYTQxOTdlY2Y0M2VkNjg3 YjViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC01OTAsMTMgKzU5MCwyMiBAQCBzdGF0 aWMgaW5saW5lIGludCBjdXJyZW50T3JpZW50YXRpb24oRnJhbWUqIGZyYW1lKQogICAgIHJldHVy biAwOwogfQogCitzdGF0aWMgUmVmPENhY2hlZFJlc291cmNlTG9hZGVyPiBjcmVhdGVDYWNoZWRS ZXNvdXJjZUxvYWRlcihGcmFtZSogZnJhbWUpCit7CisgICAgaWYgKGZyYW1lKSB7CisgICAgICAg IGlmIChhdXRvIGxvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigp KQorICAgICAgICAgICAgcmV0dXJuIGxvYWRlci0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKTsKKyAg ICB9CisgICAgcmV0dXJuIENhY2hlZFJlc291cmNlTG9hZGVyOjpjcmVhdGUobnVsbHB0cik7Cit9 CisKIERvY3VtZW50OjpEb2N1bWVudChGcmFtZSogZnJhbWUsIGNvbnN0IFNldHRpbmdzJiBzZXR0 aW5ncywgY29uc3QgVVJMJiB1cmwsIERvY3VtZW50Q2xhc3NGbGFncyBkb2N1bWVudENsYXNzZXMs IHVuc2lnbmVkIGNvbnN0cnVjdGlvbkZsYWdzKQogICAgIDogQ29udGFpbmVyTm9kZSgqdGhpcywg Q3JlYXRlRG9jdW1lbnQpCiAgICAgLCBUcmVlU2NvcGUoKnRoaXMpCiAgICAgLCBGcmFtZURlc3Ry dWN0aW9uT2JzZXJ2ZXIoZnJhbWUpCiAgICAgLCBtX3NldHRpbmdzKHNldHRpbmdzKQogICAgICwg bV9xdWlya3MobWFrZVVuaXF1ZVJlZjxRdWlya3M+KCp0aGlzKSkKLSAgICAsIG1fY2FjaGVkUmVz b3VyY2VMb2FkZXIobV9mcmFtZSA/IFJlZjxDYWNoZWRSZXNvdXJjZUxvYWRlcj4obV9mcmFtZS0+ bG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKSkg OiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKG51bGxwdHIpKQorICAgICwgbV9jYWNoZWRS ZXNvdXJjZUxvYWRlcihjcmVhdGVDYWNoZWRSZXNvdXJjZUxvYWRlcihmcmFtZSkpCiAgICAgLCBt X2RvbVRyZWVWZXJzaW9uKCsrc19nbG9iYWxUcmVlVmVyc2lvbikKICAgICAsIG1fc3R5bGVTY29w ZShtYWtlVW5pcXVlPFN0eWxlOjpTY29wZT4oKnRoaXMpKQogICAgICwgbV9leHRlbnNpb25TdHls ZVNoZWV0cyhtYWtlVW5pcXVlPEV4dGVuc2lvblN0eWxlU2hlZXRzPigqdGhpcykpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1BsdWdpbkRvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCmluZGV4IGYxZWZjYWQ1MTFiYjhkMjliYWJkOGQz YjJjYzY1MjBjMWM2ZjIwNTUuLmQ1ODgyZmIyODU1ZDk3OGQzNDE2MWI0NWNhZGZkMzEwYzYwMjBm YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCkBAIC0xMzAsMTMgKzEz MCwxNSBAQCB2b2lkIFBsdWdpbkRvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRlcyhEb2N1bWVudFdy aXRlciYsIGNvbnN0IGNoYXIqLCBzaXplX3QpCiAgICAgLy8gY2FuIHN5bmNocm9ub3VzbHkgcmVk aXJlY3QgZGF0YSB0byB0aGUgcGx1Z2luLgogICAgIGZyYW1lLT52aWV3KCktPmZsdXNoQW55UGVu ZGluZ1Bvc3RMYXlvdXRUYXNrcygpOwogCi0gICAgaWYgKFJlbmRlcldpZGdldCogcmVuZGVyZXIg PSBtX2VtYmVkRWxlbWVudC0+cmVuZGVyV2lkZ2V0KCkpIHsKLSAgICAgICAgaWYgKFJlZlB0cjxX aWRnZXQ+IHdpZGdldCA9IHJlbmRlcmVyLT53aWRnZXQoKSkgeworICAgIGlmIChhdXRvIHJlbmRl cmVyID0gbV9lbWJlZEVsZW1lbnQtPnJlbmRlcldpZGdldCgpKSB7CisgICAgICAgIGlmIChhdXRv IHdpZGdldCA9IG1ha2VSZWZQdHIocmVuZGVyZXItPndpZGdldCgpKSkgewogICAgICAgICAgICAg ZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLnJlZGlyZWN0RGF0YVRvUGx1Z2luKCp3aWRnZXQpOwor CiAgICAgICAgICAgICAvLyBJbiBhIHBsdWdpbiBkb2N1bWVudCwgdGhlIG1haW4gcmVzb3VyY2Ug aXMgdGhlIHBsdWdpbi4gSWYgd2UgaGF2ZSBhIG51bGwgd2lkZ2V0LCB0aGF0IG1lYW5zCiAgICAg ICAgICAgICAvLyB0aGUgbG9hZGluZyBvZiB0aGUgcGx1Z2luIHdhcyBjYW5jZWxsZWQsIHdoaWNo IGdpdmVzIHVzIGEgbnVsbCBtYWluUmVzb3VyY2VMb2FkZXIoKSwgc28gd2UKICAgICAgICAgICAg IC8vIG5lZWQgdG8gaGF2ZSB0aGlzIGNhbGwgaW4gYSBudWxsIGNoZWNrIG9mIHRoZSB3aWRnZXQg b3Igb2YgbWFpblJlc291cmNlTG9hZGVyKCkuCi0gICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCku YWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+c2V0TWFpblJlc291cmNlRGF0YUJ1ZmZlcmluZ1BvbGlj eShEYXRhQnVmZmVyaW5nUG9saWN5OjpEb05vdEJ1ZmZlckRhdGEpOworICAgICAgICAgICAgaWYg KGF1dG8gbG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLmFjdGl2ZURvY3VtZW50TG9hZGVyKCkpCisg ICAgICAgICAgICAgICAgbG9hZGVyLT5zZXRNYWluUmVzb3VyY2VEYXRhQnVmZmVyaW5nUG9saWN5 KERhdGFCdWZmZXJpbmdQb2xpY3k6OkRvTm90QnVmZmVyRGF0YSk7CiAgICAgICAgIH0KICAgICB9 CiB9CkBAIC0xODIsOCArMTg0LDggQEAgdm9pZCBQbHVnaW5Eb2N1bWVudDo6Y2FuY2VsTWFudWFs UGx1Z2luTG9hZCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8mIGZyYW1lTG9hZGVyID0g ZnJhbWUoKS0+bG9hZGVyKCk7Ci0gICAgYXV0byYgZG9jdW1lbnRMb2FkZXIgPSAqZnJhbWVMb2Fk ZXIuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKTsKLSAgICBkb2N1bWVudExvYWRlci5jYW5jZWxNYWlu UmVzb3VyY2VMb2FkKGZyYW1lTG9hZGVyLmNhbmNlbGxlZEVycm9yKGRvY3VtZW50TG9hZGVyLnJl cXVlc3QoKSkpOworICAgIGlmIChhdXRvIGRvY3VtZW50TG9hZGVyID0gZnJhbWVMb2FkZXIuYWN0 aXZlRG9jdW1lbnRMb2FkZXIoKSkKKyAgICAgICAgZG9jdW1lbnRMb2FkZXItPmNhbmNlbE1haW5S ZXNvdXJjZUxvYWQoZnJhbWVMb2FkZXIuY2FuY2VsbGVkRXJyb3IoZG9jdW1lbnRMb2FkZXItPnJl cXVlc3QoKSkpOwogICAgIG1fc2hvdWxkTG9hZFBsdWdpbk1hbnVhbGx5ID0gZmFsc2U7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDM5NTJjOTMzMjc4ZTE2MzY5 NDA5MzkwYjFkYjgwZGVhOTQ5NWQ2MjQuLjNiZmI5YTY4MWQ1NmIyYTUyNDM0NmNjNTRiN2ViYmMx NmIwZGIyNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTYzOSwx MSArMTYzOSw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnJlcG9ydExvY2FsTG9hZEZhaWxlZChGcmFt ZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgdXJsKQogICAgIGZyYW1lLT5kb2N1bWVudCgpLT5hZGRD b25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJv ciwgIk5vdCBhbGxvd2VkIHRvIGxvYWQgbG9jYWwgcmVzb3VyY2U6ICIgKyB1cmwpOwogfQogCi1j b25zdCBSZXNvdXJjZVJlcXVlc3QmIEZyYW1lTG9hZGVyOjppbml0aWFsUmVxdWVzdCgpIGNvbnN0 Ci17Ci0gICAgcmV0dXJuIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPm9yaWdpbmFsUmVxdWVzdCgp OwotfQotCiBib29sIEZyYW1lTG9hZGVyOjp3aWxsTG9hZE1lZGlhRWxlbWVudFVSTChVUkwmIHVy bCwgTm9kZSYgaW5pdGlhdG9yTm9kZSkKIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpAQCAt MzExOCwxMSArMzExMyw2IEBAIHVuc2lnbmVkIGxvbmcgRnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJj ZVN5bmNocm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1CiAgICAgcmV0dXJuIGlk ZW50aWZpZXI7CiB9CiAKLWNvbnN0IFJlc291cmNlUmVxdWVzdCYgRnJhbWVMb2FkZXI6Om9yaWdp bmFsUmVxdWVzdCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGFjdGl2ZURvY3VtZW50TG9hZGVyKCkt Pm9yaWdpbmFsUmVxdWVzdENvcHkoKTsKLX0KLQogdm9pZCBGcmFtZUxvYWRlcjo6cmVjZWl2ZWRN YWluUmVzb3VyY2VFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKICAgICAvLyBS ZXRhaW4gYmVjYXVzZSB0aGUgc3RvcCBtYXkgcmVsZWFzZSB0aGUgbGFzdCByZWZlcmVuY2UgdG8g aXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IGE5NGEwNTljMWJmMDk1NGNk MDU2ZWM3NGI2Nzc2OGJjOGU3NmJhMDkuLmFiNjhhNTRiN2JjYjA5NmM2YTMzYWJlYjA0ZTQ3ZDBi NjA3NGM3ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0xNzQsOCArMTc0 LDYgQEAgcHVibGljOgogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgUmV0YWluUHRyPENG RGljdGlvbmFyeVJlZj4gY29ubmVjdGlvblByb3BlcnRpZXMoUmVzb3VyY2VMb2FkZXIqKTsKICNl bmRpZgotICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0KCkgY29uc3Q7 Ci0gICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBpbml0aWFsUmVxdWVzdCgpIGNvbnN0OwogICAg IHZvaWQgcmVjZWl2ZWRNYWluUmVzb3VyY2VFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJik7CiAK ICAgICBib29sIHdpbGxMb2FkTWVkaWFFbGVtZW50VVJMKFVSTCYsIE5vZGUmKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcAppbmRleCAyNzYxNDhhNjNmMzZjYzQ2YWUwY2Yy YmI1MzVjMzNmMmFhMDdlMzBiLi4yMmIwNTg4YTYxYTg0ZDczY2QyMGJlYTI3NjRjZmNhZTQ3Mzdi YTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5Q2hlY2tlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCkBAIC0xNTAsNyAr MTUwLDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6UG9saWN5Q2hlY2tlcjo6Y2hlY2tOYXZpZ2F0aW9u UG9saWN5KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QKICAgICBpZiAoc3Vic3RpdHV0ZURhdGEu aXNWYWxpZCgpICYmICFzdWJzdGl0dXRlRGF0YS5mYWlsaW5nVVJMKCkuaXNFbXB0eSgpKSB7CiAg ICAgICAgIGJvb2wgc2hvdWxkQ29udGludWUgPSB0cnVlOwogI2lmIEVOQUJMRShDT05URU5UX0ZJ TFRFUklORykKLSAgICAgICAgc2hvdWxkQ29udGludWUgPSBDb250ZW50RmlsdGVyOjpjb250aW51 ZUFmdGVyU3Vic3RpdHV0ZURhdGFSZXF1ZXN0KCptX2ZyYW1lLmxvYWRlcigpLmFjdGl2ZURvY3Vt ZW50TG9hZGVyKCksIHN1YnN0aXR1dGVEYXRhKTsKKyAgICAgICAgaWYgKGF1dG8gbG9hZGVyID0g bV9mcmFtZS5sb2FkZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigpKQorICAgICAgICAgICAgc2hv dWxkQ29udGludWUgPSBDb250ZW50RmlsdGVyOjpjb250aW51ZUFmdGVyU3Vic3RpdHV0ZURhdGFS ZXF1ZXN0KCpsb2FkZXIsIHN1YnN0aXR1dGVEYXRhKTsKICNlbmRpZgogICAgICAgICBpZiAoaXNC YWNrRm9yd2FyZExvYWRUeXBlKG1fbG9hZFR5cGUpKQogICAgICAgICAgICAgbV9sb2FkVHlwZSA9 IEZyYW1lTG9hZFR5cGU6OlJlbG9hZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2Fk ZXIuY3BwCmluZGV4IDgwZGQxNTFkMmU5MThjODcyNmE5ZmFlNjgwZmRmNmNjZjUzY2M4MzUuLjlk NWFjNDg1Y2E4NWI1NDc3ZDUzNmE4NTk0NzRiMGI3ZjUzNTQxNzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcApAQCAtMTk5LDExICsxOTksMTEgQEAgdm9pZCBSZXNv dXJjZUxvYWRlcjo6c3RhcnQoKQogICAgIEFTU0VSVChmcmFtZUxvYWRlcigpKTsKIAogI2lmIEVO QUJMRShXRUJfQVJDSElWRSkgfHwgRU5BQkxFKE1IVE1MKQotICAgIGlmIChtX2RvY3VtZW50TG9h ZGVyLT5zY2hlZHVsZUFyY2hpdmVMb2FkKCp0aGlzLCBtX3JlcXVlc3QpKQorICAgIGlmIChtX2Rv Y3VtZW50TG9hZGVyICYmIG1fZG9jdW1lbnRMb2FkZXItPnNjaGVkdWxlQXJjaGl2ZUxvYWQoKnRo aXMsIG1fcmVxdWVzdCkpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgogCi0gICAgaWYgKG1fZG9j dW1lbnRMb2FkZXItPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5YmVMb2FkUmVzb3VyY2UoKnRo aXMsIG1fcmVxdWVzdCwgbV9yZXF1ZXN0LnVybCgpKSkKKyAgICBpZiAobV9kb2N1bWVudExvYWRl ciAmJiBtX2RvY3VtZW50TG9hZGVyLT5hcHBsaWNhdGlvbkNhY2hlSG9zdCgpLm1heWJlTG9hZFJl c291cmNlKCp0aGlzLCBtX3JlcXVlc3QsIG1fcmVxdWVzdC51cmwoKSkpCiAgICAgICAgIHJldHVy bjsKIAogICAgIGlmIChtX2RlZmVyc0xvYWRpbmcpIHsKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lk IFJlc291cmNlTG9hZGVyOjpzZXREYXRhQnVmZmVyaW5nUG9saWN5KERhdGFCdWZmZXJpbmdQb2xp Y3kgZGF0YUJ1ZmZlcmluZ1BvbAogCiB2b2lkIFJlc291cmNlTG9hZGVyOjp3aWxsU3dpdGNoVG9T dWJzdGl0dXRlUmVzb3VyY2UoKQogewotICAgIEFTU0VSVCghbV9kb2N1bWVudExvYWRlci0+aXNT dWJzdGl0dXRlTG9hZFBlbmRpbmcodGhpcykpOworICAgIEFTU0VSVChtX2RvY3VtZW50TG9hZGVy ICYmICFtX2RvY3VtZW50TG9hZGVyLT5pc1N1YnN0aXR1dGVMb2FkUGVuZGluZyh0aGlzKSk7CiAg ICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxvYWRlclN0cmF0ZWd5KCktPnJlbW92ZSh0aGlzKTsK ICAgICBpZiAobV9oYW5kbGUpCiAgICAgICAgIG1faGFuZGxlLT5jYW5jZWwoKTsKQEAgLTM5NCw4 ICszOTQsMTAgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwo UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgY29uc3QgUmUKICAgICAgICAgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjp3aWxsU2VuZFJlcXVlc3QobV9mcmFtZS5nZXQoKSwgbV9pZGVudGlmaWVy LCBtX2ZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCByZXF1ZXN0LCByZWRpcmVjdFJl c3BvbnNlKTsKIAogI2lmIFVTRShRVUlDS19MT09LKQotICAgIGlmIChhdXRvIHByZXZpZXdDb252 ZXJ0ZXIgPSBtX2RvY3VtZW50TG9hZGVyLT5wcmV2aWV3Q29udmVydGVyKCkpCi0gICAgICAgIHJl cXVlc3QgPSBwcmV2aWV3Q29udmVydGVyLT5zYWZlUmVxdWVzdChyZXF1ZXN0KTsKKyAgICBpZiAo bV9kb2N1bWVudExvYWRlcikgeworICAgICAgICBpZiAoYXV0byBwcmV2aWV3Q29udmVydGVyID0g bV9kb2N1bWVudExvYWRlci0+cHJldmlld0NvbnZlcnRlcigpKQorICAgICAgICAgICAgcmVxdWVz dCA9IHByZXZpZXdDb252ZXJ0ZXItPnNhZmVSZXF1ZXN0KHJlcXVlc3QpOworICAgIH0KICNlbmRp ZgogCiAgICAgYm9vbCBpc1JlZGlyZWN0ID0gIXJlZGlyZWN0UmVzcG9uc2UuaXNOdWxsKCk7CkBA IC00MDksNyArNDExLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50 ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgY29uc3QgUmUKIAogICAgIGlmIChpc1Jl ZGlyZWN0KSB7CiAgICAgICAgIGF1dG8mIHJlZGlyZWN0VVJMID0gcmVxdWVzdC51cmwoKTsKLSAg ICAgICAgaWYgKCFtX2RvY3VtZW50TG9hZGVyLT5pc0NvbW1pdHRlZCgpKQorICAgICAgICBpZiAo bV9kb2N1bWVudExvYWRlciAmJiAhbV9kb2N1bWVudExvYWRlci0+aXNDb21taXR0ZWQoKSkKICAg ICAgICAgICAgIGZyYW1lTG9hZGVyKCktPmNsaWVudCgpLmRpc3BhdGNoRGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCk7CiAKICAgICAgICAgaWYgKHJlZGlyZWN0VVJM LnByb3RvY29sSXNEYXRhKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9h cHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKaW5kZXggNjVlZmViMjQwZGFjYTI2 YjQ0YjhkYjNkMDVlZmI4NDBlZDMyZGY1Ni4uNTNkZjhjOWIxOGI5N2ZjOTA2MzM2OGExZWUxMDQx MTFjZTliMjk1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0Fw cGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNh Y2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKQEAgLTE4MCw4ICsxODAsMTAgQEAgdm9pZCBB cHBsaWNhdGlvbkNhY2hlR3JvdXA6OnNlbGVjdENhY2hlKEZyYW1lJiBmcmFtZSwgY29uc3QgVVJM JiBwYXNzZWRNYW5pZmVzdFUKICAgICB9CiAKICAgICAvLyBUaGUgcmVzb3VyY2Ugd2FzIGxvYWRl ZCBmcm9tIHRoZSBuZXR3b3JrLCBjaGVjayBpZiBpdCBpcyBhIEhUVFAvSFRUUFMgR0VULiAgICAK LSAgICBhdXRvJiByZXF1ZXN0ID0gZnJhbWUubG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIo KS0+cmVxdWVzdCgpOwotCisgICAgYXV0byBsb2FkZXIgPSBmcmFtZS5sb2FkZXIoKS5hY3RpdmVE b2N1bWVudExvYWRlcigpOworICAgIGlmICghbG9hZGVyKQorICAgICAgICByZXR1cm47CisgICAg YXV0byYgcmVxdWVzdCA9IGxvYWRlci0+cmVxdWVzdCgpOwogICAgIGlmICghQXBwbGljYXRpb25D YWNoZTo6cmVxdWVzdElzSFRUUE9ySFRUUFNHZXQocmVxdWVzdCkpCiAgICAgICAgIHJldHVybjsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDczNjg0YjRlMmVhOTc4NTE4MTk2Njdi ZTY4NDljNTkzNjc0OTJkYTEuLjYzZGI2MjdhYWI1YzcwY2M4ODdjYzY4ZjcwZmU5YjkwMjZiNTcx MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTEwNzMsNyArMTA3Myw3IEBAIHZv aWQgRE9NV2luZG93OjpwcmludCgpCiAgICAgaWYgKHBhZ2UtPmlzQ29udHJvbGxlZEJ5QXV0b21h dGlvbigpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoZnJhbWUtPmxvYWRlcigpLmFjdGl2 ZURvY3VtZW50TG9hZGVyKCktPmlzTG9hZGluZygpKSB7CisgICAgaWYgKGF1dG8gbG9hZGVyID0g ZnJhbWUtPmxvYWRlcigpLmFjdGl2ZURvY3VtZW50TG9hZGVyKCk7IGxvYWRlciAmJiBsb2FkZXIt PmlzTG9hZGluZygpKSB7CiAgICAgICAgIG1fc2hvdWxkUHJpbnRXaGVuRmluaXNoZWRMb2FkaW5n ID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIzMjYsNyArMjMyNiw3IEBAIHZv aWQgRE9NV2luZG93OjpmaW5pc2hlZExvYWRpbmcoKQogewogICAgIGlmIChtX3Nob3VsZFByaW50 V2hlbkZpbmlzaGVkTG9hZGluZykgewogICAgICAgICBtX3Nob3VsZFByaW50V2hlbkZpbmlzaGVk TG9hZGluZyA9IGZhbHNlOwotICAgICAgICBpZiAoZnJhbWUoKS0+bG9hZGVyKCkuYWN0aXZlRG9j dW1lbnRMb2FkZXIoKS0+bWFpbkRvY3VtZW50RXJyb3IoKS5pc051bGwoKSkKKyAgICAgICAgaWYg KGF1dG8gbG9hZGVyID0gZnJhbWUoKS0+bG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKTsg IWxvYWRlciB8fCBsb2FkZXItPm1haW5Eb2N1bWVudEVycm9yKCkuaXNOdWxsKCkpCiAgICAgICAg ICAgICBwcmludCgpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5jcHAKaW5kZXggY2NkZGRmNWI5OTVlMzFjMWIyNWFkNGRjN2ZjOGNm ZmMzMDhhNWNlYS4uNmE1ZmMzODRmZGVlNmY3MjgwNGExYzJhZTU0MWRkZGEyYzRiYjJlMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAg LTEzOTksOCArMTM5OSw3IEBAIHZvaWQgUGx1Z2luVmlldzo6Y2FuY2VsTWFudWFsU3RyZWFtTG9h ZCgpCiAKICAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFtZSgpLT5sb2Fk ZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigpOwogICAgIEFTU0VSVChkb2N1bWVudExvYWRlcik7 Ci0gICAgCi0gICAgaWYgKGRvY3VtZW50TG9hZGVyLT5pc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkK KyAgICBpZiAoZG9jdW1lbnRMb2FkZXIgJiYgZG9jdW1lbnRMb2FkZXItPmlzTG9hZGluZ01haW5S ZXNvdXJjZSgpKQogICAgICAgICBkb2N1bWVudExvYWRlci0+Y2FuY2VsTWFpblJlc291cmNlTG9h ZChmcmFtZSgpLT5sb2FkZXIoKS5jYW5jZWxsZWRFcnJvcihtX3BhcmFtZXRlcnMudXJsKSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1BsdWdpbnMvV2ViTmV0c2Nh cGVQbHVnaW5TdHJlYW0ubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9QbHVnaW5zL1dlYk5l dHNjYXBlUGx1Z2luU3RyZWFtLm1tCmluZGV4IDllZWViZWJjNDQ0Y2U3ODEwMWRkZGRmOWEyYjQ4 OTA2NTc4YzBiNjIuLmE0ZmU5MGI2YWNhNTVkOTU4NjA5OWVmMTY0NDNjZjJmYTkzZjk4ZGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVn aW5TdHJlYW0ubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvUGx1Z2lucy9XZWJOZXRz Y2FwZVBsdWdpblN0cmVhbS5tbQpAQCAtNDc5LDE1ICs0NzksMTEgQEAgdm9pZCBXZWJOZXRzY2Fw ZVBsdWdpblN0cmVhbTo6Y2FuY2VsTG9hZFdpdGhFcnJvcihOU0Vycm9yICplcnJvcikKIHsKICAg ICBpZiAobV9mcmFtZUxvYWRlcikgewogICAgICAgICBBU1NFUlQoIW1fbG9hZGVyKTsKLSAgICAg ICAgCi0gICAgICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IG1fZnJhbWVMb2Fk ZXItPmFjdGl2ZURvY3VtZW50TG9hZGVyKCk7Ci0gICAgICAgIEFTU0VSVChkb2N1bWVudExvYWRl cik7Ci0gICAgICAgIAotICAgICAgICBpZiAoZG9jdW1lbnRMb2FkZXItPmlzTG9hZGluZ01haW5S ZXNvdXJjZSgpKQorICAgICAgICBhdXRvIGRvY3VtZW50TG9hZGVyID0gbV9mcmFtZUxvYWRlci0+ YWN0aXZlRG9jdW1lbnRMb2FkZXIoKTsKKyAgICAgICAgaWYgKGRvY3VtZW50TG9hZGVyICYmIGRv Y3VtZW50TG9hZGVyLT5pc0xvYWRpbmdNYWluUmVzb3VyY2UoKSkKICAgICAgICAgICAgIGRvY3Vt ZW50TG9hZGVyLT5jYW5jZWxNYWluUmVzb3VyY2VMb2FkKGVycm9yKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KLSAgICAKICAgICBpZiAoIW1fbG9hZGVyLT5pc0RvbmUoKSkKICAgICAgICAgbV9s b2FkZXItPmNhbmNlbChlcnJvcik7CiB9Cg==