195957 2019-03-19 11:22:17 -0700 Adopt RegistrableDomain in the Storage Access API prompt code paths 2019-03-20 09:41:23 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 195866 1 bfulgham bfulgham bfulgham cdumez commit-queue webkit-bug-importer wilander oldest_to_newest 1518387 0 bfulgham 2019-03-19 11:22:17 -0700 While making the code changes in Bug 195866 we noticed that strings were being used to pass the origins for the API calls. We should adopt the RegistrableDomain class to improve type safety and avoid introducing bugs in the future. 1518735 1 webkit-bug-importer 2019-03-19 20:30:12 -0700 <rdar://problem/49048028> 1518736 2 365298 bfulgham 2019-03-19 20:35:30 -0700 Created attachment 365298 Patch 1518894 3 365348 bfulgham 2019-03-20 08:57:47 -0700 Created attachment 365348 Patch 1518910 4 365348 bfulgham 2019-03-20 09:17:19 -0700 Comment on attachment 365348 Patch Thanks for reviewing! 1518935 5 365348 commit-queue 2019-03-20 09:41:21 -0700 Comment on attachment 365348 Patch Clearing flags on attachment: 365348 Committed r243210: <https://trac.webkit.org/changeset/243210> 1518936 6 commit-queue 2019-03-20 09:41:23 -0700 All reviewed patches have been landed. Closing bug. 365298 2019-03-19 20:35:30 -0700 2019-03-20 08:57:46 -0700 Patch bug-195957-20190319203529.patch text/plain 16815 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQxYzk1YWQ1MmE1OTEwYzk5 NmQwN2EzYjYyMzJjNjlmMjRiYjg0ZDIuLjgzNzA3MGExYzY2NWQwOGI0YzU5Zjg5ZjhiOWJiNzlm M2FiZjJhMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMTkgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRvcHQgUmVnaXN0cmFibGVE b21haW4gaW4gdGhlIFN0b3JhZ2UgQWNjZXNzIEFQSSBwcm9tcHQgY29kZSBwYXRocworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1OTU3CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80OTA0ODAyOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGlsZSBtYWtpbmcgdGhlIGNvZGUgY2hhbmdlcyBpbiBCdWcg MTk1ODY2IHdlIG5vdGljZWQgdGhhdCBzdHJpbmdzIHdlcmUgYmVpbmcKKyAgICAgICAgdXNlZCB0 byBwYXNzIHRoZSBvcmlnaW5zIGZvciB0aGUgQVBJIGNhbGxzLiBXZSBzaG91bGQgYWRvcHQgdGhl IFJlZ2lzdHJhYmxlRG9tYWluCisgICAgICAgIGNsYXNzIHRvIGltcHJvdmUgdHlwZSBzYWZldHkg YW5kIGF2b2lkIGludHJvZHVjaW5nIGJ1Z3MgaW4gdGhlIGZ1dHVyZS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6VUlDbGllbnQ6OnJlcXVl c3RTdG9yYWdlQWNjZXNzQ29uZmlybSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdlVUlDbGllbnQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1VJRGVs ZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OlVJRGVsZWdhdGU6OlVJQ2xpZW50OjpyZXF1ZXN0 U3RvcmFnZUFjY2Vzc0NvbmZpcm0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XS1N0b3Jh Z2VBY2Nlc3NBbGVydC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XS1N0b3JhZ2VBY2Nl c3NBbGVydC5tbToKKyAgICAgICAgKFdlYktpdDo6cHJlc2VudFN0b3JhZ2VBY2Nlc3NBbGVydCk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKToKKwogMjAxOS0wMy0x OSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgZGVm YXVsdCBwcm9tcHQgaW1wbGVtZW50YXRpb24gZm9yIHRoZSBTdG9yYWdlIEFjY2VzcyBBUEkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElVSUNsaWVudC5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmgKaW5kZXggYzIxMjFlZjhhZTEz MTBiYTRiOGZlNWViYmFiMDhkNWFmYTgwMzYyYy4uZDlkZDBkYjQ2NjM3NzIyYjYwMmIyMGRkZGY2 NzM4MTM1ZjY0NmY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SVVJQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50 LmgKQEAgLTM5LDYgKzM5LDcgQEAgT0JKQ19DTEFTUyBVSVZpZXdDb250cm9sbGVyOwogI2VuZGlm CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIFJlZ2lzdHJhYmxlRG9tYWluOwogY2xhc3Mg UmVzb3VyY2VSZXF1ZXN0Owogc3RydWN0IEZvbnRBdHRyaWJ1dGVzOwogc3RydWN0IFNlY3VyaXR5 T3JpZ2luRGF0YTsKQEAgLTEzMiw3ICsxMzMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KFdlYktpdDo6V2ViUGFn ZVByb3h5JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5JiwgU2VjdXJpdHlPcmlnaW4mLCBTZWN1cml0 eU9yaWdpbiYsIFdlYktpdDo6VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94eSYgcmVxdWVz dCkgeyByZXF1ZXN0LmRlbnkoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBjaGVja1VzZXJNZWRpYVBl cm1pc3Npb25Gb3JPcmlnaW4oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OldlYkZyYW1l UHJveHkmLCBTZWN1cml0eU9yaWdpbiYsIFNlY3VyaXR5T3JpZ2luJiwgV2ViS2l0OjpVc2VyTWVk aWFQZXJtaXNzaW9uQ2hlY2tQcm94eSYgcmVxdWVzdCkgeyByZXF1ZXN0LmRlbnkoKTsgfQogICAg IHZpcnR1YWwgdm9pZCBkZWNpZGVQb2xpY3lGb3JOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVxdWVz dChXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFNlY3VyaXR5T3JpZ2luJiwgRnVuY3Rpb248dm9pZChi b29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgeyBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSk7IH0K LSAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKFdlYktpdDo6V2Vi UGFnZVByb3h5JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV1RGOjpTdHJpbmcmIHJl cXVlc3RpbmdEb21haW4sIGNvbnN0IFdURjo6U3RyaW5nJiBjdXJyZW50RG9tYWluLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSB7IGNvbXBsZXRpb25I YW5kbGVyKHRydWUpOyB9CisgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RTdG9yYWdlQWNjZXNzQ29u ZmlybShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViRnJhbWVQcm94eSosIGNvbnN0 IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXF1ZXN0aW5nRG9tYWluLCBjb25zdCBXZWJD b3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgY3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgeyBjb21wbGV0aW9uSGFuZGxlcih0cnVl KTsgfQogCiAgICAgLy8gUHJpbnRpbmcuCiAgICAgdmlydHVhbCBmbG9hdCBoZWFkZXJIZWlnaHQo V2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkmKSB7IHJldHVybiAw OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCBkOWNiM2M2 ZmI1NjUzNGM0OGY2ZjQ5ODJmNzJjNDQ1YTJjNzYzNDZiLi5mOGYzOWFiMTYyYzE4ZDMxYmU3MzFj NTgxNzJmMGY1MDIyNWY2M2ZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHAKQEAgLTE4ODgsNyArMTg4OCw3IEBAIHZvaWQgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KFdL UGFnZVJlZiBwYWdlUmVmLCBjb25zdCBXS1BhZ2VVSUNsaWVudEJhc2UqIHdrQ2xpZW50CiAgICAg ICAgICAgICBtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVx dWVzdCh0b0FQSSgmcGFnZSksIHRvQVBJKCZvcmlnaW4pLCB0b0FQSShOb3RpZmljYXRpb25QZXJt aXNzaW9uUmVxdWVzdDo6Y3JlYXRlKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKS5wdHIoKSks IG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0KIAotICAgICAgICB2b2lkIHJl cXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybShXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJv eHkqIGZyYW1lLCBjb25zdCBXVEY6OlN0cmluZyYgcmVxdWVzdGluZ0RvbWFpbiwgY29uc3QgV1RG OjpTdHJpbmcmIGN1cnJlbnREb21haW4sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpIGZpbmFsCisgICAgICAgIHZvaWQgcmVxdWVzdFN0b3JhZ2VBY2Nl c3NDb25maXJtKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0 IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXF1ZXN0aW5nRG9tYWluLCBjb25zdCBXZWJD b3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgY3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgZmluYWwKICAgICAgICAgewogICAgICAg ICAgICAgaWYgKCFtX2NsaWVudC5yZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0pIHsKICAgICAg ICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih0cnVlKTsKQEAgLTE4OTYsNyArMTg5Niw3IEBA IHZvaWQgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBXS1Bh Z2VVSUNsaWVudEJhc2UqIHdrQ2xpZW50CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGF1 dG8gbGlzdGVuZXIgPSBSZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm1SZXN1bHRMaXN0ZW5lcjo6 Y3JlYXRlKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLSAgICAgICAgICAgIG1fY2xpZW50 LnJlcXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybSh0b0FQSSgmcGFnZSksIHRvQVBJKGZyYW1lKSwg dG9BUEkocmVxdWVzdGluZ0RvbWFpbi5pbXBsKCkpLCB0b0FQSShjdXJyZW50RG9tYWluLmltcGwo KSksIHRvQVBJKGxpc3RlbmVyLnB0cigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAg ICAgICAgICAgIG1fY2xpZW50LnJlcXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybSh0b0FQSSgmcGFn ZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkocmVxdWVzdGluZ0RvbWFpbi5zdHJpbmcoKS5pbXBsKCkp LCB0b0FQSShjdXJyZW50RG9tYWluLnN0cmluZygpLmltcGwoKSksIHRvQVBJKGxpc3RlbmVyLnB0 cigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQogCiAjaWYgRU5BQkxF KERFVklDRV9PUklFTlRBVElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1VJRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVs ZWdhdGUuaAppbmRleCAzYzIzZjhiYzM0YmM2YWU3NGU4YzRiZTJlYjk4MTI5NzQxZTYyZjhjLi5i ZDIwYTgxOTdlOTRkZWE0Y2M0YzgwMzA5YzU3NjdjMjE2YWUwYTVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCkBAIC00MSw2ICs0MSwxMCBAQCBjbGFzcyBG cmFtZUluZm87CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKIH0KIAorbmFtZXNwYWNlIFdlYkNvcmUg eworY2xhc3MgUmVnaXN0cmFibGVEb21haW47Cit9CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBj bGFzcyBVSURlbGVnYXRlIHsKQEAgLTg4LDcgKzkyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgdm9p ZCBydW5KYXZhU2NyaXB0Q29uZmlybShXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYs IFdlYkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmLCBGdW5j dGlvbjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSBmaW5hbDsKICAgICAgICAgdm9p ZCBydW5KYXZhU2NyaXB0UHJvbXB0KFdlYlBhZ2VQcm94eSosIGNvbnN0IFdURjo6U3RyaW5nJiwg Y29uc3QgV1RGOjpTdHJpbmcmLCBXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW5EYXRhJiwgRnVuY3Rpb248dm9pZChjb25zdCBXVEY6OlN0cmluZyYpPiYmKSBmaW5h bDsKICAgICAgICAgdm9pZCBwcmVzZW50U3RvcmFnZUFjY2Vzc0NvbmZpcm1EaWFsb2coY29uc3Qg V1RGOjpTdHJpbmcmIHJlcXVlc3RpbmdEb21haW4sIGNvbnN0IFdURjo6U3RyaW5nJiBjdXJyZW50 RG9tYWluLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKLSAgICAgICAgdm9pZCBy ZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oV2ViUGFnZVByb3h5JiwgV2ViRnJhbWVQcm94eSos IGNvbnN0IFdURjo6U3RyaW5nJiByZXF1ZXN0aW5nRG9tYWluLCBjb25zdCBXVEY6OlN0cmluZyYg Y3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJikgZmluYWw7Cisg ICAgICAgIHZvaWQgcmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKFdlYlBhZ2VQcm94eSYsIFdl YkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgcmVxdWVzdGlu Z0RvbWFpbiwgY29uc3QgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mIGN1cnJlbnREb21haW4s IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpIGZpbmFsOwogICAgICAgICB2b2lkIGRl Y2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QoV2ViUGFnZVByb3h5Jiwg V2ViRnJhbWVQcm94eSYsIEFQSTo6U2VjdXJpdHlPcmlnaW4mLCBGdW5jdGlvbjx2b2lkKGJvb2wp PiYpIGZpbmFsOwogICAgICAgICBib29sIGNhblJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbCgp IGNvbnN0IGZpbmFsOwogICAgICAgICB2b2lkIHJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChX ZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYsIFdlYkZyYW1lUHJveHkqLCBjb25zdCBX ZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmLCBGdW5jdGlvbjx2b2lkKGJvb2wpPiYmIGNvbXBs ZXRpb25IYW5kbGVyKSBmaW5hbDsKQEAgLTE2Myw3ICsxNjcsNyBAQCBwcml2YXRlOgogICAgICAg ICBib29sIHdlYlZpZXdSdW5KYXZhU2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlSW5pdGlhdGVk QnlGcmFtZUNvbXBsZXRpb25IYW5kbGVyIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3UnVuSmF2 YVNjcmlwdENvbmZpcm1QYW5lbFdpdGhNZXNzYWdlSW5pdGlhdGVkQnlGcmFtZUNvbXBsZXRpb25I YW5kbGVyIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3UnVuSmF2YVNjcmlwdFRleHRJbnB1dFBh bmVsV2l0aFByb21wdERlZmF1bHRUZXh0SW5pdGlhdGVkQnlGcmFtZUNvbXBsZXRpb25IYW5kbGVy IDogMTsKLSAgICAgICAgYm9vbCB3ZWJWaWV3UmVxdWVzdFN0b3JhZ2VBY2Nlc3NQYW5lbEZvclRv cFByaXZhdGVseUNvbnRyb2xsZWREb21haW5VbmRlckZpcnN0UGFydHlUb3BQcml2YXRlbHlDb250 cm9sbGVkRG9tYWluQ29tcGxldGlvbkhhbmRsZXIgOiAxOworICAgICAgICBib29sIHdlYlZpZXdS ZXF1ZXN0U3RvcmFnZUFjY2Vzc1BhbmVsVW5kZXJGaXJzdFBhcnR5Q29tcGxldGlvbkhhbmRsZXIg OiAxOwogICAgICAgICBib29sIHdlYlZpZXdSdW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWxXaXRo TWVzc2FnZUluaXRpYXRlZEJ5RnJhbWVDb21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJv b2wgd2ViVmlld1JlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JGcmFtZURlY2lzaW9uSGFu ZGxlciA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFJlc2lnbklucHV0RWxlbWVudFN0cm9u Z1Bhc3N3b3JkQXBwZWFyYW5jZVdpdGhVc2VySW5mbyA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCBhNTc5NTJmMDMzMzczMmNlZGE4NDZlYTU5 YjY5ZTgyMzVkOTQ2ZGM4Li44ZDYzYTljMDAxMWExY2EyYmNlODBiOTUwOWM4N2Y0ZTI3NzcwZGUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KQEAgLTEw NCw3ICsxMDQsNyBAQCB2b2lkIFVJRGVsZWdhdGU6OnNldERlbGVnYXRlKGlkIDxXS1VJRGVsZWdh dGU+IGRlbGVnYXRlKQogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdSdW5KYXZhU2NyaXB0 QWxlcnRQYW5lbFdpdGhNZXNzYWdlSW5pdGlhdGVkQnlGcmFtZUNvbXBsZXRpb25IYW5kbGVyID0g W2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpydW5KYXZhU2Ny aXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlOmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRs ZXI6KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1J1bkphdmFTY3JpcHRDb25maXJt UGFuZWxXaXRoTWVzc2FnZUluaXRpYXRlZEJ5RnJhbWVDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6cnVuSmF2YVNjcmlwdENv bmZpcm1QYW5lbFdpdGhNZXNzYWdlOmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRsZXI6 KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1J1bkphdmFTY3JpcHRUZXh0SW5wdXRQ YW5lbFdpdGhQcm9tcHREZWZhdWx0VGV4dEluaXRpYXRlZEJ5RnJhbWVDb21wbGV0aW9uSGFuZGxl ciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6cnVuSmF2 YVNjcmlwdFRleHRJbnB1dFBhbmVsV2l0aFByb21wdDpkZWZhdWx0VGV4dDppbml0aWF0ZWRCeUZy YW1lOmNvbXBsZXRpb25IYW5kbGVyOildOwotICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdS ZXF1ZXN0U3RvcmFnZUFjY2Vzc1BhbmVsRm9yVG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpblVu ZGVyRmlyc3RQYXJ0eVRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5Db21wbGV0aW9uSGFuZGxl ciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnJlcXVl c3RTdG9yYWdlQWNjZXNzUGFuZWxGb3JEb21haW46dW5kZXJDdXJyZW50RG9tYWluOmNvbXBsZXRp b25IYW5kbGVyOildOworICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdSZXF1ZXN0U3RvcmFn ZUFjY2Vzc1BhbmVsVW5kZXJGaXJzdFBhcnR5Q29tcGxldGlvbkhhbmRsZXIgPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpyZXF1ZXN0U3RvcmFnZUFjY2Vz c1BhbmVsRm9yRG9tYWluOnVuZGVyQ3VycmVudERvbWFpbjpjb21wbGV0aW9uSGFuZGxlcjopXTsK ICAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3UnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs V2l0aE1lc3NhZ2VJbml0aWF0ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRsZXIgPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpydW5CZWZvcmVVbmxvYWRDb25m aXJtUGFuZWxXaXRoTWVzc2FnZTppbml0aWF0ZWRCeUZyYW1lOmNvbXBsZXRpb25IYW5kbGVyOild OwogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdSZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNz aW9uRm9yRnJhbWVEZWNpc2lvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcihfd2ViVmlldzpyZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9uRm9yRnJhbWU6 ZGVjaXNpb25IYW5kbGVyOildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRSZXNp Z25JbnB1dEVsZW1lbnRTdHJvbmdQYXNzd29yZEFwcGVhcmFuY2VXaXRoVXNlckluZm8gPSBbZGVs ZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkaWRSZXNpZ25JbnB1 dEVsZW1lbnRTdHJvbmdQYXNzd29yZEFwcGVhcmFuY2VXaXRoVXNlckluZm86KV07CkBAIC0zMzcs NyArMzM3LDcgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6cnVuSmF2YVNjcmlwdFByb21w dChXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYKICAgICB9KS5nZXQoKV07CiB9CiAK LXZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OnJlcXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybShX ZWJQYWdlUHJveHkmLCBXZWJGcmFtZVByb3h5KiwgY29uc3QgV1RGOjpTdHJpbmcmIHJlcXVlc3Rp bmdEb21haW4sIGNvbnN0IFdURjo6U3RyaW5nJiBjdXJyZW50RG9tYWluLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBVSURlbGVnYXRlOjpV SUNsaWVudDo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKFdlYlBhZ2VQcm94eSYsIFdlYkZy YW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgcmVxdWVzdGluZ0Rv bWFpbiwgY29uc3QgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mIGN1cnJlbnREb21haW4sIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAg YXV0byBkZWxlZ2F0ZSA9IG1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpOwogICAgIGlmICgh ZGVsZWdhdGUpIHsKQEAgLTM0NSwxMyArMzQ1LDEzIEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGll bnQ6OnJlcXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybShXZWJQYWdlUHJveHkmLCBXZWJGcmFtZVBy CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgaWYgKCFtX3VpRGVsZWdhdGUubV9k ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlcXVlc3RTdG9yYWdlQWNjZXNzUGFuZWxGb3JUb3BQcml2 YXRlbHlDb250cm9sbGVkRG9tYWluVW5kZXJGaXJzdFBhcnR5VG9wUHJpdmF0ZWx5Q29udHJvbGxl ZERvbWFpbkNvbXBsZXRpb25IYW5kbGVyKSB7CisgICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxl Z2F0ZU1ldGhvZHMud2ViVmlld1JlcXVlc3RTdG9yYWdlQWNjZXNzUGFuZWxVbmRlckZpcnN0UGFy dHlDb21wbGV0aW9uSGFuZGxlcikgewogICAgICAgICBwcmVzZW50U3RvcmFnZUFjY2Vzc0FsZXJ0 KG1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcsIHJlcXVlc3RpbmdEb21haW4sIGN1cnJlbnREb21haW4s IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIGF1dG8gY2hlY2tlciA9IENvbXBsZXRpb25IYW5kbGVyQ2FsbENoZWNrZXI6OmNyZWF0ZShk ZWxlZ2F0ZS5nZXQoKSwgQHNlbGVjdG9yKF93ZWJWaWV3OnJlcXVlc3RTdG9yYWdlQWNjZXNzUGFu ZWxGb3JEb21haW46dW5kZXJDdXJyZW50RG9tYWluOmNvbXBsZXRpb25IYW5kbGVyOikpOwotICAg IFsoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KWRlbGVnYXRlIF93ZWJWaWV3Om1fdWlEZWxlZ2F0 ZS5tX3dlYlZpZXcgcmVxdWVzdFN0b3JhZ2VBY2Nlc3NQYW5lbEZvckRvbWFpbjpyZXF1ZXN0aW5n RG9tYWluIHVuZGVyQ3VycmVudERvbWFpbjpjdXJyZW50RG9tYWluIGNvbXBsZXRpb25IYW5kbGVy Om1ha2VCbG9ja1B0cihbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSwgY2hlY2tlciA9IFdURk1vdmUoY2hlY2tlcildIChCT09MIHJlc3VsdCkgbXV0YWJsZSB7 CisgICAgWyhpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dlYlZpZXc6bV91aURl bGVnYXRlLm1fd2ViVmlldyByZXF1ZXN0U3RvcmFnZUFjY2Vzc1BhbmVsRm9yRG9tYWluOnJlcXVl c3RpbmdEb21haW4uc3RyaW5nKCkgdW5kZXJDdXJyZW50RG9tYWluOmN1cnJlbnREb21haW4uc3Ry aW5nKCkgY29tcGxldGlvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFtjb21wbGV0aW9uSGFuZGxlciA9 IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBjaGVja2VyID0gV1RGTW92ZShjaGVja2VyKV0g KEJPT0wgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRpb25I YW5kbGVySGFzQmVlbkNhbGxlZCgpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBjb21w bGV0aW9uSGFuZGxlcihyZXN1bHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvV0tTdG9yYWdlQWNjZXNzQWxlcnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dLU3RvcmFnZUFjY2Vzc0FsZXJ0LmgKaW5kZXggMTJlNTkwZGY2ZDgwODlkMzgwNzBl ODk3MWQ2NzY3NDc4MGZiMTA4MS4uY2MxOTMxYjMwZjhlNjM2MzUxZDIxZWZlMWMwMTAyNmI1MjA0 NmNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tTdG9yYWdl QWNjZXNzQWxlcnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XS1N0b3Jh Z2VBY2Nlc3NBbGVydC5oCkBAIC0zNSw5ICszNSwxMyBAQCBuYW1lc3BhY2UgV1RGIHsKIGNsYXNz IFN0cmluZzsKIH0KIAorbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUmVnaXN0cmFibGVEb21h aW47Cit9CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIHByZXNlbnRTdG9yYWdlQWNjZXNz QWxlcnQoV0tXZWJWaWV3ICosIGNvbnN0IFdURjo6U3RyaW5nJiByZXF1ZXN0aW5nRG9tYWluLCBj b25zdCBXVEY6OlN0cmluZyYgY3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChi b29sKT4mJik7Cit2b2lkIHByZXNlbnRTdG9yYWdlQWNjZXNzQWxlcnQoV0tXZWJWaWV3ICosIGNv bnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXF1ZXN0aW5nRG9tYWluLCBjb25zdCBX ZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgY3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhhbmRs ZXI8dm9pZChib29sKT4mJik7CiAKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV0tTdG9yYWdlQWNjZXNzQWxlcnQubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9XS1N0b3JhZ2VBY2Nlc3NBbGVydC5tbQppbmRleCA2OWU2YWIwNTgyNmY5MzBh NmMzYzQ2MGYzM2I4NmVlN2FhODMyMjZhLi5jNzJlZWFmOWQ2MjViNTM2OGI1MmJhYTYyMGVhMzc0 YmVkMjhhNTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XS1N0 b3JhZ2VBY2Nlc3NBbGVydC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X S1N0b3JhZ2VBY2Nlc3NBbGVydC5tbQpAQCAtMzAsMjMgKzMwLDI3IEBACiAKICNpbXBvcnQgIldL V2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4K KyNpbXBvcnQgPFdlYkNvcmUvUmVnaXN0cmFibGVEb21haW4uaD4KICNpbXBvcnQgPHd0Zi9CbG9j a1B0ci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBwcmVzZW50U3RvcmFnZUFjY2Vz c0FsZXJ0KFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgV1RGOjpTdHJpbmcmIHJlcXVlc3RpbmdE b21haW4sIGNvbnN0IFdURjo6U3RyaW5nJiBjdXJyZW50RG9tYWluLCBDb21wbGV0aW9uSGFuZGxl cjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBwcmVzZW50U3RvcmFnZUFj Y2Vzc0FsZXJ0KFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgV2ViQ29yZTo6UmVnaXN0cmFibGVE b21haW4mIHJlcXVlc3RpbmcsIGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiBjdXJy ZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQog ewogICAgIGF1dG8gY29tcGxldGlvbkJsb2NrID0gbWFrZUJsb2NrUHRyKFtjb21wbGV0aW9uSGFu ZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShib29sIHNob3VsZEFsbG93KSBtdXRh YmxlIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoc2hvdWxkQWxsb3cpOwogICAgIH0pOwog CisgICAgYXV0byByZXF1ZXN0aW5nRG9tYWluID0gcmVxdWVzdGluZy5zdHJpbmcoKS5jcmVhdGVD RlN0cmluZygpOworICAgIGF1dG8gY3VycmVudERvbWFpbiA9IGN1cnJlbnQuc3RyaW5nKCkuY3Jl YXRlQ0ZTdHJpbmcoKTsKKwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBOU1N0cmluZyAqYWxlcnRU aXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OldFQl9VSV9OU1NUUklORyhAIkRvIHlv dSB3YW50IHRvIGFsbG93IFwiJUBcIiB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBkYXRhIHdo aWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3NhZ2UgZm9yIHJlcXVlc3RpbmcgY3Jvc3Mtc2l0 ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MuIiksIHJlcXVlc3RpbmdEb21haW4uY3Jl YXRlQ0ZTdHJpbmcoKS5nZXQoKSwgY3VycmVudERvbWFpbi5jcmVhdGVDRlN0cmluZygpLmdldCgp XTsKKyAgICBOU1N0cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0 OldFQl9VSV9OU1NUUklORyhAIkRvIHlvdSB3YW50IHRvIGFsbG93IFwiJUBcIiB0byB1c2UgY29v a2llcyBhbmQgd2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3NhZ2Ug Zm9yIHJlcXVlc3RpbmcgY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3Mu IiksIHJlcXVlc3RpbmdEb21haW4uZ2V0KCksIGN1cnJlbnREb21haW4uZ2V0KCldOwogI2Vsc2UK LSAgICBOU1N0cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OldF Ql9VSV9OU1NUUklORyhAIkFsbG93IFwiJUBcIiB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBk YXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3NhZ2UgZm9yIHJlcXVlc3RpbmcgY3Jv c3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MuIiksIHJlcXVlc3RpbmdEb21h aW4uY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgY3VycmVudERvbWFpbi5jcmVhdGVDRlN0cmluZygp LmdldCgpXTsKKyAgICBOU1N0cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRo Rm9ybWF0OldFQl9VSV9OU1NUUklORyhAIkFsbG93IFwiJUBcIiB0byB1c2UgY29va2llcyBhbmQg d2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3NhZ2UgZm9yIHJlcXVl c3RpbmcgY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MuIiksIHJlcXVl c3RpbmdEb21haW4uZ2V0KCksIGN1cnJlbnREb21haW4uZ2V0KCldOwogI2VuZGlmCiAKLSAgICBO U1N0cmluZyAqaW5mb3JtYXRpdmVUZXh0ID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6V0VC X1VJX05TU1RSSU5HKEAiVGhpcyB3aWxsIGFsbG93IFwiJUBcIiB0byB0cmFjayB5b3VyIGFjdGl2 aXR5LiIsIEAiSW5mb3JtYXRpdmUgdGV4dCBmb3IgcmVxdWVzdGluZyBjcm9zcy1zaXRlIGNvb2tp ZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vzcy4iKSwgcmVxdWVzdGluZ0RvbWFpbi5jcmVhdGVDRlN0 cmluZygpLmdldCgpXTsKKyAgICBOU1N0cmluZyAqaW5mb3JtYXRpdmVUZXh0ID0gW05TU3RyaW5n IHN0cmluZ1dpdGhGb3JtYXQ6V0VCX1VJX05TU1RSSU5HKEAiVGhpcyB3aWxsIGFsbG93IFwiJUBc IiB0byB0cmFjayB5b3VyIGFjdGl2aXR5LiIsIEAiSW5mb3JtYXRpdmUgdGV4dCBmb3IgcmVxdWVz dGluZyBjcm9zcy1zaXRlIGNvb2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vzcy4iKSwgcmVxdWVz dGluZ0RvbWFpbi5nZXQoKV07CiAgICAgTlNTdHJpbmcgKmFsbG93QnV0dG9uU3RyaW5nID0gV0VC X1VJX1NUUklOR19LRVkoQCJBbGxvdyIsICJBbGxvdyAoY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdl YnNpdGUgZGF0YSBhY2Nlc3MpIiwgQCJCdXR0b24gdGl0bGUgaW4gU3RvcmFnZSBBY2Nlc3MgQVBJ IHByb21wdCIpOwogICAgIE5TU3RyaW5nICpkb05vdEFsbG93QnV0dG9uU3RyaW5nID0gV0VCX1VJ X1NUUklOR19LRVkoQCJEb24ndCBBbGxvdyIsICJEb24ndCBBbGxvdyAoY3Jvc3Mtc2l0ZSBjb29r aWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MpIiwgQCJCdXR0b24gdGl0bGUgaW4gU3RvcmFnZSBB Y2Nlc3MgQVBJIHByb21wdCIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAppbmRleCAyY2FiYTk3MTIyMjdkYzZhODYxNjY2OTc4YWNlYTZlN2FkZGQzYzA0Li5iYmVm MjUzNTM0ODlhODVkOGMwNjdiMzE2Mzk5MGRlNDFiMjNiZTIxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTg0NTksNyArODQ1OSw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojpsb2FkU3luY2hyb25vdXNVUkxTY2hlbWVUYXNrKFVSTFNjaGVtZVRhc2tQYXJhbWV0 ZXJzJiYgcGFyYW1lCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKIHZvaWQg V2ViUGFnZVByb3h5OjpyZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oY29uc3QgUmVnaXN0cmFi bGVEb21haW4mIHN1YkZyYW1lRG9tYWluLCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgdG9wRnJh bWVEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+ JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgbV91aUNsaWVudC0+cmVxdWVzdFN0b3JhZ2VB Y2Nlc3NDb25maXJtKCp0aGlzLCBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpLCBzdWJGcmFt ZURvbWFpbi5zdHJpbmcoKSwgdG9wRnJhbWVEb21haW4uc3RyaW5nKCksIFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKTsKKyAgICBtX3VpQ2xpZW50LT5yZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZp cm0oKnRoaXMsIG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCksIHN1YkZyYW1lRG9tYWluLCB0 b3BGcmFtZURvbWFpbiwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogI2VuZGlmCiAK 365348 2019-03-20 08:57:47 -0700 2019-03-20 09:41:21 -0700 Patch bug-195957-20190320085746.patch text/plain 16941 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExN2ZkNjdkNmYwM2UyMjYy NGM4ODg3YTBmZjBhMjJiODAzNzJhNjcuLjEyMmM4MjQ2ZDA3NDZiMDUyYmM4YjhkMTM5ZjBlNjk0 OTg2Mjk4N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMjAgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRvcHQgUmVnaXN0cmFibGVE b21haW4gaW4gdGhlIFN0b3JhZ2UgQWNjZXNzIEFQSSBwcm9tcHQgY29kZSBwYXRocworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1OTU3CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80OTA0ODAyOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGlsZSBtYWtpbmcgdGhlIGNvZGUgY2hhbmdlcyBpbiBCdWcg MTk1ODY2IHdlIG5vdGljZWQgdGhhdCBzdHJpbmdzIHdlcmUgYmVpbmcKKyAgICAgICAgdXNlZCB0 byBwYXNzIHRoZSBvcmlnaW5zIGZvciB0aGUgQVBJIGNhbGxzLiBXZSBzaG91bGQgYWRvcHQgdGhl IFJlZ2lzdHJhYmxlRG9tYWluCisgICAgICAgIGNsYXNzIHRvIGltcHJvdmUgdHlwZSBzYWZldHkg YW5kIGF2b2lkIGludHJvZHVjaW5nIGJ1Z3MgaW4gdGhlIGZ1dHVyZS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6VUlDbGllbnQ6OnJlcXVl c3RTdG9yYWdlQWNjZXNzQ29uZmlybSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdlVUlDbGllbnQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1VJRGVs ZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OlVJRGVsZWdhdGU6OlVJQ2xpZW50OjpyZXF1ZXN0 U3RvcmFnZUFjY2Vzc0NvbmZpcm0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XS1N0b3Jh Z2VBY2Nlc3NBbGVydC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XS1N0b3JhZ2VBY2Nl c3NBbGVydC5tbToKKyAgICAgICAgKFdlYktpdDo6cHJlc2VudFN0b3JhZ2VBY2Nlc3NBbGVydCk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKToKKwogMjAxOS0wMy0y MCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg YW4gcGxhdGZvcm0tZHJpdmVuIHNwZWxsLWNoZWNraW5nIG1lY2hhbmlzbQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAppbmRleCBjMjEyMWVmOGFlMTMxMGJhNGI4ZmU1 ZWJiYWIwOGQ1YWZhODAzNjJjLi5kOWRkMGRiNDY2Mzc3MjJiNjAyYjIwZGRkZjY3MzgxMzVmNjQ2 ZjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaApAQCAtMzks NiArMzksNyBAQCBPQkpDX0NMQVNTIFVJVmlld0NvbnRyb2xsZXI7CiAjZW5kaWYKIAogbmFtZXNw YWNlIFdlYkNvcmUgeworY2xhc3MgUmVnaXN0cmFibGVEb21haW47CiBjbGFzcyBSZXNvdXJjZVJl cXVlc3Q7CiBzdHJ1Y3QgRm9udEF0dHJpYnV0ZXM7CiBzdHJ1Y3QgU2VjdXJpdHlPcmlnaW5EYXRh OwpAQCAtMTMyLDcgKzEzMyw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGVjaWRlUG9s aWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBX ZWJLaXQ6OldlYkZyYW1lUHJveHkmLCBTZWN1cml0eU9yaWdpbiYsIFNlY3VyaXR5T3JpZ2luJiwg V2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5JiByZXF1ZXN0KSB7IHJlcXVl c3QuZGVueSgpOyB9CiAgICAgdmlydHVhbCB2b2lkIGNoZWNrVXNlck1lZGlhUGVybWlzc2lvbkZv ck9yaWdpbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViRnJhbWVQcm94eSYsIFNl Y3VyaXR5T3JpZ2luJiwgU2VjdXJpdHlPcmlnaW4mLCBXZWJLaXQ6OlVzZXJNZWRpYVBlcm1pc3Np b25DaGVja1Byb3h5JiByZXF1ZXN0KSB7IHJlcXVlc3QuZGVueSgpOyB9CiAgICAgdmlydHVhbCB2 b2lkIGRlY2lkZVBvbGljeUZvck5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0KFdlYktpdDo6 V2ViUGFnZVByb3h5JiwgU2VjdXJpdHlPcmlnaW4mLCBGdW5jdGlvbjx2b2lkKGJvb2wpPiYmIGNv bXBsZXRpb25IYW5kbGVyKSB7IGNvbXBsZXRpb25IYW5kbGVyKGZhbHNlKTsgfQotICAgIHZpcnR1 YWwgdm9pZCByZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oV2ViS2l0OjpXZWJQYWdlUHJveHkm LCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYgcmVxdWVzdGluZ0Rv bWFpbiwgY29uc3QgV1RGOjpTdHJpbmcmIGN1cnJlbnREb21haW4sIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhhbmRsZXIodHJ1 ZSk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKFdlYktp dDo6V2ViUGFnZVByb3h5JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6 UmVnaXN0cmFibGVEb21haW4mIHJlcXVlc3RpbmdEb21haW4sIGNvbnN0IFdlYkNvcmU6OlJlZ2lz dHJhYmxlRG9tYWluJiBjdXJyZW50RG9tYWluLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wp PiYmIGNvbXBsZXRpb25IYW5kbGVyKSB7IGNvbXBsZXRpb25IYW5kbGVyKHRydWUpOyB9CiAKICAg ICAvLyBQcmludGluZy4KICAgICB2aXJ0dWFsIGZsb2F0IGhlYWRlckhlaWdodChXZWJLaXQ6Oldl YlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViRnJhbWVQcm94eSYpIHsgcmV0dXJuIDA7IH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCmluZGV4IGQ5Y2IzYzZmYjU2NTM0YzQ4 ZjZmNDk4MmY3MmM0NDVhMmM3NjM0NmIuLmY4ZjM5YWIxNjJjMThkMzFiZTczMWM1ODE3MmYwZjUw MjI1ZjYzZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcApAQCAt MTg4OCw3ICsxODg4LDcgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlVUlDbGllbnQoV0tQYWdlUmVmIHBh Z2VSZWYsIGNvbnN0IFdLUGFnZVVJQ2xpZW50QmFzZSogd2tDbGllbnQKICAgICAgICAgICAgIG1f Y2xpZW50LmRlY2lkZVBvbGljeUZvck5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0KHRvQVBJ KCZwYWdlKSwgdG9BUEkoJm9yaWdpbiksIHRvQVBJKE5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1 ZXN0OjpjcmVhdGUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpLnB0cigpKSwgbV9jbGllbnQu YmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQogCi0gICAgICAgIHZvaWQgcmVxdWVzdFN0b3Jh Z2VBY2Nlc3NDb25maXJtKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUs IGNvbnN0IFdURjo6U3RyaW5nJiByZXF1ZXN0aW5nRG9tYWluLCBjb25zdCBXVEY6OlN0cmluZyYg Y3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9u SGFuZGxlcikgZmluYWwKKyAgICAgICAgdm9pZCByZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0o V2ViUGFnZVByb3h5JiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3QgV2ViQ29yZTo6 UmVnaXN0cmFibGVEb21haW4mIHJlcXVlc3RpbmdEb21haW4sIGNvbnN0IFdlYkNvcmU6OlJlZ2lz dHJhYmxlRG9tYWluJiBjdXJyZW50RG9tYWluLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wp PiYmIGNvbXBsZXRpb25IYW5kbGVyKSBmaW5hbAogICAgICAgICB7CiAgICAgICAgICAgICBpZiAo IW1fY2xpZW50LnJlcXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybSkgewogICAgICAgICAgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKHRydWUpOwpAQCAtMTg5Niw3ICsxODk2LDcgQEAgdm9pZCBXS1Bh Z2VTZXRQYWdlVUlDbGllbnQoV0tQYWdlUmVmIHBhZ2VSZWYsIGNvbnN0IFdLUGFnZVVJQ2xpZW50 QmFzZSogd2tDbGllbnQKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgYXV0byBsaXN0ZW5l ciA9IFJlcXVlc3RTdG9yYWdlQWNjZXNzQ29uZmlybVJlc3VsdExpc3RlbmVyOjpjcmVhdGUoV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwotICAgICAgICAgICAgbV9jbGllbnQucmVxdWVzdFN0 b3JhZ2VBY2Nlc3NDb25maXJtKHRvQVBJKCZwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShyZXF1 ZXN0aW5nRG9tYWluLmltcGwoKSksIHRvQVBJKGN1cnJlbnREb21haW4uaW1wbCgpKSwgdG9BUEko bGlzdGVuZXIucHRyKCkpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICAgICAg bV9jbGllbnQucmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKHRvQVBJKCZwYWdlKSwgdG9BUEko ZnJhbWUpLCB0b0FQSShyZXF1ZXN0aW5nRG9tYWluLnN0cmluZygpLmltcGwoKSksIHRvQVBJKGN1 cnJlbnREb21haW4uc3RyaW5nKCkuaW1wbCgpKSwgdG9BUEkobGlzdGVuZXIucHRyKCkpLCBtX2Ns aWVudC5iYXNlLmNsaWVudEluZm8pOwogICAgICAgICB9CiAKICNpZiBFTkFCTEUoREVWSUNFX09S SUVOVEFUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlE ZWxlZ2F0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCmlu ZGV4IDNjMjNmOGJjMzRiYzZhZTc0ZThjNGJlMmViOTgxMjk3NDFlNjJmOGMuLmJkMjBhODE5N2U5 NGRlYTRjYzRjODAzMDljNTc2N2MyMTZhZTBhNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9VSURlbGVnYXRlLmgKQEAgLTQxLDYgKzQxLDEwIEBAIGNsYXNzIEZyYW1lSW5mbzsK IGNsYXNzIFNlY3VyaXR5T3JpZ2luOwogfQogCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBS ZWdpc3RyYWJsZURvbWFpbjsKK30KKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFVJRGVs ZWdhdGUgewpAQCAtODgsNyArOTIsNyBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIHJ1bkphdmFT Y3JpcHRDb25maXJtKFdlYlBhZ2VQcm94eSosIGNvbnN0IFdURjo6U3RyaW5nJiwgV2ViRnJhbWVQ cm94eSosIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYsIEZ1bmN0aW9uPHZvaWQo Ym9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpIGZpbmFsOwogICAgICAgICB2b2lkIHJ1bkphdmFT Y3JpcHRQcm9tcHQoV2ViUGFnZVByb3h5KiwgY29uc3QgV1RGOjpTdHJpbmcmLCBjb25zdCBXVEY6 OlN0cmluZyYsIFdlYkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRh dGEmLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFdURjo6U3RyaW5nJik+JiYpIGZpbmFsOwogICAgICAg ICB2b2lkIHByZXNlbnRTdG9yYWdlQWNjZXNzQ29uZmlybURpYWxvZyhjb25zdCBXVEY6OlN0cmlu ZyYgcmVxdWVzdGluZ0RvbWFpbiwgY29uc3QgV1RGOjpTdHJpbmcmIGN1cnJlbnREb21haW4sIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwotICAgICAgICB2b2lkIHJlcXVlc3RTdG9y YWdlQWNjZXNzQ29uZmlybShXZWJQYWdlUHJveHkmLCBXZWJGcmFtZVByb3h5KiwgY29uc3QgV1RG OjpTdHJpbmcmIHJlcXVlc3RpbmdEb21haW4sIGNvbnN0IFdURjo6U3RyaW5nJiBjdXJyZW50RG9t YWluLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKSBmaW5hbDsKKyAgICAgICAgdm9p ZCByZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oV2ViUGFnZVByb3h5JiwgV2ViRnJhbWVQcm94 eSosIGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXF1ZXN0aW5nRG9tYWluLCBj b25zdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgY3VycmVudERvbWFpbiwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChib29sKT4mJikgZmluYWw7CiAgICAgICAgIHZvaWQgZGVjaWRlUG9saWN5 Rm9yR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdChXZWJQYWdlUHJveHkmLCBXZWJGcmFtZVBy b3h5JiwgQVBJOjpTZWN1cml0eU9yaWdpbiYsIEZ1bmN0aW9uPHZvaWQoYm9vbCk+JikgZmluYWw7 CiAgICAgICAgIGJvb2wgY2FuUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKCkgY29uc3QgZmlu YWw7CiAgICAgICAgIHZvaWQgcnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKFdlYlBhZ2VQcm94 eSosIGNvbnN0IFdURjo6U3RyaW5nJiwgV2ViRnJhbWVQcm94eSosIGNvbnN0IFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luRGF0YSYsIEZ1bmN0aW9uPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRs ZXIpIGZpbmFsOwpAQCAtMTYzLDcgKzE2Nyw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgd2Vi Vmlld1J1bkphdmFTY3JpcHRBbGVydFBhbmVsV2l0aE1lc3NhZ2VJbml0aWF0ZWRCeUZyYW1lQ29t cGxldGlvbkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdSdW5KYXZhU2NyaXB0Q29u ZmlybVBhbmVsV2l0aE1lc3NhZ2VJbml0aWF0ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRsZXIgOiAx OwogICAgICAgICBib29sIHdlYlZpZXdSdW5KYXZhU2NyaXB0VGV4dElucHV0UGFuZWxXaXRoUHJv bXB0RGVmYXVsdFRleHRJbml0aWF0ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRsZXIgOiAxOwotICAg ICAgICBib29sIHdlYlZpZXdSZXF1ZXN0U3RvcmFnZUFjY2Vzc1BhbmVsRm9yVG9wUHJpdmF0ZWx5 Q29udHJvbGxlZERvbWFpblVuZGVyRmlyc3RQYXJ0eVRvcFByaXZhdGVseUNvbnRyb2xsZWREb21h aW5Db21wbGV0aW9uSGFuZGxlciA6IDE7CisgICAgICAgIGJvb2wgd2ViVmlld1JlcXVlc3RTdG9y YWdlQWNjZXNzUGFuZWxVbmRlckZpcnN0UGFydHlDb21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAg ICAgIGJvb2wgd2ViVmlld1J1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbFdpdGhNZXNzYWdlSW5p dGlhdGVkQnlGcmFtZUNvbXBsZXRpb25IYW5kbGVyIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3 UmVxdWVzdEdlb2xvY2F0aW9uUGVybWlzc2lvbkZvckZyYW1lRGVjaXNpb25IYW5kbGVyIDogMTsK ICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkUmVzaWduSW5wdXRFbGVtZW50U3Ryb25nUGFzc3dvcmRB cHBlYXJhbmNlV2l0aFVzZXJJbmZvIDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9VSURlbGVnYXRlLm1tCmluZGV4IGM2MjM4OTM1ODc0MmJkMjM2MTA4NjI2M2YxY2MzZjRlZTdm MWI5MjkuLmE0YWQ4NzcyY2EzN2RjMDg4OGY2NmU1OTA5ODlkYjMwZmU1OGNiMDIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQpAQCAtMTA0LDcgKzEwNCw3 IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6c2V0RGVsZWdhdGUoaWQgPFdLVUlEZWxlZ2F0ZT4gZGVsZWdh dGUpCiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1J1bkphdmFTY3JpcHRBbGVydFBhbmVs V2l0aE1lc3NhZ2VJbml0aWF0ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRsZXIgPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OnJ1bkphdmFTY3JpcHRBbGVydFBh bmVsV2l0aE1lc3NhZ2U6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxlcjopXTsKICAg ICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3UnVuSmF2YVNjcmlwdENvbmZpcm1QYW5lbFdpdGhN ZXNzYWdlSW5pdGlhdGVkQnlGcmFtZUNvbXBsZXRpb25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpydW5KYXZhU2NyaXB0Q29uZmlybVBhbmVs V2l0aE1lc3NhZ2U6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxlcjopXTsKICAgICBt X2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3UnVuSmF2YVNjcmlwdFRleHRJbnB1dFBhbmVsV2l0aFBy b21wdERlZmF1bHRUZXh0SW5pdGlhdGVkQnlGcmFtZUNvbXBsZXRpb25IYW5kbGVyID0gW2RlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpydW5KYXZhU2NyaXB0VGV4 dElucHV0UGFuZWxXaXRoUHJvbXB0OmRlZmF1bHRUZXh0OmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxl dGlvbkhhbmRsZXI6KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlcXVlc3RTdG9y YWdlQWNjZXNzUGFuZWxGb3JUb3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluVW5kZXJGaXJzdFBh cnR5VG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbkNvbXBsZXRpb25IYW5kbGVyID0gW2RlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cmVxdWVzdFN0b3JhZ2VB Y2Nlc3NQYW5lbEZvckRvbWFpbjp1bmRlckN1cnJlbnREb21haW46Y29tcGxldGlvbkhhbmRsZXI6 KV07CisgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlcXVlc3RTdG9yYWdlQWNjZXNzUGFu ZWxVbmRlckZpcnN0UGFydHlDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnJlcXVlc3RTdG9yYWdlQWNjZXNzUGFuZWxGb3JE b21haW46dW5kZXJDdXJyZW50RG9tYWluOmNvbXBsZXRpb25IYW5kbGVyOildOwogICAgIG1fZGVs ZWdhdGVNZXRob2RzLndlYlZpZXdSdW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWxXaXRoTWVzc2Fn ZUluaXRpYXRlZEJ5RnJhbWVDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbFdp dGhNZXNzYWdlOmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRsZXI6KV07CiAgICAgbV9k ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JGcmFt ZURlY2lzaW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KF93ZWJWaWV3OnJlcXVlc3RHZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JGcmFtZTpkZWNpc2lvbkhh bmRsZXI6KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFJlc2lnbklucHV0RWxl bWVudFN0cm9uZ1Bhc3N3b3JkQXBwZWFyYW5jZVdpdGhVc2VySW5mbyA9IFtkZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZFJlc2lnbklucHV0RWxlbWVudFN0 cm9uZ1Bhc3N3b3JkQXBwZWFyYW5jZVdpdGhVc2VySW5mbzopXTsKQEAgLTMzNyw3ICszMzcsNyBA QCB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpydW5KYXZhU2NyaXB0UHJvbXB0KFdlYlBhZ2VQ cm94eSosIGNvbnN0IFdURjo6U3RyaW5nJgogICAgIH0pLmdldCgpXTsKIH0KIAotdm9pZCBVSURl bGVnYXRlOjpVSUNsaWVudDo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKFdlYlBhZ2VQcm94 eSYsIFdlYkZyYW1lUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYgcmVxdWVzdGluZ0RvbWFpbiwg Y29uc3QgV1RGOjpTdHJpbmcmIGN1cnJlbnREb21haW4sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Ym9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojpy ZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oV2ViUGFnZVByb3h5JiwgV2ViRnJhbWVQcm94eSos IGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXF1ZXN0aW5nRG9tYWluLCBjb25z dCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgY3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBhdXRvIGRlbGVn YXRlID0gbV91aURlbGVnYXRlLm1fZGVsZWdhdGUuZ2V0KCk7CiAgICAgaWYgKCFkZWxlZ2F0ZSkg ewpAQCAtMzQ1LDcgKzM0NSw3IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OnJlcXVlc3RT dG9yYWdlQWNjZXNzQ29uZmlybShXZWJQYWdlUHJveHkmLCBXZWJGcmFtZVByCiAgICAgICAgIHJl dHVybjsKICAgICB9CiAgICAgCi0gICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld1JlcXVlc3RTdG9yYWdlQWNjZXNzUGFuZWxGb3JUb3BQcml2YXRlbHlDb250cm9s bGVkRG9tYWluVW5kZXJGaXJzdFBhcnR5VG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbkNvbXBs ZXRpb25IYW5kbGVyKSB7CisgICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZU1ldGhvZHMu d2ViVmlld1JlcXVlc3RTdG9yYWdlQWNjZXNzUGFuZWxVbmRlckZpcnN0UGFydHlDb21wbGV0aW9u SGFuZGxlcikgewogI2lmICFQTEFURk9STShXQVRDSE9TKSAmJiAhUExBVEZPUk0oQVBQTEVUVikK ICAgICAgICAgcHJlc2VudFN0b3JhZ2VBY2Nlc3NBbGVydChtX3VpRGVsZWdhdGUubV93ZWJWaWV3 LCByZXF1ZXN0aW5nRG9tYWluLCBjdXJyZW50RG9tYWluLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSk7CiAjZW5kaWYKQEAgLTM1Myw3ICszNTMsNyBAQCB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xp ZW50OjpyZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oV2ViUGFnZVByb3h5JiwgV2ViRnJhbWVQ cgogICAgIH0KIAogICAgIGF1dG8gY2hlY2tlciA9IENvbXBsZXRpb25IYW5kbGVyQ2FsbENoZWNr ZXI6OmNyZWF0ZShkZWxlZ2F0ZS5nZXQoKSwgQHNlbGVjdG9yKF93ZWJWaWV3OnJlcXVlc3RTdG9y YWdlQWNjZXNzUGFuZWxGb3JEb21haW46dW5kZXJDdXJyZW50RG9tYWluOmNvbXBsZXRpb25IYW5k bGVyOikpOwotICAgIFsoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KWRlbGVnYXRlIF93ZWJWaWV3 Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgcmVxdWVzdFN0b3JhZ2VBY2Nlc3NQYW5lbEZvckRvbWFp bjpyZXF1ZXN0aW5nRG9tYWluIHVuZGVyQ3VycmVudERvbWFpbjpjdXJyZW50RG9tYWluIGNvbXBs ZXRpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSwgY2hlY2tlciA9IFdURk1vdmUoY2hlY2tlcildIChCT09MIHJlc3Vs dCkgbXV0YWJsZSB7CisgICAgWyhpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dl YlZpZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyByZXF1ZXN0U3RvcmFnZUFjY2Vzc1BhbmVsRm9y RG9tYWluOnJlcXVlc3RpbmdEb21haW4uc3RyaW5nKCkgdW5kZXJDdXJyZW50RG9tYWluOmN1cnJl bnREb21haW4uc3RyaW5nKCkgY29tcGxldGlvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFtjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBjaGVja2VyID0gV1RGTW92 ZShjaGVja2VyKV0gKEJPT0wgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGNoZWNrZXIt PmNvbXBsZXRpb25IYW5kbGVySGFzQmVlbkNhbGxlZCgpKQogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihyZXN1bHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvV0tTdG9yYWdlQWNjZXNzQWxlcnQuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1dLU3RvcmFnZUFjY2Vzc0FsZXJ0LmgKaW5kZXggMTJlNTkwZGY2 ZDgwODlkMzgwNzBlODk3MWQ2NzY3NDc4MGZiMTA4MS4uY2MxOTMxYjMwZjhlNjM2MzUxZDIxZWZl MWMwMTAyNmI1MjA0NmNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV0tTdG9yYWdlQWNjZXNzQWxlcnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9XS1N0b3JhZ2VBY2Nlc3NBbGVydC5oCkBAIC0zNSw5ICszNSwxMyBAQCBuYW1lc3BhY2Ug V1RGIHsKIGNsYXNzIFN0cmluZzsKIH0KIAorbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUmVn aXN0cmFibGVEb21haW47Cit9CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIHByZXNlbnRT dG9yYWdlQWNjZXNzQWxlcnQoV0tXZWJWaWV3ICosIGNvbnN0IFdURjo6U3RyaW5nJiByZXF1ZXN0 aW5nRG9tYWluLCBjb25zdCBXVEY6OlN0cmluZyYgY3VycmVudERvbWFpbiwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChib29sKT4mJik7Cit2b2lkIHByZXNlbnRTdG9yYWdlQWNjZXNzQWxlcnQoV0tX ZWJWaWV3ICosIGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXF1ZXN0aW5nRG9t YWluLCBjb25zdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgY3VycmVudERvbWFpbiwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CiAKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tTdG9yYWdlQWNjZXNzQWxlcnQubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XS1N0b3JhZ2VBY2Nlc3NBbGVydC5tbQppbmRleCA2OWU2 YWIwNTgyNmY5MzBhNmMzYzQ2MGYzM2I4NmVlN2FhODMyMjZhLi5jNzJlZWFmOWQ2MjViNTM2OGI1 MmJhYTYyMGVhMzc0YmVkMjhhNTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9XS1N0b3JhZ2VBY2Nlc3NBbGVydC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9XS1N0b3JhZ2VBY2Nlc3NBbGVydC5tbQpAQCAtMzAsMjMgKzMwLDI3IEBACiAK ICNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXpl ZFN0cmluZ3MuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUmVnaXN0cmFibGVEb21haW4uaD4KICNpbXBv cnQgPHd0Zi9CbG9ja1B0ci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBwcmVzZW50 U3RvcmFnZUFjY2Vzc0FsZXJ0KFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgV1RGOjpTdHJpbmcm IHJlcXVlc3RpbmdEb21haW4sIGNvbnN0IFdURjo6U3RyaW5nJiBjdXJyZW50RG9tYWluLCBDb21w bGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBwcmVz ZW50U3RvcmFnZUFjY2Vzc0FsZXJ0KFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgV2ViQ29yZTo6 UmVnaXN0cmFibGVEb21haW4mIHJlcXVlc3RpbmcsIGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxl RG9tYWluJiBjdXJyZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQogewogICAgIGF1dG8gY29tcGxldGlvbkJsb2NrID0gbWFrZUJsb2NrUHRyKFtj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShib29sIHNob3Vs ZEFsbG93KSBtdXRhYmxlIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoc2hvdWxkQWxsb3cp OwogICAgIH0pOwogCisgICAgYXV0byByZXF1ZXN0aW5nRG9tYWluID0gcmVxdWVzdGluZy5zdHJp bmcoKS5jcmVhdGVDRlN0cmluZygpOworICAgIGF1dG8gY3VycmVudERvbWFpbiA9IGN1cnJlbnQu c3RyaW5nKCkuY3JlYXRlQ0ZTdHJpbmcoKTsKKwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBOU1N0 cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OldFQl9VSV9OU1NU UklORyhAIkRvIHlvdSB3YW50IHRvIGFsbG93IFwiJUBcIiB0byB1c2UgY29va2llcyBhbmQgd2Vi c2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3NhZ2UgZm9yIHJlcXVlc3Rp bmcgY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MuIiksIHJlcXVlc3Rp bmdEb21haW4uY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgY3VycmVudERvbWFpbi5jcmVhdGVDRlN0 cmluZygpLmdldCgpXTsKKyAgICBOU1N0cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmluZyBzdHJp bmdXaXRoRm9ybWF0OldFQl9VSV9OU1NUUklORyhAIkRvIHlvdSB3YW50IHRvIGFsbG93IFwiJUBc IiB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8i LCBAIk1lc3NhZ2UgZm9yIHJlcXVlc3RpbmcgY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUg ZGF0YSBhY2Nlc3MuIiksIHJlcXVlc3RpbmdEb21haW4uZ2V0KCksIGN1cnJlbnREb21haW4uZ2V0 KCldOwogI2Vsc2UKLSAgICBOU1N0cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmluZyBzdHJpbmdX aXRoRm9ybWF0OldFQl9VSV9OU1NUUklORyhAIkFsbG93IFwiJUBcIiB0byB1c2UgY29va2llcyBh bmQgd2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3NhZ2UgZm9yIHJl cXVlc3RpbmcgY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MuIiksIHJl cXVlc3RpbmdEb21haW4uY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgY3VycmVudERvbWFpbi5jcmVh dGVDRlN0cmluZygpLmdldCgpXTsKKyAgICBOU1N0cmluZyAqYWxlcnRUaXRsZSA9IFtOU1N0cmlu ZyBzdHJpbmdXaXRoRm9ybWF0OldFQl9VSV9OU1NUUklORyhAIkFsbG93IFwiJUBcIiB0byB1c2Ug Y29va2llcyBhbmQgd2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5nIFwiJUBcIj8iLCBAIk1lc3Nh Z2UgZm9yIHJlcXVlc3RpbmcgY3Jvc3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nl c3MuIiksIHJlcXVlc3RpbmdEb21haW4uZ2V0KCksIGN1cnJlbnREb21haW4uZ2V0KCldOwogI2Vu ZGlmCiAKLSAgICBOU1N0cmluZyAqaW5mb3JtYXRpdmVUZXh0ID0gW05TU3RyaW5nIHN0cmluZ1dp dGhGb3JtYXQ6V0VCX1VJX05TU1RSSU5HKEAiVGhpcyB3aWxsIGFsbG93IFwiJUBcIiB0byB0cmFj ayB5b3VyIGFjdGl2aXR5LiIsIEAiSW5mb3JtYXRpdmUgdGV4dCBmb3IgcmVxdWVzdGluZyBjcm9z cy1zaXRlIGNvb2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vzcy4iKSwgcmVxdWVzdGluZ0RvbWFp bi5jcmVhdGVDRlN0cmluZygpLmdldCgpXTsKKyAgICBOU1N0cmluZyAqaW5mb3JtYXRpdmVUZXh0 ID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6V0VCX1VJX05TU1RSSU5HKEAiVGhpcyB3aWxs IGFsbG93IFwiJUBcIiB0byB0cmFjayB5b3VyIGFjdGl2aXR5LiIsIEAiSW5mb3JtYXRpdmUgdGV4 dCBmb3IgcmVxdWVzdGluZyBjcm9zcy1zaXRlIGNvb2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vz cy4iKSwgcmVxdWVzdGluZ0RvbWFpbi5nZXQoKV07CiAgICAgTlNTdHJpbmcgKmFsbG93QnV0dG9u U3RyaW5nID0gV0VCX1VJX1NUUklOR19LRVkoQCJBbGxvdyIsICJBbGxvdyAoY3Jvc3Mtc2l0ZSBj b29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MpIiwgQCJCdXR0b24gdGl0bGUgaW4gU3RvcmFn ZSBBY2Nlc3MgQVBJIHByb21wdCIpOwogICAgIE5TU3RyaW5nICpkb05vdEFsbG93QnV0dG9uU3Ry aW5nID0gV0VCX1VJX1NUUklOR19LRVkoQCJEb24ndCBBbGxvdyIsICJEb24ndCBBbGxvdyAoY3Jv c3Mtc2l0ZSBjb29raWUgYW5kIHdlYnNpdGUgZGF0YSBhY2Nlc3MpIiwgQCJCdXR0b24gdGl0bGUg aW4gU3RvcmFnZSBBY2Nlc3MgQVBJIHByb21wdCIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAppbmRleCAyY2FiYTk3MTIyMjdkYzZhODYxNjY2OTc4YWNlYTZlN2Fk ZGQzYzA0Li5iYmVmMjUzNTM0ODlhODVkOGMwNjdiMzE2Mzk5MGRlNDFiMjNiZTIxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTg0NTksNyArODQ1OSw3IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkU3luY2hyb25vdXNVUkxTY2hlbWVUYXNrKFVSTFNjaGVt ZVRhc2tQYXJhbWV0ZXJzJiYgcGFyYW1lCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElT VElDUykKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0U3RvcmFnZUFjY2Vzc0NvbmZpcm0oY29u c3QgUmVnaXN0cmFibGVEb21haW4mIHN1YkZyYW1lRG9tYWluLCBjb25zdCBSZWdpc3RyYWJsZURv bWFpbiYgdG9wRnJhbWVEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgbV91aUNsaWVudC0+cmVx dWVzdFN0b3JhZ2VBY2Nlc3NDb25maXJtKCp0aGlzLCBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1l SUQpLCBzdWJGcmFtZURvbWFpbi5zdHJpbmcoKSwgdG9wRnJhbWVEb21haW4uc3RyaW5nKCksIFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBtX3VpQ2xpZW50LT5yZXF1ZXN0U3RvcmFn ZUFjY2Vzc0NvbmZpcm0oKnRoaXMsIG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCksIHN1YkZy YW1lRG9tYWluLCB0b3BGcmFtZURvbWFpbiwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwog fQogI2VuZGlmCiAK