167585 2017-01-30 07:01:42 -0800 [JSC] Do not reject WebAssembly.compile() with Exception 2017-01-30 23:23:11 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 167587 1 ysuzuki ysuzuki commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1271238 0 ysuzuki 2017-01-30 07:01:42 -0800 [JSC] Make Exception JSCell and do not reject WebAssembly.compile() with Exception 1271239 1 300101 ysuzuki 2017-01-30 07:06:08 -0800 Created attachment 300101 Patch 1271240 2 300102 ysuzuki 2017-01-30 07:11:13 -0800 Created attachment 300102 Patch 1271242 3 300104 ysuzuki 2017-01-30 07:15:09 -0800 Created attachment 300104 Patch 1271248 4 300106 ysuzuki 2017-01-30 07:31:50 -0800 Created attachment 300106 Patch 1271306 5 300106 mark.lam 2017-01-30 10:17:12 -0800 Comment on attachment 300106 Patch r=me 1271588 6 300106 ysuzuki 2017-01-30 22:57:02 -0800 Comment on attachment 300106 Patch Thanks! 1271593 7 300106 commit-queue 2017-01-30 23:23:07 -0800 Comment on attachment 300106 Patch Clearing flags on attachment: 300106 Committed r211410: <http://trac.webkit.org/changeset/211410> 1271594 8 commit-queue 2017-01-30 23:23:11 -0800 All reviewed patches have been landed. Closing bug. 300101 2017-01-30 07:06:08 -0800 2017-01-30 07:11:09 -0800 Patch bug-167585-20170131000359.patch text/plain 12102 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YjhkOGU4YTFkMGM3MmRhMDk0YTU4M2MwZTc5MzlhMDNkMzA1N2MxLi5iYzg5NWU4Njc4OTIxYmNk YTJhNTdhOGMxYjM1NmE1MGQ0YjU2Mzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNy0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBNYWtlIEV4Y2VwdGlvbiBKU0NlbGwgYW5kIGRvIG5vdCBy ZWplY3QgV2ViQXNzZW1ibHkuY29tcGlsZSgpIHdpdGggRXhjZXB0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc1ODUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQgY3Jhc2hlcyB3aGVuIGV4 ZWN1dGluZyBgV2ViQXNzZW1ibHkuY29tcGlsZSgpYCBvbiB0aGUgV2ViIEluc3BlY3Rvci4KKyAg ICAgICAgVGhpcyBpcyBiZWNhdXNlIHdlIGFjY2lkZW50YWxseSByZWplY3QgdGhlIHByb21pc2Ug d2l0aCBFeGNlcHRpb24gKG5vdCBFcnJvcikuCisgICAgICAgIEl0IGV4cG9zZXMgRXhjZXB0aW9u IHRvIHVzZXIgc3BhY2UuIEFuZCB1bnNhZmUgb3BlcmF0aW9ucyBvbnRvIEV4Y2VwdGlvbiBjYXVz ZXMKKyAgICAgICAgY3Jhc2guCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgd2UgcmVqZWN0IHRo ZSBwcm9taXNlIHdpdGggRXhjZXB0aW9uOjp2YWx1ZSgpLiBGdXJ0aGVybW9yZSwgd2UKKyAgICAg ICAgY29udmVydCBFeGNlcHRpb24gdG8gSlNDZWxsLiBQcmV2aW91c2x5LCBFeGNlcHRpb24gaW5o ZXJpdHMgSlNOb25GaW5hbE9iamVjdC4KKyAgICAgICAgQnV0IGl0IGlzIG5vdCBjb3JyZWN0IHNp bmNlIEV4Y2VwdGlvbiBoYXMgSW1tb3J0YWxTdHJ1Y3R1cmUuIEFuZCBFeGNlcHRpb24ncworICAg ICAgICBzdHJ1Y3R1cmUoKS0+Z2xvYmFsT2JqZWN0KCkgaXMgbnVsbHB0ci4gSXQgaXMgbm90IHN1 aXRhYmxlIGZvciBKU09iamVjdC4KKworICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVy LmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OmV4ZWN1dGUpOgorICAgICAgICAqIHJ1 bnRpbWUvRXhjZXB0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6RXhjZXB0aW9uOjpjcmVhdGVTdHJ1 Y3R1cmUpOgorICAgICAgICAoSlNDOjpFeGNlcHRpb246OnZpc2l0Q2hpbGRyZW4pOgorICAgICAg ICAqIHJ1bnRpbWUvRXhjZXB0aW9uLmg6CisgICAgICAgICogcnVudGltZS9Qcm9ncmFtRXhlY3V0 YWJsZS5jcHA6CisgICAgICAgIChKU0M6OlByb2dyYW1FeGVjdXRhYmxlOjppbml0aWFsaXplR2xv YmFsUHJvcGVydGllcyk6CisgICAgICAgICogd2FzbS9KU1dlYkFzc2VtYmx5LmNwcDoKKyAgICAg ICAgKEpTQzo6d2ViQXNzZW1ibHlDb21waWxlRnVuYyk6CisKIDIwMTctMDEtMjggIE1hdHQgQmFr ZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5lZWQg c29tZSBsaW1pdCBvbiBBc3luYyBDYWxsIFN0YWNrcyBmb3IgYXN5bmMgbG9vcHMgKHJBRiBsb29w cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnBy ZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIu Y3BwCmluZGV4IDE1OTMwODM1ZjQ5NDMxNmRkMmFiNWJkMWJmZTExNjQzZWUxNTI4NjkuLjg1NjUz OWRjNmMxNWIyMDE1MTg4ZTllYjQ3MDIwNTY2M2E1NzdmZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAtODQ0LDggKzg0NCw4 IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoUHJvZ3JhbUV4ZWN1dGFibGUqIHByb2dy YW0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBKCiAgICAgVk1FbnRyeVNjb3BlIGVudHJ5U2NvcGUo dm0sIHNjb3BlLT5nbG9iYWxPYmplY3QoKSk7CiAKICAgICAvLyBDb21waWxlIHNvdXJjZSB0byBi eXRlY29kZSBpZiBuZWNlc3Nhcnk6Ci0gICAgaWYgKEpTT2JqZWN0KiBlcnJvciA9IHByb2dyYW0t PmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKHZtLCBjYWxsRnJhbWUsIHNjb3BlKSkKLSAgICAg ICAgcmV0dXJuIGNoZWNrZWRSZXR1cm4odGhyb3dFeGNlcHRpb24oY2FsbEZyYW1lLCB0aHJvd1Nj b3BlLCBlcnJvcikpOworICAgIHByb2dyYW0tPmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKHZt LCBjYWxsRnJhbWUsIHNjb3BlKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUs IHsgfSk7CiAKICAgICBQcm9ncmFtQ29kZUJsb2NrKiBjb2RlQmxvY2s7CiAgICAgewpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5jcHAKaW5kZXggOTMxNzVlZTQ0OTgx MGVkYjVjYTAxOTdiMDFmMjljYzI1OGVmYzIxZS4uNTA0ZGU3OWY3OTFkOGI4ZDcxYjEzYTc5Zjk3 Y2VlOTJlMDYwZjMwZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv RXhjZXB0aW9uLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRp b24uY3BwCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi1jb25zdCBDbGFz c0luZm8gRXhjZXB0aW9uOjpzX2luZm8gPSB7ICJFeGNlcHRpb24iLCAmQmFzZTo6c19pbmZvLCAw LCBDUkVBVEVfTUVUSE9EX1RBQkxFKEV4Y2VwdGlvbikgfTsKK2NvbnN0IENsYXNzSW5mbyBFeGNl cHRpb246OnNfaW5mbyA9IHsgIkV4Y2VwdGlvbiIsIDAsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUo RXhjZXB0aW9uKSB9OwogCiBFeGNlcHRpb24qIEV4Y2VwdGlvbjo6Y3JlYXRlKFZNJiB2bSwgSlNW YWx1ZSB0aHJvd25WYWx1ZSwgU3RhY2tDYXB0dXJlQWN0aW9uIGFjdGlvbikKIHsKQEAgLTQ4LDE2 ICs0OCwxNiBAQCB2b2lkIEV4Y2VwdGlvbjo6ZGVzdHJveShKU0NlbGwqIGNlbGwpCiAKIFN0cnVj dHVyZSogRXhjZXB0aW9uOjpjcmVhdGVTdHJ1Y3R1cmUoVk0mIHZtLCBKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSkKIHsKLSAgICByZXR1cm4gU3RydWN0dXJl OjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgcHJvdG90eXBlLCBUeXBlSW5mbyhPYmplY3RUeXBl LCBTdHJ1Y3R1cmVGbGFncyksIGluZm8oKSk7CisgICAgcmV0dXJuIFN0cnVjdHVyZTo6Y3JlYXRl KHZtLCBnbG9iYWxPYmplY3QsIHByb3RvdHlwZSwgVHlwZUluZm8oQ2VsbFR5cGUsIFN0cnVjdHVy ZUZsYWdzKSwgaW5mbygpKTsKIH0KIAogdm9pZCBFeGNlcHRpb246OnZpc2l0Q2hpbGRyZW4oSlND ZWxsKiBjZWxsLCBTbG90VmlzaXRvciYgdmlzaXRvcikKIHsKLSAgICBFeGNlcHRpb24qIHRoaXNP YmplY3QgPSBqc0Nhc3Q8RXhjZXB0aW9uKj4oY2VsbCk7Ci0gICAgQVNTRVJUX0dDX09CSkVDVF9J TkhFUklUUyh0aGlzT2JqZWN0LCBpbmZvKCkpOwotICAgIEJhc2U6OnZpc2l0Q2hpbGRyZW4odGhp c09iamVjdCwgdmlzaXRvcik7CisgICAgRXhjZXB0aW9uKiB0aGlzQ2VsbCA9IGpzQ2FzdDxFeGNl cHRpb24qPihjZWxsKTsKKyAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKHRoaXNDZWxsLCBp bmZvKCkpOworICAgIEJhc2U6OnZpc2l0Q2hpbGRyZW4odGhpc0NlbGwsIHZpc2l0b3IpOwogCi0g ICAgdmlzaXRvci5hcHBlbmQodGhpc09iamVjdC0+bV92YWx1ZSk7CisgICAgdmlzaXRvci5hcHBl bmQodGhpc0NlbGwtPm1fdmFsdWUpOwogfQogCiBFeGNlcHRpb246OkV4Y2VwdGlvbihWTSYgdm0p CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRpb24uaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5oCmluZGV4IDU1Yjc5NTcy YjMzNTU0ZTA5NmQ5NTM4OGZkYTMzZDk5NjgxYmExYzQuLjQ0ZWI5NzI5MTMxYWM4YTExMmMxNDZm YjNkOTk4MjhlMDlmOWM1Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0V4Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2Vw dGlvbi5oCkBAIC0zMSw5ICszMSw5IEBACiAKIG5hbWVzcGFjZSBKU0MgewogICAgIAotY2xhc3Mg RXhjZXB0aW9uIDogcHVibGljIEpTTm9uRmluYWxPYmplY3QgeworY2xhc3MgRXhjZXB0aW9uIDog cHVibGljIEpTQ2VsbCB7CiBwdWJsaWM6Ci0gICAgdHlwZWRlZiBKU05vbkZpbmFsT2JqZWN0IEJh c2U7CisgICAgdXNpbmcgQmFzZSA9IEpTQ2VsbDsKICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQg U3RydWN0dXJlRmxhZ3MgPSBTdHJ1Y3R1cmVJc0ltbW9ydGFsIHwgQmFzZTo6U3RydWN0dXJlRmxh Z3M7CiAKICAgICBlbnVtIFN0YWNrQ2FwdHVyZUFjdGlvbiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9ncmFtRXhlY3V0YWJsZS5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9Qcm9ncmFtRXhlY3V0YWJsZS5jcHAKaW5kZXggNmE0Zjk0YWU3 Y2I0YjA4YmJmNTNhODU5YTJmNjY2MzNkNjZjZjU4NC4uOTk4OTRmMThkOGZmM2UzMzVhYTYyNTU4 OWQzNzA4ZDBhODkwMjkyNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvUHJvZ3JhbUV4ZWN1dGFibGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1Byb2dyYW1FeGVjdXRhYmxlLmNwcApAQCAtOTEsMTQgKzkxLDEyIEBAIEpTT2JqZWN0KiBQ cm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMoVk0mIHZtLCBDYWxs RnJhbWUqIGNhbGxGCiAgICAgICAgIGdsb2JhbE9iamVjdC0+ZGVidWdnZXIoKS0+c291cmNlUGFy c2VkKGNhbGxGcmFtZSwgc291cmNlKCkucHJvdmlkZXIoKSwgZXJyb3IubGluZSgpLCBlcnJvci5t ZXNzYWdlKCkpOwogCiAgICAgaWYgKGVycm9yLmlzVmFsaWQoKSkKLSAgICAgICAgcmV0dXJuIGVy cm9yLnRvRXJyb3JPYmplY3QoZ2xvYmFsT2JqZWN0LCBzb3VyY2UoKSk7CisgICAgICAgIHJldHVy biB0aHJvd1Njb3BlLnRocm93RXhjZXB0aW9uKGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpLCBl cnJvci50b0Vycm9yT2JqZWN0KGdsb2JhbE9iamVjdCwgc291cmNlKCkpKTsKIAogICAgIEpTVmFs dWUgbmV4dFByb3RvdHlwZSA9IGdsb2JhbE9iamVjdC0+Z2V0UHJvdG90eXBlRGlyZWN0KCk7CiAg ICAgd2hpbGUgKG5leHRQcm90b3R5cGUgJiYgbmV4dFByb3RvdHlwZS5pc09iamVjdCgpKSB7Ci0g ICAgICAgIGlmIChVTkxJS0VMWShhc09iamVjdChuZXh0UHJvdG90eXBlKS0+dHlwZSgpID09IFBy b3h5T2JqZWN0VHlwZSkpIHsKLSAgICAgICAgICAgIEV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9i amVjdC0+Z2xvYmFsRXhlYygpOwotICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVR5cGVFcnJvcihl eGVjLCBBU0NJSUxpdGVyYWwoIlByb3h5IGlzIG5vdCBhbGxvd2VkIGluIHRoZSBnbG9iYWwgcHJv dG90eXBlIGNoYWluLiIpKTsKLSAgICAgICAgfQorICAgICAgICBpZiAoVU5MSUtFTFkoYXNPYmpl Y3QobmV4dFByb3RvdHlwZSktPnR5cGUoKSA9PSBQcm94eU9iamVjdFR5cGUpKQorICAgICAgICAg ICAgcmV0dXJuIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpLCB0aHJv d1Njb3BlLCBBU0NJSUxpdGVyYWwoIlByb3h5IGlzIG5vdCBhbGxvd2VkIGluIHRoZSBnbG9iYWwg cHJvdG90eXBlIGNoYWluLiIpKTsKICAgICAgICAgbmV4dFByb3RvdHlwZSA9IGFzT2JqZWN0KG5l eHRQcm90b3R5cGUpLT5nZXRQcm90b3R5cGVEaXJlY3QoKTsKICAgICB9CiAgICAgCkBAIC0xMTIs MTQgKzExMCwxNCBAQCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6OmluaXRpYWxpemVHbG9i YWxQcm9wZXJ0aWVzKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRgogICAgICAgICAvLyBDaGVjayBm b3IgaW50ZXJzZWN0aW9uIG9mICJ2YXIiIGFuZCAibGV0Ii8iY29uc3QiLyJjbGFzcyIKICAgICAg ICAgZm9yIChhdXRvJiBlbnRyeSA6IGxleGljYWxEZWNsYXJhdGlvbnMpIHsKICAgICAgICAgICAg IGlmICh2YXJpYWJsZURlY2xhcmF0aW9ucy5jb250YWlucyhlbnRyeS5rZXkpKQotICAgICAgICAg ICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJvcihleGVjLCBtYWtlU3RyaW5nKCJDYW4ndCBj cmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlOiAnIiwgU3RyaW5nKGVudHJ5LmtleS5nZXQoKSksICIn IikpOworICAgICAgICAgICAgICAgIHJldHVybiB0aHJvd1N5bnRheEVycm9yKGV4ZWMsIHRocm93 U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBT dHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBD aGVjayBpZiBhbnkgbmV3ICJsZXQiLyJjb25zdCIvImNsYXNzIiB3aWxsIHNoYWRvdyBhbnkgcHJl LWV4aXN0aW5nIGdsb2JhbCBwcm9wZXJ0eSBuYW1lcywgb3IgInZhciIvImxldCIvImNvbnN0IiB2 YXJpYWJsZXMuCiAgICAgICAgIC8vIEl0J3MgYW4gZXJyb3IgdG8gaW50cm9kdWNlIGEgc2hhZG93 LgogICAgICAgICBmb3IgKGF1dG8mIGVudHJ5IDogbGV4aWNhbERlY2xhcmF0aW9ucykgewogICAg ICAgICAgICAgYm9vbCBoYXNQcm9wZXJ0eSA9IGdsb2JhbE9iamVjdC0+aGFzUHJvcGVydHkoZXhl YywgZW50cnkua2V5LmdldCgpKTsKLSAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhy b3dTY29wZSwgdGhyb3dTY29wZS5leGNlcHRpb24oKSk7CisgICAgICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHRocm93U2NvcGUsIG51bGxwdHIpOwogICAgICAgICAgICAgaWYgKGhhc1Byb3Bl cnR5KSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlIEVTNiBzcGVjIHNheXMgdGhhdCBqdXN0IFJl c3RyaWN0ZWRHbG9iYWxQcm9wZXJ0eSBjYW4ndCBiZSBzaGFkb3dlZAogICAgICAgICAgICAgICAg IC8vIFRoaXMgY2FycmllZCBvdXQgc2VjdGlvbiA4LjEuMS40LjE0IG9mIHRoZSBFUzYgc3BlYzog aHR0cDovL3d3dy5lY21hLWludGVybmF0aW9uYWwub3JnL2VjbWEtMjYyLzYuMC9pbmRleC5odG1s I3NlYy1oYXNyZXN0cmljdGVkZ2xvYmFscHJvcGVydHkKQEAgLTEyNywxMSArMTI1LDExIEBAIEpT T2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMoVk0m IHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgICAgICAgICAgZ2xvYmFsT2JqZWN0LT5nZXRP d25Qcm9wZXJ0eURlc2NyaXB0b3IoZXhlYywgZW50cnkua2V5LmdldCgpLCBkZXNjcmlwdG9yKTsK ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAoZGVzY3JpcHRvci52YWx1ZSgp ICE9IGpzVW5kZWZpbmVkKCkgJiYgIWRlc2NyaXB0b3IuY29uZmlndXJhYmxlKCkpCi0gICAgICAg ICAgICAgICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJvcihleGVjLCBtYWtlU3RyaW5nKCJD YW4ndCBjcmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlIHRoYXQgc2hhZG93cyBhIGdsb2JhbCBwcm9w ZXJ0eTogJyIsIFN0cmluZyhlbnRyeS5rZXkuZ2V0KCkpLCAiJyIpKTsKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHRocm93U3ludGF4RXJyb3IoZXhlYywgdGhyb3dTY29wZSwgbWFrZVN0cmlu ZygiQ2FuJ3QgY3JlYXRlIGR1cGxpY2F0ZSB2YXJpYWJsZSB0aGF0IHNoYWRvd3MgYSBnbG9iYWwg cHJvcGVydHk6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIGhhc1Byb3BlcnR5ID0gZ2xvYmFsTGV4aWNhbEVudmlyb25tZW50 LT5oYXNQcm9wZXJ0eShleGVjLCBlbnRyeS5rZXkuZ2V0KCkpOwotICAgICAgICAgICAgUkVUVVJO X0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4Y2VwdGlvbigpKTsKKyAgICAg ICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgbnVsbHB0cik7CiAgICAgICAg ICAgICBpZiAoaGFzUHJvcGVydHkpIHsKICAgICAgICAgICAgICAgICBpZiAoVU5MSUtFTFkoZW50 cnkudmFsdWUuaXNDb25zdCgpICYmICF2bS5nbG9iYWxDb25zdFJlZGVjbGFyYXRpb25TaG91bGRU aHJvdygpICYmICFpc1N0cmljdE1vZGUoKSkpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gV2Ug b25seSBhbGxvdyAiY29uc3QiIGR1cGxpY2F0ZSBkZWNsYXJhdGlvbnMgdW5kZXIgdGhpcyBzZXR0 aW5nLgpAQCAtMTM5LDcgKzEzNyw3IEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5p dGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAg ICAgICAgICAgICAgIGlmIChnbG9iYWxMZXhpY2FsRW52aXJvbm1lbnQtPmlzQ29uc3RWYXJpYWJs ZShlbnRyeS5rZXkuZ2V0KCkpKQogICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJv cihleGVjLCBtYWtlU3RyaW5nKCJDYW4ndCBjcmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlOiAnIiwg U3RyaW5nKGVudHJ5LmtleS5nZXQoKSksICInIikpOworICAgICAgICAgICAgICAgIHJldHVybiB0 aHJvd1N5bnRheEVycm9yKGV4ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0 ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAtMTQ4LDkgKzE0Niw5IEBAIEpTT2JqZWN0 KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMoVk0mIHZtLCBD YWxsRnJhbWUqIGNhbGxGCiAgICAgICAgIGlmICghZ2xvYmFsTGV4aWNhbEVudmlyb25tZW50LT5p c0VtcHR5KCkpIHsKICAgICAgICAgICAgIGZvciAoYXV0byYgZW50cnkgOiB2YXJpYWJsZURlY2xh cmF0aW9ucykgewogICAgICAgICAgICAgICAgIGJvb2wgaGFzUHJvcGVydHkgPSBnbG9iYWxMZXhp Y2FsRW52aXJvbm1lbnQtPmhhc1Byb3BlcnR5KGV4ZWMsIGVudHJ5LmtleS5nZXQoKSk7Ci0gICAg ICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4 Y2VwdGlvbigpKTsKKyAgICAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2Nv cGUsIG51bGxwdHIpOwogICAgICAgICAgICAgICAgIGlmIChoYXNQcm9wZXJ0eSkKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVN5bnRheEVycm9yKGV4ZWMsIG1ha2VTdHJpbmcoIkNh bid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgp KSwgIiciKSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0aHJvd1N5bnRheEVycm9yKGV4 ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFi bGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9K U1dlYkFzc2VtYmx5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1i bHkuY3BwCmluZGV4IDJiYWY5NzI4OGE2MTM4MzVhOTcwMWNhYTE3MGYyZWQ5OWY1M2MyOTAuLjU3 MDE1NjBhYjY3MGY2NzZhZmYxMGFmNzdjMmY4ZjFjNzNjNDQxNzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1ibHkuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1ibHkuY3BwCkBAIC01Niw3ICs1Niw3IEBAIEVuY29k ZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgd2ViQXNzZW1ibHlDb21waWxlRnVuYyhFeGVjU3RhdGUq IGV4ZWMpCiAgICAgSlNWYWx1ZSBtb2R1bGUgPSBXZWJBc3NlbWJseU1vZHVsZUNvbnN0cnVjdG9y OjpjcmVhdGVNb2R1bGUoZXhlYywgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLT5XZWJBc3Nl bWJseU1vZHVsZVN0cnVjdHVyZSgpKTsKICAgICBpZiAoRXhjZXB0aW9uKiBleGNlcHRpb24gPSBj YXRjaFNjb3BlLmV4Y2VwdGlvbigpKSB7CiAgICAgICAgIGNhdGNoU2NvcGUuY2xlYXJFeGNlcHRp b24oKTsKLSAgICAgICAgcHJvbWlzZS0+cmVqZWN0KGV4ZWMsIGV4Y2VwdGlvbik7CisgICAgICAg IHByb21pc2UtPnJlamVjdChleGVjLCBleGNlcHRpb24tPnZhbHVlKCkpOwogICAgICAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKHByb21pc2UtPnByb21pc2UoKSk7CiAgICAgfQogCmRpZmYgLS1n aXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQxMGU1Y2Jm YTFiOTk1MjBlMjVhNmYxODVjNGFmYThlMjBlNGI1MDcuLmY4NTIzMzFhNmFjMmQ3YWVjNjc5Nzcy M2JiMDhmODIyYWFmNDdkMmUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pT VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMDEtMzAgIFl1c3VrZSBTdXp1 a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKKyAgICAgICAgW0pTQ10gTWFrZSBFeGNlcHRp b24gSlNDZWxsIGFuZCBkbyBub3QgcmVqZWN0IFdlYkFzc2VtYmx5LmNvbXBpbGUoKSB3aXRoIEV4 Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY3NTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiB3YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qczoKKyAgICAgICAgKGFzeW5jLnRlc3RQcm9t aXNlQVBJKToKKwogMjAxNy0wMS0yNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAogICAgICAgICBMaWZ0IHRlbXBsYXRlIGVzY2FwZSBzZXF1ZW5jZSByZXN0cmljdGlv bnMgaW4gdGFnZ2VkIHRlbXBsYXRlcwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy93YXNtL2pzLWFwaS9N b2R1bGUtY29tcGlsZS5qcyBiL0pTVGVzdHMvd2FzbS9qcy1hcGkvTW9kdWxlLWNvbXBpbGUuanMK aW5kZXggMzNhYjUxMzVkYTZkMGYyYTFkYTJkNjZlYWIyZjdmMjE5ZWZmNzc0Mi4uZjM0M2M2ZTkz YzczMTI1ZTQ5YWQ5M2Y0YWE3MmExYTA5ZTY5ZTJiYiAxMDA2NDQKLS0tIGEvSlNUZXN0cy93YXNt L2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcworKysgYi9KU1Rlc3RzL3dhc20vanMtYXBpL01vZHVs ZS1jb21waWxlLmpzCkBAIC0yOCw2ICsyOCwxOCBAQCBhc3luYyBmdW5jdGlvbiB0ZXN0UHJvbWlz ZUFQSSgpIHsKICAgICB7CiAgICAgICAgIGxldCB0aHJldyA9IGZhbHNlOwogICAgICAgICB0cnkg eworICAgICAgICAgICAgYXdhaXQgV2ViQXNzZW1ibHkuY29tcGlsZSgpOworICAgICAgICB9IGNh dGNoKGUpIHsKKyAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsKKyAgICAgICAgICAgIGFzc2VydC50 cnV0aHkoZSBpbnN0YW5jZW9mIFR5cGVFcnJvcik7CisgICAgICAgICAgICBhc3NlcnQuZXEoZS5t ZXNzYWdlLCAiZmlyc3QgYXJndW1lbnQgbXVzdCBiZSBhbiBBcnJheUJ1ZmZlclZpZXcgb3IgYW4g QXJyYXlCdWZmZXIgKGV2YWx1YXRpbmcgJ1dlYkFzc2VtYmx5LmNvbXBpbGUoKScpIik7CisgICAg ICAgIH0KKyAgICAgICAgYXNzZXJ0LnRydXRoeSh0aHJldyk7CisgICAgfQorCisgICAgeworICAg ICAgICBsZXQgdGhyZXcgPSBmYWxzZTsKKyAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIGF3YWl0 IFdlYkFzc2VtYmx5LmNvbXBpbGUoMjApOwogICAgICAgICB9IGNhdGNoKGUpIHsKICAgICAgICAg ICAgIHRocmV3ID0gdHJ1ZTsK 300102 2017-01-30 07:11:13 -0800 2017-01-30 07:15:05 -0800 Patch bug-167585-20170131000903.patch text/plain 12114 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YjhkOGU4YTFkMGM3MmRhMDk0YTU4M2MwZTc5MzlhMDNkMzA1N2MxLi5iYzg5NWU4Njc4OTIxYmNk YTJhNTdhOGMxYjM1NmE1MGQ0YjU2Mzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNy0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBNYWtlIEV4Y2VwdGlvbiBKU0NlbGwgYW5kIGRvIG5vdCBy ZWplY3QgV2ViQXNzZW1ibHkuY29tcGlsZSgpIHdpdGggRXhjZXB0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc1ODUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQgY3Jhc2hlcyB3aGVuIGV4 ZWN1dGluZyBgV2ViQXNzZW1ibHkuY29tcGlsZSgpYCBvbiB0aGUgV2ViIEluc3BlY3Rvci4KKyAg ICAgICAgVGhpcyBpcyBiZWNhdXNlIHdlIGFjY2lkZW50YWxseSByZWplY3QgdGhlIHByb21pc2Ug d2l0aCBFeGNlcHRpb24gKG5vdCBFcnJvcikuCisgICAgICAgIEl0IGV4cG9zZXMgRXhjZXB0aW9u IHRvIHVzZXIgc3BhY2UuIEFuZCB1bnNhZmUgb3BlcmF0aW9ucyBvbnRvIEV4Y2VwdGlvbiBjYXVz ZXMKKyAgICAgICAgY3Jhc2guCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgd2UgcmVqZWN0IHRo ZSBwcm9taXNlIHdpdGggRXhjZXB0aW9uOjp2YWx1ZSgpLiBGdXJ0aGVybW9yZSwgd2UKKyAgICAg ICAgY29udmVydCBFeGNlcHRpb24gdG8gSlNDZWxsLiBQcmV2aW91c2x5LCBFeGNlcHRpb24gaW5o ZXJpdHMgSlNOb25GaW5hbE9iamVjdC4KKyAgICAgICAgQnV0IGl0IGlzIG5vdCBjb3JyZWN0IHNp bmNlIEV4Y2VwdGlvbiBoYXMgSW1tb3J0YWxTdHJ1Y3R1cmUuIEFuZCBFeGNlcHRpb24ncworICAg ICAgICBzdHJ1Y3R1cmUoKS0+Z2xvYmFsT2JqZWN0KCkgaXMgbnVsbHB0ci4gSXQgaXMgbm90IHN1 aXRhYmxlIGZvciBKU09iamVjdC4KKworICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVy LmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OmV4ZWN1dGUpOgorICAgICAgICAqIHJ1 bnRpbWUvRXhjZXB0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6RXhjZXB0aW9uOjpjcmVhdGVTdHJ1 Y3R1cmUpOgorICAgICAgICAoSlNDOjpFeGNlcHRpb246OnZpc2l0Q2hpbGRyZW4pOgorICAgICAg ICAqIHJ1bnRpbWUvRXhjZXB0aW9uLmg6CisgICAgICAgICogcnVudGltZS9Qcm9ncmFtRXhlY3V0 YWJsZS5jcHA6CisgICAgICAgIChKU0M6OlByb2dyYW1FeGVjdXRhYmxlOjppbml0aWFsaXplR2xv YmFsUHJvcGVydGllcyk6CisgICAgICAgICogd2FzbS9KU1dlYkFzc2VtYmx5LmNwcDoKKyAgICAg ICAgKEpTQzo6d2ViQXNzZW1ibHlDb21waWxlRnVuYyk6CisKIDIwMTctMDEtMjggIE1hdHQgQmFr ZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5lZWQg c29tZSBsaW1pdCBvbiBBc3luYyBDYWxsIFN0YWNrcyBmb3IgYXN5bmMgbG9vcHMgKHJBRiBsb29w cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnBy ZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIu Y3BwCmluZGV4IDE1OTMwODM1ZjQ5NDMxNmRkMmFiNWJkMWJmZTExNjQzZWUxNTI4NjkuLjg1NjUz OWRjNmMxNWIyMDE1MTg4ZTllYjQ3MDIwNTY2M2E1NzdmZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAtODQ0LDggKzg0NCw4 IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoUHJvZ3JhbUV4ZWN1dGFibGUqIHByb2dy YW0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBKCiAgICAgVk1FbnRyeVNjb3BlIGVudHJ5U2NvcGUo dm0sIHNjb3BlLT5nbG9iYWxPYmplY3QoKSk7CiAKICAgICAvLyBDb21waWxlIHNvdXJjZSB0byBi eXRlY29kZSBpZiBuZWNlc3Nhcnk6Ci0gICAgaWYgKEpTT2JqZWN0KiBlcnJvciA9IHByb2dyYW0t PmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKHZtLCBjYWxsRnJhbWUsIHNjb3BlKSkKLSAgICAg ICAgcmV0dXJuIGNoZWNrZWRSZXR1cm4odGhyb3dFeGNlcHRpb24oY2FsbEZyYW1lLCB0aHJvd1Nj b3BlLCBlcnJvcikpOworICAgIHByb2dyYW0tPmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKHZt LCBjYWxsRnJhbWUsIHNjb3BlKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUs IHsgfSk7CiAKICAgICBQcm9ncmFtQ29kZUJsb2NrKiBjb2RlQmxvY2s7CiAgICAgewpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5jcHAKaW5kZXggOTMxNzVlZTQ0OTgx MGVkYjVjYTAxOTdiMDFmMjljYzI1OGVmYzIxZS4uZTAxMWMxNGU5ZmY0MTBjNjk5ZDllZmM1NDc5 ZTdmM2ZlNDA5ZDNmMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv RXhjZXB0aW9uLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGNlcHRp b24uY3BwCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi1jb25zdCBDbGFz c0luZm8gRXhjZXB0aW9uOjpzX2luZm8gPSB7ICJFeGNlcHRpb24iLCAmQmFzZTo6c19pbmZvLCAw LCBDUkVBVEVfTUVUSE9EX1RBQkxFKEV4Y2VwdGlvbikgfTsKK2NvbnN0IENsYXNzSW5mbyBFeGNl cHRpb246OnNfaW5mbyA9IHsgIkV4Y2VwdGlvbiIsIG51bGxwdHIsIG51bGxwdHIsIENSRUFURV9N RVRIT0RfVEFCTEUoRXhjZXB0aW9uKSB9OwogCiBFeGNlcHRpb24qIEV4Y2VwdGlvbjo6Y3JlYXRl KFZNJiB2bSwgSlNWYWx1ZSB0aHJvd25WYWx1ZSwgU3RhY2tDYXB0dXJlQWN0aW9uIGFjdGlvbikK IHsKQEAgLTQ4LDE2ICs0OCwxNiBAQCB2b2lkIEV4Y2VwdGlvbjo6ZGVzdHJveShKU0NlbGwqIGNl bGwpCiAKIFN0cnVjdHVyZSogRXhjZXB0aW9uOjpjcmVhdGVTdHJ1Y3R1cmUoVk0mIHZtLCBKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSkKIHsKLSAgICByZXR1 cm4gU3RydWN0dXJlOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgcHJvdG90eXBlLCBUeXBlSW5m byhPYmplY3RUeXBlLCBTdHJ1Y3R1cmVGbGFncyksIGluZm8oKSk7CisgICAgcmV0dXJuIFN0cnVj dHVyZTo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QsIHByb3RvdHlwZSwgVHlwZUluZm8oQ2VsbFR5 cGUsIFN0cnVjdHVyZUZsYWdzKSwgaW5mbygpKTsKIH0KIAogdm9pZCBFeGNlcHRpb246OnZpc2l0 Q2hpbGRyZW4oSlNDZWxsKiBjZWxsLCBTbG90VmlzaXRvciYgdmlzaXRvcikKIHsKLSAgICBFeGNl cHRpb24qIHRoaXNPYmplY3QgPSBqc0Nhc3Q8RXhjZXB0aW9uKj4oY2VsbCk7Ci0gICAgQVNTRVJU X0dDX09CSkVDVF9JTkhFUklUUyh0aGlzT2JqZWN0LCBpbmZvKCkpOwotICAgIEJhc2U6OnZpc2l0 Q2hpbGRyZW4odGhpc09iamVjdCwgdmlzaXRvcik7CisgICAgRXhjZXB0aW9uKiB0aGlzQ2VsbCA9 IGpzQ2FzdDxFeGNlcHRpb24qPihjZWxsKTsKKyAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRT KHRoaXNDZWxsLCBpbmZvKCkpOworICAgIEJhc2U6OnZpc2l0Q2hpbGRyZW4odGhpc0NlbGwsIHZp c2l0b3IpOwogCi0gICAgdmlzaXRvci5hcHBlbmQodGhpc09iamVjdC0+bV92YWx1ZSk7CisgICAg dmlzaXRvci5hcHBlbmQodGhpc0NlbGwtPm1fdmFsdWUpOwogfQogCiBFeGNlcHRpb246OkV4Y2Vw dGlvbihWTSYgdm0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9F eGNlcHRpb24uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5oCmlu ZGV4IDU1Yjc5NTcyYjMzNTU0ZTA5NmQ5NTM4OGZkYTMzZDk5NjgxYmExYzQuLjQ0ZWI5NzI5MTMx YWM4YTExMmMxNDZmYjNkOTk4MjhlMDlmOWM1Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0V4Y2VwdGlvbi5oCkBAIC0zMSw5ICszMSw5IEBACiAKIG5hbWVzcGFjZSBKU0Mgewog ICAgIAotY2xhc3MgRXhjZXB0aW9uIDogcHVibGljIEpTTm9uRmluYWxPYmplY3QgeworY2xhc3Mg RXhjZXB0aW9uIDogcHVibGljIEpTQ2VsbCB7CiBwdWJsaWM6Ci0gICAgdHlwZWRlZiBKU05vbkZp bmFsT2JqZWN0IEJhc2U7CisgICAgdXNpbmcgQmFzZSA9IEpTQ2VsbDsKICAgICBzdGF0aWMgY29u c3QgdW5zaWduZWQgU3RydWN0dXJlRmxhZ3MgPSBTdHJ1Y3R1cmVJc0ltbW9ydGFsIHwgQmFzZTo6 U3RydWN0dXJlRmxhZ3M7CiAKICAgICBlbnVtIFN0YWNrQ2FwdHVyZUFjdGlvbiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9ncmFtRXhlY3V0YWJsZS5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9ncmFtRXhlY3V0YWJsZS5jcHAKaW5k ZXggNmE0Zjk0YWU3Y2I0YjA4YmJmNTNhODU5YTJmNjY2MzNkNjZjZjU4NC4uOTk4OTRmMThkOGZm M2UzMzVhYTYyNTU4OWQzNzA4ZDBhODkwMjkyNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvUHJvZ3JhbUV4ZWN1dGFibGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1Byb2dyYW1FeGVjdXRhYmxlLmNwcApAQCAtOTEsMTQgKzkxLDEyIEBA IEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMo Vk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgIGdsb2JhbE9iamVjdC0+ZGVidWdnZXIo KS0+c291cmNlUGFyc2VkKGNhbGxGcmFtZSwgc291cmNlKCkucHJvdmlkZXIoKSwgZXJyb3IubGlu ZSgpLCBlcnJvci5tZXNzYWdlKCkpOwogCiAgICAgaWYgKGVycm9yLmlzVmFsaWQoKSkKLSAgICAg ICAgcmV0dXJuIGVycm9yLnRvRXJyb3JPYmplY3QoZ2xvYmFsT2JqZWN0LCBzb3VyY2UoKSk7Cisg ICAgICAgIHJldHVybiB0aHJvd1Njb3BlLnRocm93RXhjZXB0aW9uKGdsb2JhbE9iamVjdC0+Z2xv YmFsRXhlYygpLCBlcnJvci50b0Vycm9yT2JqZWN0KGdsb2JhbE9iamVjdCwgc291cmNlKCkpKTsK IAogICAgIEpTVmFsdWUgbmV4dFByb3RvdHlwZSA9IGdsb2JhbE9iamVjdC0+Z2V0UHJvdG90eXBl RGlyZWN0KCk7CiAgICAgd2hpbGUgKG5leHRQcm90b3R5cGUgJiYgbmV4dFByb3RvdHlwZS5pc09i amVjdCgpKSB7Ci0gICAgICAgIGlmIChVTkxJS0VMWShhc09iamVjdChuZXh0UHJvdG90eXBlKS0+ dHlwZSgpID09IFByb3h5T2JqZWN0VHlwZSkpIHsKLSAgICAgICAgICAgIEV4ZWNTdGF0ZSogZXhl YyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwotICAgICAgICAgICAgcmV0dXJuIGNyZWF0 ZVR5cGVFcnJvcihleGVjLCBBU0NJSUxpdGVyYWwoIlByb3h5IGlzIG5vdCBhbGxvd2VkIGluIHRo ZSBnbG9iYWwgcHJvdG90eXBlIGNoYWluLiIpKTsKLSAgICAgICAgfQorICAgICAgICBpZiAoVU5M SUtFTFkoYXNPYmplY3QobmV4dFByb3RvdHlwZSktPnR5cGUoKSA9PSBQcm94eU9iamVjdFR5cGUp KQorICAgICAgICAgICAgcmV0dXJuIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdC0+Z2xvYmFs RXhlYygpLCB0aHJvd1Njb3BlLCBBU0NJSUxpdGVyYWwoIlByb3h5IGlzIG5vdCBhbGxvd2VkIGlu IHRoZSBnbG9iYWwgcHJvdG90eXBlIGNoYWluLiIpKTsKICAgICAgICAgbmV4dFByb3RvdHlwZSA9 IGFzT2JqZWN0KG5leHRQcm90b3R5cGUpLT5nZXRQcm90b3R5cGVEaXJlY3QoKTsKICAgICB9CiAg ICAgCkBAIC0xMTIsMTQgKzExMCwxNCBAQCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFibGU6Omlu aXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRgogICAgICAg ICAvLyBDaGVjayBmb3IgaW50ZXJzZWN0aW9uIG9mICJ2YXIiIGFuZCAibGV0Ii8iY29uc3QiLyJj bGFzcyIKICAgICAgICAgZm9yIChhdXRvJiBlbnRyeSA6IGxleGljYWxEZWNsYXJhdGlvbnMpIHsK ICAgICAgICAgICAgIGlmICh2YXJpYWJsZURlY2xhcmF0aW9ucy5jb250YWlucyhlbnRyeS5rZXkp KQotICAgICAgICAgICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJvcihleGVjLCBtYWtlU3Ry aW5nKCJDYW4ndCBjcmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlOiAnIiwgU3RyaW5nKGVudHJ5Lmtl eS5nZXQoKSksICInIikpOworICAgICAgICAgICAgICAgIHJldHVybiB0aHJvd1N5bnRheEVycm9y KGV4ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFy aWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CiAgICAgICAgIH0KIAog ICAgICAgICAvLyBDaGVjayBpZiBhbnkgbmV3ICJsZXQiLyJjb25zdCIvImNsYXNzIiB3aWxsIHNo YWRvdyBhbnkgcHJlLWV4aXN0aW5nIGdsb2JhbCBwcm9wZXJ0eSBuYW1lcywgb3IgInZhciIvImxl dCIvImNvbnN0IiB2YXJpYWJsZXMuCiAgICAgICAgIC8vIEl0J3MgYW4gZXJyb3IgdG8gaW50cm9k dWNlIGEgc2hhZG93LgogICAgICAgICBmb3IgKGF1dG8mIGVudHJ5IDogbGV4aWNhbERlY2xhcmF0 aW9ucykgewogICAgICAgICAgICAgYm9vbCBoYXNQcm9wZXJ0eSA9IGdsb2JhbE9iamVjdC0+aGFz UHJvcGVydHkoZXhlYywgZW50cnkua2V5LmdldCgpKTsKLSAgICAgICAgICAgIFJFVFVSTl9JRl9F WENFUFRJT04odGhyb3dTY29wZSwgdGhyb3dTY29wZS5leGNlcHRpb24oKSk7CisgICAgICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIG51bGxwdHIpOwogICAgICAgICAgICAg aWYgKGhhc1Byb3BlcnR5KSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlIEVTNiBzcGVjIHNheXMg dGhhdCBqdXN0IFJlc3RyaWN0ZWRHbG9iYWxQcm9wZXJ0eSBjYW4ndCBiZSBzaGFkb3dlZAogICAg ICAgICAgICAgICAgIC8vIFRoaXMgY2FycmllZCBvdXQgc2VjdGlvbiA4LjEuMS40LjE0IG9mIHRo ZSBFUzYgc3BlYzogaHR0cDovL3d3dy5lY21hLWludGVybmF0aW9uYWwub3JnL2VjbWEtMjYyLzYu MC9pbmRleC5odG1sI3NlYy1oYXNyZXN0cmljdGVkZ2xvYmFscHJvcGVydHkKQEAgLTEyNywxMSAr MTI1LDExIEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFBy b3BlcnRpZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgICAgICAgICAgZ2xvYmFs T2JqZWN0LT5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoZXhlYywgZW50cnkua2V5LmdldCgpLCBk ZXNjcmlwdG9yKTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAoZGVzY3Jp cHRvci52YWx1ZSgpICE9IGpzVW5kZWZpbmVkKCkgJiYgIWRlc2NyaXB0b3IuY29uZmlndXJhYmxl KCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJvcihleGVjLCBt YWtlU3RyaW5nKCJDYW4ndCBjcmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlIHRoYXQgc2hhZG93cyBh IGdsb2JhbCBwcm9wZXJ0eTogJyIsIFN0cmluZyhlbnRyeS5rZXkuZ2V0KCkpLCAiJyIpKTsKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHRocm93U3ludGF4RXJyb3IoZXhlYywgdGhyb3dTY29w ZSwgbWFrZVN0cmluZygiQ2FuJ3QgY3JlYXRlIGR1cGxpY2F0ZSB2YXJpYWJsZSB0aGF0IHNoYWRv d3MgYSBnbG9iYWwgcHJvcGVydHk6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7 CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGhhc1Byb3BlcnR5ID0gZ2xvYmFsTGV4aWNh bEVudmlyb25tZW50LT5oYXNQcm9wZXJ0eShleGVjLCBlbnRyeS5rZXkuZ2V0KCkpOwotICAgICAg ICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4Y2VwdGlv bigpKTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgbnVsbHB0 cik7CiAgICAgICAgICAgICBpZiAoaGFzUHJvcGVydHkpIHsKICAgICAgICAgICAgICAgICBpZiAo VU5MSUtFTFkoZW50cnkudmFsdWUuaXNDb25zdCgpICYmICF2bS5nbG9iYWxDb25zdFJlZGVjbGFy YXRpb25TaG91bGRUaHJvdygpICYmICFpc1N0cmljdE1vZGUoKSkpIHsKICAgICAgICAgICAgICAg ICAgICAgLy8gV2Ugb25seSBhbGxvdyAiY29uc3QiIGR1cGxpY2F0ZSBkZWNsYXJhdGlvbnMgdW5k ZXIgdGhpcyBzZXR0aW5nLgpAQCAtMTM5LDcgKzEzNyw3IEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhl Y3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNh bGxGCiAgICAgICAgICAgICAgICAgICAgIGlmIChnbG9iYWxMZXhpY2FsRW52aXJvbm1lbnQtPmlz Q29uc3RWYXJpYWJsZShlbnRyeS5rZXkuZ2V0KCkpKQogICAgICAgICAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHJldHVybiBjcmVh dGVTeW50YXhFcnJvcihleGVjLCBtYWtlU3RyaW5nKCJDYW4ndCBjcmVhdGUgZHVwbGljYXRlIHZh cmlhYmxlOiAnIiwgU3RyaW5nKGVudHJ5LmtleS5nZXQoKSksICInIikpOworICAgICAgICAgICAg ICAgIHJldHVybiB0aHJvd1N5bnRheEVycm9yKGV4ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmco IkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5Lmdl dCgpKSwgIiciKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAtMTQ4LDkgKzE0Niw5 IEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRp ZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgIGlmICghZ2xvYmFsTGV4aWNhbEVu dmlyb25tZW50LT5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGZvciAoYXV0byYgZW50cnkgOiB2 YXJpYWJsZURlY2xhcmF0aW9ucykgewogICAgICAgICAgICAgICAgIGJvb2wgaGFzUHJvcGVydHkg PSBnbG9iYWxMZXhpY2FsRW52aXJvbm1lbnQtPmhhc1Byb3BlcnR5KGV4ZWMsIGVudHJ5LmtleS5n ZXQoKSk7Ci0gICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0 aHJvd1Njb3BlLmV4Y2VwdGlvbigpKTsKKyAgICAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHRocm93U2NvcGUsIG51bGxwdHIpOwogICAgICAgICAgICAgICAgIGlmIChoYXNQcm9wZXJ0 eSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVN5bnRheEVycm9yKGV4ZWMsIG1h a2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50 cnkua2V5LmdldCgpKSwgIiciKSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0aHJvd1N5 bnRheEVycm9yKGV4ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBs aWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvd2FzbS9KU1dlYkFzc2VtYmx5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L0pTV2ViQXNzZW1ibHkuY3BwCmluZGV4IDJiYWY5NzI4OGE2MTM4MzVhOTcwMWNhYTE3MGYyZWQ5 OWY1M2MyOTAuLjU3MDE1NjBhYjY3MGY2NzZhZmYxMGFmNzdjMmY4ZjFjNzNjNDQxNzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1ibHkuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1ibHkuY3BwCkBAIC01Niw3ICs1 Niw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgd2ViQXNzZW1ibHlDb21waWxlRnVu YyhFeGVjU3RhdGUqIGV4ZWMpCiAgICAgSlNWYWx1ZSBtb2R1bGUgPSBXZWJBc3NlbWJseU1vZHVs ZUNvbnN0cnVjdG9yOjpjcmVhdGVNb2R1bGUoZXhlYywgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVj dCgpLT5XZWJBc3NlbWJseU1vZHVsZVN0cnVjdHVyZSgpKTsKICAgICBpZiAoRXhjZXB0aW9uKiBl eGNlcHRpb24gPSBjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKSB7CiAgICAgICAgIGNhdGNoU2NvcGUu Y2xlYXJFeGNlcHRpb24oKTsKLSAgICAgICAgcHJvbWlzZS0+cmVqZWN0KGV4ZWMsIGV4Y2VwdGlv bik7CisgICAgICAgIHByb21pc2UtPnJlamVjdChleGVjLCBleGNlcHRpb24tPnZhbHVlKCkpOwog ICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHByb21pc2UtPnByb21pc2UoKSk7CiAgICAg fQogCmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IGQxMGU1Y2JmYTFiOTk1MjBlMjVhNmYxODVjNGFmYThlMjBlNGI1MDcuLmY4NTIzMzFhNmFj MmQ3YWVjNjc5NzcyM2JiMDhmODIyYWFmNDdkMmUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdl TG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMDEtMzAg IFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKKyAgICAgICAgW0pTQ10g TWFrZSBFeGNlcHRpb24gSlNDZWxsIGFuZCBkbyBub3QgcmVqZWN0IFdlYkFzc2VtYmx5LmNvbXBp bGUoKSB3aXRoIEV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY3NTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qczoKKyAgICAgICAgKGFz eW5jLnRlc3RQcm9taXNlQVBJKToKKwogMjAxNy0wMS0yNyAgWXVzdWtlIFN1enVraSAgPHV0YXRh bmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBMaWZ0IHRlbXBsYXRlIGVzY2FwZSBzZXF1ZW5j ZSByZXN0cmljdGlvbnMgaW4gdGFnZ2VkIHRlbXBsYXRlcwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy93 YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcyBiL0pTVGVzdHMvd2FzbS9qcy1hcGkvTW9kdWxl LWNvbXBpbGUuanMKaW5kZXggMzNhYjUxMzVkYTZkMGYyYTFkYTJkNjZlYWIyZjdmMjE5ZWZmNzc0 Mi4uZjM0M2M2ZTkzYzczMTI1ZTQ5YWQ5M2Y0YWE3MmExYTA5ZTY5ZTJiYiAxMDA2NDQKLS0tIGEv SlNUZXN0cy93YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcworKysgYi9KU1Rlc3RzL3dhc20v anMtYXBpL01vZHVsZS1jb21waWxlLmpzCkBAIC0yOCw2ICsyOCwxOCBAQCBhc3luYyBmdW5jdGlv biB0ZXN0UHJvbWlzZUFQSSgpIHsKICAgICB7CiAgICAgICAgIGxldCB0aHJldyA9IGZhbHNlOwog ICAgICAgICB0cnkgeworICAgICAgICAgICAgYXdhaXQgV2ViQXNzZW1ibHkuY29tcGlsZSgpOwor ICAgICAgICB9IGNhdGNoKGUpIHsKKyAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsKKyAgICAgICAg ICAgIGFzc2VydC50cnV0aHkoZSBpbnN0YW5jZW9mIFR5cGVFcnJvcik7CisgICAgICAgICAgICBh c3NlcnQuZXEoZS5tZXNzYWdlLCAiZmlyc3QgYXJndW1lbnQgbXVzdCBiZSBhbiBBcnJheUJ1ZmZl clZpZXcgb3IgYW4gQXJyYXlCdWZmZXIgKGV2YWx1YXRpbmcgJ1dlYkFzc2VtYmx5LmNvbXBpbGUo KScpIik7CisgICAgICAgIH0KKyAgICAgICAgYXNzZXJ0LnRydXRoeSh0aHJldyk7CisgICAgfQor CisgICAgeworICAgICAgICBsZXQgdGhyZXcgPSBmYWxzZTsKKyAgICAgICAgdHJ5IHsKICAgICAg ICAgICAgIGF3YWl0IFdlYkFzc2VtYmx5LmNvbXBpbGUoMjApOwogICAgICAgICB9IGNhdGNoKGUp IHsKICAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsK 300104 2017-01-30 07:15:09 -0800 2017-01-30 07:31:46 -0800 Patch bug-167585-20170131001300.patch text/plain 12120 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YjhkOGU4YTFkMGM3MmRhMDk0YTU4M2MwZTc5MzlhMDNkMzA1N2MxLi5iYzg5NWU4Njc4OTIxYmNk YTJhNTdhOGMxYjM1NmE1MGQ0YjU2Mzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNy0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBNYWtlIEV4Y2VwdGlvbiBKU0NlbGwgYW5kIGRvIG5vdCBy ZWplY3QgV2ViQXNzZW1ibHkuY29tcGlsZSgpIHdpdGggRXhjZXB0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc1ODUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQgY3Jhc2hlcyB3aGVuIGV4 ZWN1dGluZyBgV2ViQXNzZW1ibHkuY29tcGlsZSgpYCBvbiB0aGUgV2ViIEluc3BlY3Rvci4KKyAg ICAgICAgVGhpcyBpcyBiZWNhdXNlIHdlIGFjY2lkZW50YWxseSByZWplY3QgdGhlIHByb21pc2Ug d2l0aCBFeGNlcHRpb24gKG5vdCBFcnJvcikuCisgICAgICAgIEl0IGV4cG9zZXMgRXhjZXB0aW9u IHRvIHVzZXIgc3BhY2UuIEFuZCB1bnNhZmUgb3BlcmF0aW9ucyBvbnRvIEV4Y2VwdGlvbiBjYXVz ZXMKKyAgICAgICAgY3Jhc2guCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgd2UgcmVqZWN0IHRo ZSBwcm9taXNlIHdpdGggRXhjZXB0aW9uOjp2YWx1ZSgpLiBGdXJ0aGVybW9yZSwgd2UKKyAgICAg ICAgY29udmVydCBFeGNlcHRpb24gdG8gSlNDZWxsLiBQcmV2aW91c2x5LCBFeGNlcHRpb24gaW5o ZXJpdHMgSlNOb25GaW5hbE9iamVjdC4KKyAgICAgICAgQnV0IGl0IGlzIG5vdCBjb3JyZWN0IHNp bmNlIEV4Y2VwdGlvbiBoYXMgSW1tb3J0YWxTdHJ1Y3R1cmUuIEFuZCBFeGNlcHRpb24ncworICAg ICAgICBzdHJ1Y3R1cmUoKS0+Z2xvYmFsT2JqZWN0KCkgaXMgbnVsbHB0ci4gSXQgaXMgbm90IHN1 aXRhYmxlIGZvciBKU09iamVjdC4KKworICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVy LmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OmV4ZWN1dGUpOgorICAgICAgICAqIHJ1 bnRpbWUvRXhjZXB0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6RXhjZXB0aW9uOjpjcmVhdGVTdHJ1 Y3R1cmUpOgorICAgICAgICAoSlNDOjpFeGNlcHRpb246OnZpc2l0Q2hpbGRyZW4pOgorICAgICAg ICAqIHJ1bnRpbWUvRXhjZXB0aW9uLmg6CisgICAgICAgICogcnVudGltZS9Qcm9ncmFtRXhlY3V0 YWJsZS5jcHA6CisgICAgICAgIChKU0M6OlByb2dyYW1FeGVjdXRhYmxlOjppbml0aWFsaXplR2xv YmFsUHJvcGVydGllcyk6CisgICAgICAgICogd2FzbS9KU1dlYkFzc2VtYmx5LmNwcDoKKyAgICAg ICAgKEpTQzo6d2ViQXNzZW1ibHlDb21waWxlRnVuYyk6CisKIDIwMTctMDEtMjggIE1hdHQgQmFr ZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5lZWQg c29tZSBsaW1pdCBvbiBBc3luYyBDYWxsIFN0YWNrcyBmb3IgYXN5bmMgbG9vcHMgKHJBRiBsb29w cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnBy ZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIu Y3BwCmluZGV4IDE1OTMwODM1ZjQ5NDMxNmRkMmFiNWJkMWJmZTExNjQzZWUxNTI4NjkuLjU1NDc3 OWJkODRhYzE4NGExMGM3NmE3ODJjOWFlNTBhYzNkMjBhNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAtODQ0LDggKzg0NCw4 IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoUHJvZ3JhbUV4ZWN1dGFibGUqIHByb2dy YW0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBKCiAgICAgVk1FbnRyeVNjb3BlIGVudHJ5U2NvcGUo dm0sIHNjb3BlLT5nbG9iYWxPYmplY3QoKSk7CiAKICAgICAvLyBDb21waWxlIHNvdXJjZSB0byBi eXRlY29kZSBpZiBuZWNlc3Nhcnk6Ci0gICAgaWYgKEpTT2JqZWN0KiBlcnJvciA9IHByb2dyYW0t PmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKHZtLCBjYWxsRnJhbWUsIHNjb3BlKSkKLSAgICAg ICAgcmV0dXJuIGNoZWNrZWRSZXR1cm4odGhyb3dFeGNlcHRpb24oY2FsbEZyYW1lLCB0aHJvd1Nj b3BlLCBlcnJvcikpOworICAgIHByb2dyYW0tPmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKHZt LCBjYWxsRnJhbWUsIHNjb3BlKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUs IEpTVmFsdWUoKSk7CiAKICAgICBQcm9ncmFtQ29kZUJsb2NrKiBjb2RlQmxvY2s7CiAgICAgewpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhjZXB0aW9uLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5jcHAKaW5kZXggOTMxNzVl ZTQ0OTgxMGVkYjVjYTAxOTdiMDFmMjljYzI1OGVmYzIxZS4uZTAxMWMxNGU5ZmY0MTBjNjk5ZDll ZmM1NDc5ZTdmM2ZlNDA5ZDNmMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvRXhjZXB0aW9uLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9F eGNlcHRpb24uY3BwCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi1jb25z dCBDbGFzc0luZm8gRXhjZXB0aW9uOjpzX2luZm8gPSB7ICJFeGNlcHRpb24iLCAmQmFzZTo6c19p bmZvLCAwLCBDUkVBVEVfTUVUSE9EX1RBQkxFKEV4Y2VwdGlvbikgfTsKK2NvbnN0IENsYXNzSW5m byBFeGNlcHRpb246OnNfaW5mbyA9IHsgIkV4Y2VwdGlvbiIsIG51bGxwdHIsIG51bGxwdHIsIENS RUFURV9NRVRIT0RfVEFCTEUoRXhjZXB0aW9uKSB9OwogCiBFeGNlcHRpb24qIEV4Y2VwdGlvbjo6 Y3JlYXRlKFZNJiB2bSwgSlNWYWx1ZSB0aHJvd25WYWx1ZSwgU3RhY2tDYXB0dXJlQWN0aW9uIGFj dGlvbikKIHsKQEAgLTQ4LDE2ICs0OCwxNiBAQCB2b2lkIEV4Y2VwdGlvbjo6ZGVzdHJveShKU0Nl bGwqIGNlbGwpCiAKIFN0cnVjdHVyZSogRXhjZXB0aW9uOjpjcmVhdGVTdHJ1Y3R1cmUoVk0mIHZt LCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSkKIHsKLSAg ICByZXR1cm4gU3RydWN0dXJlOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgcHJvdG90eXBlLCBU eXBlSW5mbyhPYmplY3RUeXBlLCBTdHJ1Y3R1cmVGbGFncyksIGluZm8oKSk7CisgICAgcmV0dXJu IFN0cnVjdHVyZTo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QsIHByb3RvdHlwZSwgVHlwZUluZm8o Q2VsbFR5cGUsIFN0cnVjdHVyZUZsYWdzKSwgaW5mbygpKTsKIH0KIAogdm9pZCBFeGNlcHRpb246 OnZpc2l0Q2hpbGRyZW4oSlNDZWxsKiBjZWxsLCBTbG90VmlzaXRvciYgdmlzaXRvcikKIHsKLSAg ICBFeGNlcHRpb24qIHRoaXNPYmplY3QgPSBqc0Nhc3Q8RXhjZXB0aW9uKj4oY2VsbCk7Ci0gICAg QVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyh0aGlzT2JqZWN0LCBpbmZvKCkpOwotICAgIEJhc2U6 OnZpc2l0Q2hpbGRyZW4odGhpc09iamVjdCwgdmlzaXRvcik7CisgICAgRXhjZXB0aW9uKiB0aGlz Q2VsbCA9IGpzQ2FzdDxFeGNlcHRpb24qPihjZWxsKTsKKyAgICBBU1NFUlRfR0NfT0JKRUNUX0lO SEVSSVRTKHRoaXNDZWxsLCBpbmZvKCkpOworICAgIEJhc2U6OnZpc2l0Q2hpbGRyZW4odGhpc0Nl bGwsIHZpc2l0b3IpOwogCi0gICAgdmlzaXRvci5hcHBlbmQodGhpc09iamVjdC0+bV92YWx1ZSk7 CisgICAgdmlzaXRvci5hcHBlbmQodGhpc0NlbGwtPm1fdmFsdWUpOwogfQogCiBFeGNlcHRpb246 OkV4Y2VwdGlvbihWTSYgdm0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9FeGNlcHRpb24uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlv bi5oCmluZGV4IDU1Yjc5NTcyYjMzNTU0ZTA5NmQ5NTM4OGZkYTMzZDk5NjgxYmExYzQuLjQ0ZWI5 NzI5MTMxYWM4YTExMmMxNDZmYjNkOTk4MjhlMDlmOWM1Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0V4Y2VwdGlvbi5oCkBAIC0zMSw5ICszMSw5IEBACiAKIG5hbWVzcGFjZSBK U0MgewogICAgIAotY2xhc3MgRXhjZXB0aW9uIDogcHVibGljIEpTTm9uRmluYWxPYmplY3Qgewor Y2xhc3MgRXhjZXB0aW9uIDogcHVibGljIEpTQ2VsbCB7CiBwdWJsaWM6Ci0gICAgdHlwZWRlZiBK U05vbkZpbmFsT2JqZWN0IEJhc2U7CisgICAgdXNpbmcgQmFzZSA9IEpTQ2VsbDsKICAgICBzdGF0 aWMgY29uc3QgdW5zaWduZWQgU3RydWN0dXJlRmxhZ3MgPSBTdHJ1Y3R1cmVJc0ltbW9ydGFsIHwg QmFzZTo6U3RydWN0dXJlRmxhZ3M7CiAKICAgICBlbnVtIFN0YWNrQ2FwdHVyZUFjdGlvbiB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9ncmFtRXhlY3V0YWJs ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9ncmFtRXhlY3V0YWJsZS5j cHAKaW5kZXggNmE0Zjk0YWU3Y2I0YjA4YmJmNTNhODU5YTJmNjY2MzNkNjZjZjU4NC4uOTk4OTRm MThkOGZmM2UzMzVhYTYyNTU4OWQzNzA4ZDBhODkwMjkyNyAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvZ3JhbUV4ZWN1dGFibGUuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb2dyYW1FeGVjdXRhYmxlLmNwcApAQCAtOTEsMTQgKzkx LDEyIEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3Bl cnRpZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgIGdsb2JhbE9iamVjdC0+ZGVi dWdnZXIoKS0+c291cmNlUGFyc2VkKGNhbGxGcmFtZSwgc291cmNlKCkucHJvdmlkZXIoKSwgZXJy b3IubGluZSgpLCBlcnJvci5tZXNzYWdlKCkpOwogCiAgICAgaWYgKGVycm9yLmlzVmFsaWQoKSkK LSAgICAgICAgcmV0dXJuIGVycm9yLnRvRXJyb3JPYmplY3QoZ2xvYmFsT2JqZWN0LCBzb3VyY2Uo KSk7CisgICAgICAgIHJldHVybiB0aHJvd1Njb3BlLnRocm93RXhjZXB0aW9uKGdsb2JhbE9iamVj dC0+Z2xvYmFsRXhlYygpLCBlcnJvci50b0Vycm9yT2JqZWN0KGdsb2JhbE9iamVjdCwgc291cmNl KCkpKTsKIAogICAgIEpTVmFsdWUgbmV4dFByb3RvdHlwZSA9IGdsb2JhbE9iamVjdC0+Z2V0UHJv dG90eXBlRGlyZWN0KCk7CiAgICAgd2hpbGUgKG5leHRQcm90b3R5cGUgJiYgbmV4dFByb3RvdHlw ZS5pc09iamVjdCgpKSB7Ci0gICAgICAgIGlmIChVTkxJS0VMWShhc09iamVjdChuZXh0UHJvdG90 eXBlKS0+dHlwZSgpID09IFByb3h5T2JqZWN0VHlwZSkpIHsKLSAgICAgICAgICAgIEV4ZWNTdGF0 ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwotICAgICAgICAgICAgcmV0dXJu IGNyZWF0ZVR5cGVFcnJvcihleGVjLCBBU0NJSUxpdGVyYWwoIlByb3h5IGlzIG5vdCBhbGxvd2Vk IGluIHRoZSBnbG9iYWwgcHJvdG90eXBlIGNoYWluLiIpKTsKLSAgICAgICAgfQorICAgICAgICBp ZiAoVU5MSUtFTFkoYXNPYmplY3QobmV4dFByb3RvdHlwZSktPnR5cGUoKSA9PSBQcm94eU9iamVj dFR5cGUpKQorICAgICAgICAgICAgcmV0dXJuIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdC0+ Z2xvYmFsRXhlYygpLCB0aHJvd1Njb3BlLCBBU0NJSUxpdGVyYWwoIlByb3h5IGlzIG5vdCBhbGxv d2VkIGluIHRoZSBnbG9iYWwgcHJvdG90eXBlIGNoYWluLiIpKTsKICAgICAgICAgbmV4dFByb3Rv dHlwZSA9IGFzT2JqZWN0KG5leHRQcm90b3R5cGUpLT5nZXRQcm90b3R5cGVEaXJlY3QoKTsKICAg ICB9CiAgICAgCkBAIC0xMTIsMTQgKzExMCwxNCBAQCBKU09iamVjdCogUHJvZ3JhbUV4ZWN1dGFi bGU6OmluaXRpYWxpemVHbG9iYWxQcm9wZXJ0aWVzKFZNJiB2bSwgQ2FsbEZyYW1lKiBjYWxsRgog ICAgICAgICAvLyBDaGVjayBmb3IgaW50ZXJzZWN0aW9uIG9mICJ2YXIiIGFuZCAibGV0Ii8iY29u c3QiLyJjbGFzcyIKICAgICAgICAgZm9yIChhdXRvJiBlbnRyeSA6IGxleGljYWxEZWNsYXJhdGlv bnMpIHsKICAgICAgICAgICAgIGlmICh2YXJpYWJsZURlY2xhcmF0aW9ucy5jb250YWlucyhlbnRy eS5rZXkpKQotICAgICAgICAgICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJvcihleGVjLCBt YWtlU3RyaW5nKCJDYW4ndCBjcmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlOiAnIiwgU3RyaW5nKGVu dHJ5LmtleS5nZXQoKSksICInIikpOworICAgICAgICAgICAgICAgIHJldHVybiB0aHJvd1N5bnRh eEVycm9yKGV4ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNh dGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CiAgICAgICAg IH0KIAogICAgICAgICAvLyBDaGVjayBpZiBhbnkgbmV3ICJsZXQiLyJjb25zdCIvImNsYXNzIiB3 aWxsIHNoYWRvdyBhbnkgcHJlLWV4aXN0aW5nIGdsb2JhbCBwcm9wZXJ0eSBuYW1lcywgb3IgInZh ciIvImxldCIvImNvbnN0IiB2YXJpYWJsZXMuCiAgICAgICAgIC8vIEl0J3MgYW4gZXJyb3IgdG8g aW50cm9kdWNlIGEgc2hhZG93LgogICAgICAgICBmb3IgKGF1dG8mIGVudHJ5IDogbGV4aWNhbERl Y2xhcmF0aW9ucykgewogICAgICAgICAgICAgYm9vbCBoYXNQcm9wZXJ0eSA9IGdsb2JhbE9iamVj dC0+aGFzUHJvcGVydHkoZXhlYywgZW50cnkua2V5LmdldCgpKTsKLSAgICAgICAgICAgIFJFVFVS Tl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgdGhyb3dTY29wZS5leGNlcHRpb24oKSk7CisgICAg ICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIG51bGxwdHIpOwogICAgICAg ICAgICAgaWYgKGhhc1Byb3BlcnR5KSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlIEVTNiBzcGVj IHNheXMgdGhhdCBqdXN0IFJlc3RyaWN0ZWRHbG9iYWxQcm9wZXJ0eSBjYW4ndCBiZSBzaGFkb3dl ZAogICAgICAgICAgICAgICAgIC8vIFRoaXMgY2FycmllZCBvdXQgc2VjdGlvbiA4LjEuMS40LjE0 IG9mIHRoZSBFUzYgc3BlYzogaHR0cDovL3d3dy5lY21hLWludGVybmF0aW9uYWwub3JnL2VjbWEt MjYyLzYuMC9pbmRleC5odG1sI3NlYy1oYXNyZXN0cmljdGVkZ2xvYmFscHJvcGVydHkKQEAgLTEy NywxMSArMTI1LDExIEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUds b2JhbFByb3BlcnRpZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgICAgICAgICAg Z2xvYmFsT2JqZWN0LT5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoZXhlYywgZW50cnkua2V5Lmdl dCgpLCBkZXNjcmlwdG9yKTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAo ZGVzY3JpcHRvci52YWx1ZSgpICE9IGpzVW5kZWZpbmVkKCkgJiYgIWRlc2NyaXB0b3IuY29uZmln dXJhYmxlKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBjcmVhdGVTeW50YXhFcnJvcihl eGVjLCBtYWtlU3RyaW5nKCJDYW4ndCBjcmVhdGUgZHVwbGljYXRlIHZhcmlhYmxlIHRoYXQgc2hh ZG93cyBhIGdsb2JhbCBwcm9wZXJ0eTogJyIsIFN0cmluZyhlbnRyeS5rZXkuZ2V0KCkpLCAiJyIp KTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRocm93U3ludGF4RXJyb3IoZXhlYywgdGhy b3dTY29wZSwgbWFrZVN0cmluZygiQ2FuJ3QgY3JlYXRlIGR1cGxpY2F0ZSB2YXJpYWJsZSB0aGF0 IHNoYWRvd3MgYSBnbG9iYWwgcHJvcGVydHk6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwg IiciKSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGhhc1Byb3BlcnR5ID0gZ2xvYmFs TGV4aWNhbEVudmlyb25tZW50LT5oYXNQcm9wZXJ0eShleGVjLCBlbnRyeS5rZXkuZ2V0KCkpOwot ICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4 Y2VwdGlvbigpKTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwg bnVsbHB0cik7CiAgICAgICAgICAgICBpZiAoaGFzUHJvcGVydHkpIHsKICAgICAgICAgICAgICAg ICBpZiAoVU5MSUtFTFkoZW50cnkudmFsdWUuaXNDb25zdCgpICYmICF2bS5nbG9iYWxDb25zdFJl ZGVjbGFyYXRpb25TaG91bGRUaHJvdygpICYmICFpc1N0cmljdE1vZGUoKSkpIHsKICAgICAgICAg ICAgICAgICAgICAgLy8gV2Ugb25seSBhbGxvdyAiY29uc3QiIGR1cGxpY2F0ZSBkZWNsYXJhdGlv bnMgdW5kZXIgdGhpcyBzZXR0aW5nLgpAQCAtMTM5LDcgKzEzNyw3IEBAIEpTT2JqZWN0KiBQcm9n cmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFByb3BlcnRpZXMoVk0mIHZtLCBDYWxsRnJh bWUqIGNhbGxGCiAgICAgICAgICAgICAgICAgICAgIGlmIChnbG9iYWxMZXhpY2FsRW52aXJvbm1l bnQtPmlzQ29uc3RWYXJpYWJsZShlbnRyeS5rZXkuZ2V0KCkpKQogICAgICAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHJldHVy biBjcmVhdGVTeW50YXhFcnJvcihleGVjLCBtYWtlU3RyaW5nKCJDYW4ndCBjcmVhdGUgZHVwbGlj YXRlIHZhcmlhYmxlOiAnIiwgU3RyaW5nKGVudHJ5LmtleS5nZXQoKSksICInIikpOworICAgICAg ICAgICAgICAgIHJldHVybiB0aHJvd1N5bnRheEVycm9yKGV4ZWMsIHRocm93U2NvcGUsIG1ha2VT dHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnku a2V5LmdldCgpKSwgIiciKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAtMTQ4LDkg KzE0Niw5IEBAIEpTT2JqZWN0KiBQcm9ncmFtRXhlY3V0YWJsZTo6aW5pdGlhbGl6ZUdsb2JhbFBy b3BlcnRpZXMoVk0mIHZtLCBDYWxsRnJhbWUqIGNhbGxGCiAgICAgICAgIGlmICghZ2xvYmFsTGV4 aWNhbEVudmlyb25tZW50LT5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGZvciAoYXV0byYgZW50 cnkgOiB2YXJpYWJsZURlY2xhcmF0aW9ucykgewogICAgICAgICAgICAgICAgIGJvb2wgaGFzUHJv cGVydHkgPSBnbG9iYWxMZXhpY2FsRW52aXJvbm1lbnQtPmhhc1Byb3BlcnR5KGV4ZWMsIGVudHJ5 LmtleS5nZXQoKSk7Ci0gICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Nj b3BlLCB0aHJvd1Njb3BlLmV4Y2VwdGlvbigpKTsKKyAgICAgICAgICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHRocm93U2NvcGUsIG51bGxwdHIpOwogICAgICAgICAgICAgICAgIGlmIChoYXNQ cm9wZXJ0eSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVN5bnRheEVycm9yKGV4 ZWMsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJp bmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0 aHJvd1N5bnRheEVycm9yKGV4ZWMsIHRocm93U2NvcGUsIG1ha2VTdHJpbmcoIkNhbid0IGNyZWF0 ZSBkdXBsaWNhdGUgdmFyaWFibGU6ICciLCBTdHJpbmcoZW50cnkua2V5LmdldCgpKSwgIiciKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9KU1dlYkFzc2VtYmx5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL0pTV2ViQXNzZW1ibHkuY3BwCmluZGV4IDJiYWY5NzI4OGE2MTM4MzVhOTcwMWNhYTE3 MGYyZWQ5OWY1M2MyOTAuLjU3MDE1NjBhYjY3MGY2NzZhZmYxMGFmNzdjMmY4ZjFjNzNjNDQxNzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1ibHkuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pTV2ViQXNzZW1ibHkuY3BwCkBAIC01 Niw3ICs1Niw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgd2ViQXNzZW1ibHlDb21w aWxlRnVuYyhFeGVjU3RhdGUqIGV4ZWMpCiAgICAgSlNWYWx1ZSBtb2R1bGUgPSBXZWJBc3NlbWJs eU1vZHVsZUNvbnN0cnVjdG9yOjpjcmVhdGVNb2R1bGUoZXhlYywgZXhlYy0+bGV4aWNhbEdsb2Jh bE9iamVjdCgpLT5XZWJBc3NlbWJseU1vZHVsZVN0cnVjdHVyZSgpKTsKICAgICBpZiAoRXhjZXB0 aW9uKiBleGNlcHRpb24gPSBjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKSB7CiAgICAgICAgIGNhdGNo U2NvcGUuY2xlYXJFeGNlcHRpb24oKTsKLSAgICAgICAgcHJvbWlzZS0+cmVqZWN0KGV4ZWMsIGV4 Y2VwdGlvbik7CisgICAgICAgIHByb21pc2UtPnJlamVjdChleGVjLCBleGNlcHRpb24tPnZhbHVl KCkpOwogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHByb21pc2UtPnByb21pc2UoKSk7 CiAgICAgfQogCmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdl TG9nCmluZGV4IGQxMGU1Y2JmYTFiOTk1MjBlMjVhNmYxODVjNGFmYThlMjBlNGI1MDcuLmY4NTIz MzFhNmFjMmQ3YWVjNjc5NzcyM2JiMDhmODIyYWFmNDdkMmUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMv Q2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTct MDEtMzAgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKKyAgICAgICAg W0pTQ10gTWFrZSBFeGNlcHRpb24gSlNDZWxsIGFuZCBkbyBub3QgcmVqZWN0IFdlYkFzc2VtYmx5 LmNvbXBpbGUoKSB3aXRoIEV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiB3YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qczoKKyAgICAg ICAgKGFzeW5jLnRlc3RQcm9taXNlQVBJKToKKwogMjAxNy0wMS0yNyAgWXVzdWtlIFN1enVraSAg PHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBMaWZ0IHRlbXBsYXRlIGVzY2FwZSBz ZXF1ZW5jZSByZXN0cmljdGlvbnMgaW4gdGFnZ2VkIHRlbXBsYXRlcwpkaWZmIC0tZ2l0IGEvSlNU ZXN0cy93YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcyBiL0pTVGVzdHMvd2FzbS9qcy1hcGkv TW9kdWxlLWNvbXBpbGUuanMKaW5kZXggMzNhYjUxMzVkYTZkMGYyYTFkYTJkNjZlYWIyZjdmMjE5 ZWZmNzc0Mi4uZjM0M2M2ZTkzYzczMTI1ZTQ5YWQ5M2Y0YWE3MmExYTA5ZTY5ZTJiYiAxMDA2NDQK LS0tIGEvSlNUZXN0cy93YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcworKysgYi9KU1Rlc3Rz L3dhc20vanMtYXBpL01vZHVsZS1jb21waWxlLmpzCkBAIC0yOCw2ICsyOCwxOCBAQCBhc3luYyBm dW5jdGlvbiB0ZXN0UHJvbWlzZUFQSSgpIHsKICAgICB7CiAgICAgICAgIGxldCB0aHJldyA9IGZh bHNlOwogICAgICAgICB0cnkgeworICAgICAgICAgICAgYXdhaXQgV2ViQXNzZW1ibHkuY29tcGls ZSgpOworICAgICAgICB9IGNhdGNoKGUpIHsKKyAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsKKyAg ICAgICAgICAgIGFzc2VydC50cnV0aHkoZSBpbnN0YW5jZW9mIFR5cGVFcnJvcik7CisgICAgICAg ICAgICBhc3NlcnQuZXEoZS5tZXNzYWdlLCAiZmlyc3QgYXJndW1lbnQgbXVzdCBiZSBhbiBBcnJh eUJ1ZmZlclZpZXcgb3IgYW4gQXJyYXlCdWZmZXIgKGV2YWx1YXRpbmcgJ1dlYkFzc2VtYmx5LmNv bXBpbGUoKScpIik7CisgICAgICAgIH0KKyAgICAgICAgYXNzZXJ0LnRydXRoeSh0aHJldyk7Cisg ICAgfQorCisgICAgeworICAgICAgICBsZXQgdGhyZXcgPSBmYWxzZTsKKyAgICAgICAgdHJ5IHsK ICAgICAgICAgICAgIGF3YWl0IFdlYkFzc2VtYmx5LmNvbXBpbGUoMjApOwogICAgICAgICB9IGNh dGNoKGUpIHsKICAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsK 300106 2017-01-30 07:31:50 -0800 2017-01-30 23:23:07 -0800 Patch bug-167585-20170131002941.patch text/plain 3126 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 YjhkOGU4YTFkMGM3MmRhMDk0YTU4M2MwZTc5MzlhMDNkMzA1N2MxLi5hZGJiNzIwOTEzNDNjZTFj ODZjNzdhN2JhMjM1NjlmNTU3ZThlYjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxNy0wMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBEbyBub3QgcmVqZWN0IFdlYkFzc2VtYmx5LmNvbXBpbGUo KSB3aXRoIEV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY3NTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2UgYWNjaWRlbnRhbGx5IHJlamVjdCB0aGUgcHJvbWlzZSB3aXRoIEV4Y2VwdGlv biBpbnN0ZWFkIG9mIEV4Y2VwdGlvbjo6dmFsdWUoKQorICAgICAgICBmb3IgdGhlIHJlc3VsdCBv ZiBXZWJBc3NlbWJseTo6Y29tcGlsZSgpLgorCisgICAgICAgICogd2FzbS9KU1dlYkFzc2VtYmx5 LmNwcDoKKyAgICAgICAgKEpTQzo6d2ViQXNzZW1ibHlDb21waWxlRnVuYyk6CisKIDIwMTctMDEt MjggIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE5lZWQgc29tZSBsaW1pdCBvbiBBc3luYyBDYWxsIFN0YWNrcyBmb3IgYXN5bmMgbG9v cHMgKHJBRiBsb29wcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL0pT V2ViQXNzZW1ibHkuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vSlNXZWJBc3NlbWJs eS5jcHAKaW5kZXggMmJhZjk3Mjg4YTYxMzgzNWE5NzAxY2FhMTcwZjJlZDk5ZjUzYzI5MC4uNTcw MTU2MGFiNjcwZjY3NmFmZjEwYWY3N2MyZjhmMWM3M2M0NDE3NiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vSlNXZWJBc3NlbWJseS5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3dhc20vSlNXZWJBc3NlbWJseS5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgRW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCB3ZWJBc3NlbWJseUNvbXBpbGVGdW5jKEV4ZWNTdGF0ZSog ZXhlYykKICAgICBKU1ZhbHVlIG1vZHVsZSA9IFdlYkFzc2VtYmx5TW9kdWxlQ29uc3RydWN0b3I6 OmNyZWF0ZU1vZHVsZShleGVjLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCktPldlYkFzc2Vt Ymx5TW9kdWxlU3RydWN0dXJlKCkpOwogICAgIGlmIChFeGNlcHRpb24qIGV4Y2VwdGlvbiA9IGNh dGNoU2NvcGUuZXhjZXB0aW9uKCkpIHsKICAgICAgICAgY2F0Y2hTY29wZS5jbGVhckV4Y2VwdGlv bigpOwotICAgICAgICBwcm9taXNlLT5yZWplY3QoZXhlYywgZXhjZXB0aW9uKTsKKyAgICAgICAg cHJvbWlzZS0+cmVqZWN0KGV4ZWMsIGV4Y2VwdGlvbi0+dmFsdWUoKSk7CiAgICAgICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUocHJvbWlzZS0+cHJvbWlzZSgpKTsKICAgICB9CiAKZGlmZiAtLWdp dCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDEwZTVjYmZh MWI5OTUyMGUyNWE2ZjE4NWM0YWZhOGUyMGU0YjUwNy4uY2UwMGY5Y2Y2ZTRhMjBmNzBlZGJlOWYw MDY0MWE3MTc5ZGRkMGVlZCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNy0wMS0zMCAgWXVzdWtlIFN1enVr aSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KKworICAgICAgICBbSlNDXSBEbyBub3QgcmVqZWN0 IFdlYkFzc2VtYmx5LmNvbXBpbGUoKSB3aXRoIEV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NTg1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGls ZS5qczoKKyAgICAgICAgKGFzeW5jLnRlc3RQcm9taXNlQVBJKToKKwogMjAxNy0wMS0yNyAgWXVz dWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBMaWZ0IHRlbXBs YXRlIGVzY2FwZSBzZXF1ZW5jZSByZXN0cmljdGlvbnMgaW4gdGFnZ2VkIHRlbXBsYXRlcwpkaWZm IC0tZ2l0IGEvSlNUZXN0cy93YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcyBiL0pTVGVzdHMv d2FzbS9qcy1hcGkvTW9kdWxlLWNvbXBpbGUuanMKaW5kZXggMzNhYjUxMzVkYTZkMGYyYTFkYTJk NjZlYWIyZjdmMjE5ZWZmNzc0Mi4uZjM0M2M2ZTkzYzczMTI1ZTQ5YWQ5M2Y0YWE3MmExYTA5ZTY5 ZTJiYiAxMDA2NDQKLS0tIGEvSlNUZXN0cy93YXNtL2pzLWFwaS9Nb2R1bGUtY29tcGlsZS5qcwor KysgYi9KU1Rlc3RzL3dhc20vanMtYXBpL01vZHVsZS1jb21waWxlLmpzCkBAIC0yOCw2ICsyOCwx OCBAQCBhc3luYyBmdW5jdGlvbiB0ZXN0UHJvbWlzZUFQSSgpIHsKICAgICB7CiAgICAgICAgIGxl dCB0aHJldyA9IGZhbHNlOwogICAgICAgICB0cnkgeworICAgICAgICAgICAgYXdhaXQgV2ViQXNz ZW1ibHkuY29tcGlsZSgpOworICAgICAgICB9IGNhdGNoKGUpIHsKKyAgICAgICAgICAgIHRocmV3 ID0gdHJ1ZTsKKyAgICAgICAgICAgIGFzc2VydC50cnV0aHkoZSBpbnN0YW5jZW9mIFR5cGVFcnJv cik7CisgICAgICAgICAgICBhc3NlcnQuZXEoZS5tZXNzYWdlLCAiZmlyc3QgYXJndW1lbnQgbXVz dCBiZSBhbiBBcnJheUJ1ZmZlclZpZXcgb3IgYW4gQXJyYXlCdWZmZXIgKGV2YWx1YXRpbmcgJ1dl YkFzc2VtYmx5LmNvbXBpbGUoKScpIik7CisgICAgICAgIH0KKyAgICAgICAgYXNzZXJ0LnRydXRo eSh0aHJldyk7CisgICAgfQorCisgICAgeworICAgICAgICBsZXQgdGhyZXcgPSBmYWxzZTsKKyAg ICAgICAgdHJ5IHsKICAgICAgICAgICAgIGF3YWl0IFdlYkFzc2VtYmx5LmNvbXBpbGUoMjApOwog ICAgICAgICB9IGNhdGNoKGUpIHsKICAgICAgICAgICAgIHRocmV3ID0gdHJ1ZTsK