76718 2012-01-20 11:03:54 -0800 [chromium] Revert r105395 and r105483 2012-01-20 12:08:55 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sadrul webkit-unassigned abarth fishd kinuko webkit.review.bot oldest_to_newest 539624 0 sadrul 2012-01-20 11:03:54 -0800 These revisions causes failure in ChromeOS' browser_tests:FileSystemExtensionApiTest and LocalFileSystem. 539627 1 123345 sadrul 2012-01-20 11:08:15 -0800 Created attachment 123345 patch 539631 2 sadrul 2012-01-20 11:09:25 -0800 The reverted revisions are http://trac.webkit.org/changeset/105395 and http://trac.webkit.org/changeset/105483. I manually reverted the latter first, and then the first one, and created this patch. Does it make sense to separately rollout each? 539634 3 webkit.review.bot 2012-01-20 11:11:39 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 539681 4 123345 webkit.review.bot 2012-01-20 12:08:51 -0800 Comment on attachment 123345 patch Clearing flags on attachment: 123345 Committed r105531: <http://trac.webkit.org/changeset/105531> 539682 5 webkit.review.bot 2012-01-20 12:08:55 -0800 All reviewed patches have been landed. Closing bug. 123345 2012-01-20 11:08:15 -0800 2012-01-20 12:08:50 -0800 patch webkit-revert-fileapi-chromeos.patch text/plain 20264 sadrul ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzMzllOWI1Li43YmJmZDEzIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTItMDEtMjAgIFNhZHJ1bCBIYWJpYiBDaG93ZGh1cnkgIDxzYWRydWxAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmV2ZXJ0IGEgY291cGxlIG9mIGNoYW5nZXMgaW4g ZmlsZWFwaS8gdGhhdCBicmVhayB0ZXN0cyBpbiBjaHJvbWVvcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NzE4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmaWxlYXBpL0Jsb2JVUkwuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QmxvYlVSTDo6Z2V0SWRlbnRpZmllcik6CisgICAgICAgIChXZWJDb3Jl OjpCbG9iVVJMOjpjcmVhdGVCbG9iVVJMKToKKyAgICAgICAgKiBmaWxlYXBpL0Jsb2JVUkwuaDoK KyAgICAgICAgKFdlYkNvcmU6OkJsb2JVUkw6OmJsb2JQcm90b2NvbCk6CisgICAgICAgICogZmls ZWFwaS9ET01GaWxlU3lzdGVtQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01GaWxlU3lz dGVtQmFzZTo6Y3JhY2tGaWxlU3lzdGVtVVJMKToKKyAgICAgICAgKiBmaWxlYXBpL0RPTUZpbGVT eXN0ZW1CYXNlLmg6CisgICAgICAgICogZmlsZWFwaS9FbnRyeUJhc2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RW50cnlCYXNlOjp0b1VSTCk6CisgICAgICAgICogZmlsZWFwaS9GaWxlV3JpdGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVXcml0ZXI6OndyaXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkZpbGVXcml0ZXI6OnRydW5jYXRlKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OndlYmtpdFJlcXVlc3RGaWxlU3lzdGVt KToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5oOgorICAgICAgICAqIHBsYXRmb3JtL0FzeW5j RmlsZVN5c3RlbS5jcHA6CisgICAgICAgICogcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmg6Cisg ICAgICAgICogd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlckNvbnRleHQ6OndlYmtpdFJlcXVlc3RGaWxlU3lzdGVtKToKKyAgICAgICAgKFdlYkNvcmU6 OldvcmtlckNvbnRleHQ6OndlYmtpdFJlcXVlc3RGaWxlU3lzdGVtU3luYyk6CisKIDIwMTItMDEt MjAgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBE YXRhVHJhbnNmZXJJdGVtcyBzdXBwb3J0IGZvciBkcmFnLWFuZC1kcm9wJ2VkIGZpbGVzIGFuZCB0 ZXh0cwpAQCAtMjkwOCw2ICsyOTM3LDcgQEAKIAogICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL3NraWEvSW1hZ2VEZWNvZGVyU2tpYS5jcHA6CiAgICAgICAgIChXZWJDb3JlOjpJbWFn ZUZyYW1lOjpzZXRTdGF0dXMpOgorCiAyMDEyLTAxLTE3ICBOYXRlIENoYXBpbiAgPGphcGhldEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgRW5zdXJlIHdlIGRvbid0IGNhbmNlbCByZXZhbGlkYXRp b24gb2YgYSBDYWNoZWRSZXNvdXJjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFw aS9CbG9iVVJMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvQmxvYlVSTC5jcHAKaW5kZXgg MTkzMWI1Yy4uNWQ3OTE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9CbG9i VVJMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0Jsb2JVUkwuY3BwCkBAIC0zOSw3 ICszOSw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGNvbnN0IGNoYXIgYmxv YlByb3RvY29sW10gPSAiYmxvYiI7Citjb25zdCBjaGFyIEJsb2JVUkw6OmtCbG9iUHJvdG9jb2xb XSA9ICJibG9iIjsKIAogS1VSTCBCbG9iVVJMOjpjcmVhdGVQdWJsaWNVUkwoU2VjdXJpdHlPcmln aW4qIHNlY3VyaXR5T3JpZ2luKQogewpAQCAtNTQsNyArNTQsNyBAQCBLVVJMIEJsb2JVUkw6OmNy ZWF0ZUludGVybmFsVVJMKCkKIAogU3RyaW5nIEJsb2JVUkw6OmdldElkZW50aWZpZXIoY29uc3Qg S1VSTCYgdXJsKQogewotICAgIEFTU0VSVCh1cmwucHJvdG9jb2xJcyhibG9iUHJvdG9jb2wpKTsK KyAgICBBU1NFUlQodXJsLnByb3RvY29sSXMoa0Jsb2JQcm90b2NvbCkpOwogCiAgICAgdW5zaWdu ZWQgc3RhcnRJbmRleCA9IHVybC5wYXRoQWZ0ZXJMYXN0U2xhc2goKTsKICAgICByZXR1cm4gdXJs LnN0cmluZygpLnN1YnN0cmluZyhzdGFydEluZGV4KTsKQEAgLTY1LDcgKzY1LDcgQEAgS1VSTCBC bG9iVVJMOjpjcmVhdGVCbG9iVVJMKGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKQogICAgIEFT U0VSVCghb3JpZ2luU3RyaW5nLmlzRW1wdHkoKSk7CiAgICAgaWYgKG9yaWdpblN0cmluZyA9PSAi bnVsbCIpCiAgICAgICAgIHJldHVybiBLVVJMKCk7Ci0gICAgU3RyaW5nIHVybFN0cmluZyA9IGJs b2JQcm90b2NvbDsKKyAgICBTdHJpbmcgdXJsU3RyaW5nID0ga0Jsb2JQcm90b2NvbDsKICAgICB1 cmxTdHJpbmcgKz0gIjoiOwogICAgIHVybFN0cmluZyArPSBlbmNvZGVXaXRoVVJMRXNjYXBlU2Vx dWVuY2VzKG9yaWdpblN0cmluZyk7CiAgICAgdXJsU3RyaW5nICs9ICIvIjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvQmxvYlVSTC5oIGIvU291cmNlL1dlYkNvcmUvZmlsZWFw aS9CbG9iVVJMLmgKaW5kZXggM2RlZjI1Ni4uNGVhNTlmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZmlsZWFwaS9CbG9iVVJMLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9CbG9i VVJMLmgKQEAgLTUxLDkgKzUxLDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgS1VSTCBjcmVhdGVQ dWJsaWNVUkwoU2VjdXJpdHlPcmlnaW4qKTsKICAgICBzdGF0aWMgS1VSTCBjcmVhdGVJbnRlcm5h bFVSTCgpOwogICAgIHN0YXRpYyBTdHJpbmcgZ2V0SWRlbnRpZmllcihjb25zdCBLVVJMJik7Cisg ICAgc3RhdGljIGNvbnN0IGNoYXIqIGJsb2JQcm90b2NvbCgpIHsgcmV0dXJuIGtCbG9iUHJvdG9j b2w7IH0KIAogcHJpdmF0ZToKICAgICBzdGF0aWMgS1VSTCBjcmVhdGVCbG9iVVJMKGNvbnN0IFN0 cmluZyYgb3JpZ2luU3RyaW5nKTsKKyAgICBzdGF0aWMgY29uc3QgY2hhciBrQmxvYlByb3RvY29s W107CiAgICAgQmxvYlVSTCgpIHsgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZmlsZWFwaS9ET01GaWxlU3lzdGVtQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0RP TUZpbGVTeXN0ZW1CYXNlLmNwcAppbmRleCBlZjQ0ZDc1Li5lYzhlZjcyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9maWxlYXBpL0RPTUZpbGVTeXN0ZW1CYXNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9maWxlYXBpL0RPTUZpbGVTeXN0ZW1CYXNlLmNwcApAQCAtNTAsMTAgKzUwLDQxIEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gc3RhdGljCitjb25zdCBjaGFyIERPTUZpbGVT eXN0ZW1CYXNlOjprUGVyc2lzdGVudFBhdGhQcmVmaXhbXSA9ICJwZXJzaXN0ZW50IjsKK2NvbnN0 IHNpemVfdCBET01GaWxlU3lzdGVtQmFzZTo6a1BlcnNpc3RlbnRQYXRoUHJlZml4TGVuZ3RoID0g c2l6ZW9mKERPTUZpbGVTeXN0ZW1CYXNlOjprUGVyc2lzdGVudFBhdGhQcmVmaXgpIC0gMTsKK2Nv bnN0IGNoYXIgRE9NRmlsZVN5c3RlbUJhc2U6OmtUZW1wb3JhcnlQYXRoUHJlZml4W10gPSAidGVt cG9yYXJ5IjsKK2NvbnN0IHNpemVfdCBET01GaWxlU3lzdGVtQmFzZTo6a1RlbXBvcmFyeVBhdGhQ cmVmaXhMZW5ndGggPSBzaXplb2YoRE9NRmlsZVN5c3RlbUJhc2U6OmtUZW1wb3JhcnlQYXRoUHJl Zml4KSAtIDE7Citjb25zdCBjaGFyIERPTUZpbGVTeXN0ZW1CYXNlOjprRXh0ZXJuYWxQYXRoUHJl Zml4W10gPSAiZXh0ZXJuYWwiOworY29uc3Qgc2l6ZV90IERPTUZpbGVTeXN0ZW1CYXNlOjprRXh0 ZXJuYWxQYXRoUHJlZml4TGVuZ3RoID0gc2l6ZW9mKERPTUZpbGVTeXN0ZW1CYXNlOjprRXh0ZXJu YWxQYXRoUHJlZml4KSAtIDE7CisKIGJvb2wgRE9NRmlsZVN5c3RlbUJhc2U6OmNyYWNrRmlsZVN5 c3RlbVVSTChjb25zdCBLVVJMJiB1cmwsIEFzeW5jRmlsZVN5c3RlbTo6VHlwZSYgdHlwZSwgU3Ry aW5nJiBmaWxlUGF0aCkKIHsKLSAgICByZXR1cm4gQXN5bmNGaWxlU3lzdGVtOjpjcmFja0ZpbGVT eXN0ZW1VUkwodXJsLCB0eXBlLCBmaWxlUGF0aCk7CisgICAgaWYgKCF1cmwucHJvdG9jb2xJcygi ZmlsZXN5c3RlbSIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBLVVJMIG9yaWdpblVS TChQYXJzZWRVUkxTdHJpbmcsIHVybC5wYXRoKCkpOworICAgIFN0cmluZyBwYXRoID0gZGVjb2Rl VVJMRXNjYXBlU2VxdWVuY2VzKG9yaWdpblVSTC5wYXRoKCkpOworICAgIGlmIChwYXRoLmlzRW1w dHkoKSB8fCBwYXRoWzBdICE9ICcvJykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHBhdGgg PSBwYXRoLnN1YnN0cmluZygxKTsKKworICAgIGlmIChwYXRoLnN0YXJ0c1dpdGgoa1RlbXBvcmFy eVBhdGhQcmVmaXgpKSB7CisgICAgICAgIHR5cGUgPSBBc3luY0ZpbGVTeXN0ZW06OlRlbXBvcmFy eTsKKyAgICAgICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKGtUZW1wb3JhcnlQYXRoUHJlZml4TGVu Z3RoKTsKKyAgICB9IGVsc2UgaWYgKHBhdGguc3RhcnRzV2l0aChrUGVyc2lzdGVudFBhdGhQcmVm aXgpKSB7CisgICAgICAgIHR5cGUgPSBBc3luY0ZpbGVTeXN0ZW06OlBlcnNpc3RlbnQ7CisgICAg ICAgIHBhdGggPSBwYXRoLnN1YnN0cmluZyhrUGVyc2lzdGVudFBhdGhQcmVmaXhMZW5ndGgpOwor ICAgIH0gZWxzZSBpZiAocGF0aC5zdGFydHNXaXRoKGtFeHRlcm5hbFBhdGhQcmVmaXgpKSB7Cisg ICAgICAgIHR5cGUgPSBBc3luY0ZpbGVTeXN0ZW06OkV4dGVybmFsOworICAgICAgICBwYXRoID0g cGF0aC5zdWJzdHJpbmcoa0V4dGVybmFsUGF0aFByZWZpeExlbmd0aCk7CisgICAgfSBlbHNlCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmIChwYXRoLmlzRW1wdHkoKSB8fCBwYXRoWzBd ICE9ICcvJykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgZmlsZVBhdGguc3dhcChwYXRo KTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogRE9NRmlsZVN5c3RlbUJhc2U6OkRPTUZpbGVTeXN0 ZW1CYXNlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgbmFt ZSwgUGFzc093blB0cjxBc3luY0ZpbGVTeXN0ZW0+IGFzeW5jRmlsZVN5c3RlbSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRE9NRmlsZVN5c3RlbUJhc2UuaCBiL1NvdXJjZS9X ZWJDb3JlL2ZpbGVhcGkvRE9NRmlsZVN5c3RlbUJhc2UuaAppbmRleCBiMDI4MDgwLi44YmMwYjY1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0RPTUZpbGVTeXN0ZW1CYXNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9ET01GaWxlU3lzdGVtQmFzZS5oCkBAIC02Miw2 ICs2MiwxMiBAQCBwdWJsaWM6CiAgICAgfQogICAgIHZpcnR1YWwgfkRPTUZpbGVTeXN0ZW1CYXNl KCk7CiAKKyAgICBzdGF0aWMgY29uc3QgY2hhciBrUGVyc2lzdGVudFBhdGhQcmVmaXhbXTsKKyAg ICBzdGF0aWMgY29uc3Qgc2l6ZV90IGtQZXJzaXN0ZW50UGF0aFByZWZpeExlbmd0aDsKKyAgICBz dGF0aWMgY29uc3QgY2hhciBrVGVtcG9yYXJ5UGF0aFByZWZpeFtdOworICAgIHN0YXRpYyBjb25z dCBzaXplX3Qga1RlbXBvcmFyeVBhdGhQcmVmaXhMZW5ndGg7CisgICAgc3RhdGljIGNvbnN0IGNo YXIga0V4dGVybmFsUGF0aFByZWZpeFtdOworICAgIHN0YXRpYyBjb25zdCBzaXplX3Qga0V4dGVy bmFsUGF0aFByZWZpeExlbmd0aDsKICAgICBzdGF0aWMgYm9vbCBjcmFja0ZpbGVTeXN0ZW1VUkwo Y29uc3QgS1VSTCYsIEFzeW5jRmlsZVN5c3RlbTo6VHlwZSYsIFN0cmluZyYgZmlsZVBhdGgpOwog CiAgICAgY29uc3QgU3RyaW5nJiBuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9uYW1lOyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0VudHJ5QmFzZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9maWxlYXBpL0VudHJ5QmFzZS5jcHAKaW5kZXggODhmNDJkNS4uMzk0NTNmNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9FbnRyeUJhc2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2ZpbGVhcGkvRW50cnlCYXNlLmNwcApAQCAtMzksNiArMzksNyBAQAogI2luY2x1ZGUg IlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRl IDx3dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC01NSw3ICs1NiwyNyBAQCBFbnRyeUJhc2U6On5F bnRyeUJhc2UoKQogCiBTdHJpbmcgRW50cnlCYXNlOjp0b1VSTCgpCiB7Ci0gICAgcmV0dXJuIG1f ZmlsZVN5c3RlbS0+YXN5bmNGaWxlU3lzdGVtKCktPnRvVVJMKG1fZmlsZVN5c3RlbS0+c2VjdXJp dHlPcmlnaW4oKS0+dG9TdHJpbmcoKSwgbV9mdWxsUGF0aCk7CisgICAgU3RyaW5nIG9yaWdpblN0 cmluZyA9IG1fZmlsZVN5c3RlbS0+c2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKTsKKyAgICBB U1NFUlQoIW9yaWdpblN0cmluZy5pc0VtcHR5KCkpOworICAgIGlmIChvcmlnaW5TdHJpbmcgPT0g Im51bGwiKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgU3RyaW5nQnVpbGRlciByZXN1 bHQ7CisgICAgcmVzdWx0LmFwcGVuZCgiZmlsZXN5c3RlbToiKTsKKyAgICByZXN1bHQuYXBwZW5k KG9yaWdpblN0cmluZyk7CisgICAgcmVzdWx0LmFwcGVuZCgiLyIpOworICAgIHN3aXRjaCAobV9m aWxlU3lzdGVtLT5hc3luY0ZpbGVTeXN0ZW0oKS0+dHlwZSgpKSB7CisgICAgY2FzZSBBc3luY0Zp bGVTeXN0ZW06OlRlbXBvcmFyeToKKyAgICAgICAgcmVzdWx0LmFwcGVuZChET01GaWxlU3lzdGVt QmFzZTo6a1RlbXBvcmFyeVBhdGhQcmVmaXgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFz eW5jRmlsZVN5c3RlbTo6UGVyc2lzdGVudDoKKyAgICAgICAgcmVzdWx0LmFwcGVuZChET01GaWxl U3lzdGVtQmFzZTo6a1BlcnNpc3RlbnRQYXRoUHJlZml4KTsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBBc3luY0ZpbGVTeXN0ZW06OkV4dGVybmFsOgorICAgICAgICByZXN1bHQuYXBwZW5kKERP TUZpbGVTeXN0ZW1CYXNlOjprRXh0ZXJuYWxQYXRoUHJlZml4KTsKKyAgICAgICAgYnJlYWs7Cisg ICAgfQorICAgIHJlc3VsdC5hcHBlbmQobV9mdWxsUGF0aCk7CisgICAgcmV0dXJuIHJlc3VsdC50 b1N0cmluZygpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVXcml0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZmlsZWFw aS9GaWxlV3JpdGVyLmNwcAppbmRleCBjNDljZWZjLi4yYjI1Y2ZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVXcml0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Zp bGVhcGkvRmlsZVdyaXRlci5jcHAKQEAgLTQzLDcgKzQzLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCi1zdGF0aWMgY29uc3QgaW50IG1heFJlY3Vyc2lvbkRlcHRoID0gMzsKK3N0YXRpYyBj b25zdCBpbnQga01heFJlY3Vyc2lvbkRlcHRoID0gMzsKIAogRmlsZVdyaXRlcjo6RmlsZVdyaXRl cihTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0KQogICAgIDogQWN0aXZlRE9NT2JqZWN0 KGNvbnRleHQsIHRoaXMpCkBAIC0xMDMsNyArMTAzLDcgQEAgdm9pZCBGaWxlV3JpdGVyOjp3cml0 ZShCbG9iKiBkYXRhLCBFeGNlcHRpb25Db2RlJiBlYykKICAgICAgICAgc2V0RXJyb3IoRmlsZUVy cm9yOjpUWVBFX01JU01BVENIX0VSUiwgZWMpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAg IGlmIChtX3JlY3Vyc2lvbkRlcHRoID4gbWF4UmVjdXJzaW9uRGVwdGgpIHsKKyAgICBpZiAobV9y ZWN1cnNpb25EZXB0aCA+IGtNYXhSZWN1cnNpb25EZXB0aCkgewogICAgICAgICBzZXRFcnJvcihG aWxlRXJyb3I6OlNFQ1VSSVRZX0VSUiwgZWMpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAt MTQxLDcgKzE0MSw3IEBAIHZvaWQgRmlsZVdyaXRlcjo6dHJ1bmNhdGUobG9uZyBsb25nIHBvc2l0 aW9uLCBFeGNlcHRpb25Db2RlJiBlYykKICAgICAgICAgc2V0RXJyb3IoRmlsZUVycm9yOjpJTlZB TElEX1NUQVRFX0VSUiwgZWMpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlmIChtX3Jl Y3Vyc2lvbkRlcHRoID4gbWF4UmVjdXJzaW9uRGVwdGgpIHsKKyAgICBpZiAobV9yZWN1cnNpb25E ZXB0aCA+IGtNYXhSZWN1cnNpb25EZXB0aCkgewogICAgICAgICBzZXRFcnJvcihGaWxlRXJyb3I6 OlNFQ1VSSVRZX0VSUiwgZWMpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9E T01XaW5kb3cuY3BwCmluZGV4IGU3YTI3NDkuLmM5OWYxYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdp bmRvdy5jcHAKQEAgLTc4NSw3ICs3ODUsNyBAQCB2b2lkIERPTVdpbmRvdzo6d2Via2l0UmVxdWVz dEZpbGVTeXN0ZW0oaW50IHR5cGUsIGxvbmcgbG9uZyBzaXplLCBQYXNzUmVmUHRyPEZpbAogICAg IH0KIAogICAgIEFzeW5jRmlsZVN5c3RlbTo6VHlwZSBmaWxlU3lzdGVtVHlwZSA9IHN0YXRpY19j YXN0PEFzeW5jRmlsZVN5c3RlbTo6VHlwZT4odHlwZSk7Ci0gICAgaWYgKGZpbGVTeXN0ZW1UeXBl ICE9IEFzeW5jRmlsZVN5c3RlbTo6VGVtcG9yYXJ5ICYmIGZpbGVTeXN0ZW1UeXBlICE9IEFzeW5j RmlsZVN5c3RlbTo6UGVyc2lzdGVudCkgeworICAgIGlmIChmaWxlU3lzdGVtVHlwZSAhPSBBc3lu Y0ZpbGVTeXN0ZW06OlRlbXBvcmFyeSAmJiBmaWxlU3lzdGVtVHlwZSAhPSBBc3luY0ZpbGVTeXN0 ZW06OlBlcnNpc3RlbnQgJiYgZmlsZVN5c3RlbVR5cGUgIT0gQXN5bmNGaWxlU3lzdGVtOjpFeHRl cm5hbCkgewogICAgICAgICBET01GaWxlU3lzdGVtOjpzY2hlZHVsZUNhbGxiYWNrKGRvY3VtZW50 LCBlcnJvckNhbGxiYWNrLCBGaWxlRXJyb3I6OmNyZWF0ZShGaWxlRXJyb3I6OklOVkFMSURfTU9E SUZJQ0FUSU9OX0VSUikpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtODE5LDYgKzgxOSw4 IEBAIHZvaWQgRE9NV2luZG93Ojp3ZWJraXRSZXNvbHZlTG9jYWxGaWxlU3lzdGVtVVJMKGNvbnN0 IFN0cmluZyYgdXJsLCBQYXNzUmVmUHRyPEVuCiAgICAgTG9jYWxGaWxlU3lzdGVtOjpsb2NhbEZp bGVTeXN0ZW0oKS5yZWFkRmlsZVN5c3RlbShkb2N1bWVudCwgdHlwZSwgUmVzb2x2ZVVSSUNhbGxi YWNrczo6Y3JlYXRlKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjaywgZG9jdW1lbnQsIGZp bGVQYXRoKSk7CiB9CiAKK0NPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oRE9NV2luZG93 OjpFWFRFUk5BTCkgPT0gc3RhdGljX2Nhc3Q8aW50PihBc3luY0ZpbGVTeXN0ZW06OkV4dGVybmFs KSwgZW51bV9taXNtYXRjaCk7CisKIENPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oRE9N V2luZG93OjpURU1QT1JBUlkpID09IHN0YXRpY19jYXN0PGludD4oQXN5bmNGaWxlU3lzdGVtOjpU ZW1wb3JhcnkpLCBlbnVtX21pc21hdGNoKTsKIENPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGlu dD4oRE9NV2luZG93OjpQRVJTSVNURU5UKSA9PSBzdGF0aWNfY2FzdDxpbnQ+KEFzeW5jRmlsZVN5 c3RlbTo6UGVyc2lzdGVudCksIGVudW1fbWlzbWF0Y2gpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cu aAppbmRleCA2MDU2NmUxLi41ZDJmMzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RPTVdpbmRvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmgKQEAgLTM2 Niw2ICszNjYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGVudW0gRmlsZVN5c3Rl bVR5cGUgewogICAgICAgICAgICAgVEVNUE9SQVJZLAogICAgICAgICAgICAgUEVSU0lTVEVOVCwK KyAgICAgICAgICAgIEVYVEVSTkFMLAogICAgICAgICB9OwogICAgICAgICB2b2lkIHdlYmtpdFJl cXVlc3RGaWxlU3lzdGVtKGludCB0eXBlLCBsb25nIGxvbmcgc2l6ZSwgUGFzc1JlZlB0cjxGaWxl U3lzdGVtQ2FsbGJhY2s+LCBQYXNzUmVmUHRyPEVycm9yQ2FsbGJhY2s+KTsKICAgICAgICAgdm9p ZCB3ZWJraXRSZXNvbHZlTG9jYWxGaWxlU3lzdGVtVVJMKGNvbnN0IFN0cmluZyYsIFBhc3NSZWZQ dHI8RW50cnlDYWxsYmFjaz4sIFBhc3NSZWZQdHI8RXJyb3JDYWxsYmFjaz4pOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0FzeW5jRmlsZVN5c3RlbS5jcHAKaW5kZXggMzUzYTc2Ni4uNDA0YWFi NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Bc3luY0ZpbGVTeXN0ZW0uY3BwCkBAIC0z Niw2MCArMzYsOSBAQAogI2luY2x1ZGUgIkFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcy5oIgogI2lu Y2x1ZGUgIkZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgotI2luY2x1 ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1j b25zdCBjaGFyIEFzeW5jRmlsZVN5c3RlbTo6cGVyc2lzdGVudFBhdGhQcmVmaXhbXSA9ICJwZXJz aXN0ZW50IjsKLWNvbnN0IHNpemVfdCBBc3luY0ZpbGVTeXN0ZW06OnBlcnNpc3RlbnRQYXRoUHJl Zml4TGVuZ3RoID0gc2l6ZW9mKEFzeW5jRmlsZVN5c3RlbTo6cGVyc2lzdGVudFBhdGhQcmVmaXgp IC0gMTsKLWNvbnN0IGNoYXIgQXN5bmNGaWxlU3lzdGVtOjp0ZW1wb3JhcnlQYXRoUHJlZml4W10g PSAidGVtcG9yYXJ5IjsKLWNvbnN0IHNpemVfdCBBc3luY0ZpbGVTeXN0ZW06OnRlbXBvcmFyeVBh dGhQcmVmaXhMZW5ndGggPSBzaXplb2YoQXN5bmNGaWxlU3lzdGVtOjp0ZW1wb3JhcnlQYXRoUHJl Zml4KSAtIDE7Ci0KLWJvb2wgQXN5bmNGaWxlU3lzdGVtOjpjcmFja0ZpbGVTeXN0ZW1VUkwoY29u c3QgS1VSTCYgdXJsLCBBc3luY0ZpbGVTeXN0ZW06OlR5cGUmIHR5cGUsIFN0cmluZyYgZmlsZVBh dGgpCi17Ci0gICAgaWYgKCF1cmwucHJvdG9jb2xJcygiZmlsZXN5c3RlbSIpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KLSAgICBLVVJMIG9yaWdpblVSTChQYXJzZWRVUkxTdHJpbmcsIHVybC5w YXRoKCkpOwotICAgIFN0cmluZyBwYXRoID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKG9yaWdp blVSTC5wYXRoKCkpOwotICAgIGlmIChwYXRoLmlzRW1wdHkoKSB8fCBwYXRoWzBdICE9ICcvJykK LSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhdGggPSBwYXRoLnN1YnN0cmluZygxKTsKLQot ICAgIGlmIChwYXRoLnN0YXJ0c1dpdGgodGVtcG9yYXJ5UGF0aFByZWZpeCkpIHsKLSAgICAgICAg dHlwZSA9IFRlbXBvcmFyeTsKLSAgICAgICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKHRlbXBvcmFy eVBhdGhQcmVmaXhMZW5ndGgpOwotICAgIH0gZWxzZSBpZiAocGF0aC5zdGFydHNXaXRoKHBlcnNp c3RlbnRQYXRoUHJlZml4KSkgewotICAgICAgICB0eXBlID0gUGVyc2lzdGVudDsKLSAgICAgICAg cGF0aCA9IHBhdGguc3Vic3RyaW5nKHBlcnNpc3RlbnRQYXRoUHJlZml4TGVuZ3RoKTsKLSAgICB9 IGVsc2UKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKHBhdGguaXNFbXB0eSgpIHx8 IHBhdGhbMF0gIT0gJy8nKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBmaWxlUGF0aC5z d2FwKHBhdGgpOwotICAgIHJldHVybiB0cnVlOwotfQotCi1TdHJpbmcgQXN5bmNGaWxlU3lzdGVt Ojp0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0 aCkKLXsKLSAgICBTdHJpbmdCdWlsZGVyIHJlc3VsdDsKLSAgICByZXN1bHQuYXBwZW5kKCJmaWxl c3lzdGVtOiIpOwotICAgIHJlc3VsdC5hcHBlbmQob3JpZ2luU3RyaW5nKTsKLSAgICByZXN1bHQu YXBwZW5kKCIvIik7Ci0gICAgc3dpdGNoICh0eXBlKCkpIHsKLSAgICBjYXNlIFRlbXBvcmFyeToK LSAgICAgICAgcmVzdWx0LmFwcGVuZCh0ZW1wb3JhcnlQYXRoUHJlZml4KTsKLSAgICAgICAgYnJl YWs7Ci0gICAgY2FzZSBQZXJzaXN0ZW50OgotICAgICAgICByZXN1bHQuYXBwZW5kKHBlcnNpc3Rl bnRQYXRoUHJlZml4KTsKLSAgICAgICAgYnJlYWs7Ci0gICAgfQotICAgIHJlc3VsdC5hcHBlbmQo ZnVsbFBhdGgpOwotICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKLX0KLQogI2lmICFQTEFU Rk9STShDSFJPTUlVTSkKIGJvb2wgQXN5bmNGaWxlU3lzdGVtOjppc0F2YWlsYWJsZSgpCiB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Bc3luY0ZpbGVTeXN0ZW0uaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0FzeW5jRmlsZVN5c3RlbS5oCmluZGV4IGVhNGJmMmIuLmMy YzY4NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0FzeW5jRmlsZVN5c3Rl bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0FzeW5jRmlsZVN5c3RlbS5oCkBAIC01 NCw2ICs1NCw3IEBAIHB1YmxpYzoKICAgICBlbnVtIFR5cGUgewogICAgICAgICBUZW1wb3Jhcnks CiAgICAgICAgIFBlcnNpc3RlbnQsCisgICAgICAgIEV4dGVybmFsLAogICAgIH07CiAKICAgICB2 aXJ0dWFsIHZvaWQgc3RvcCgpIHsgfQpAQCAtNjEsMTggKzYyLDYgQEAgcHVibGljOgogCiAgICAg c3RhdGljIGJvb2wgaXNBdmFpbGFibGUoKTsKIAotICAgIC8vIFBhdGggcHJlZml4ZXMgdGhhdCBh cmUgdXNlZCBpbiB0aGUgZmlsZXN5c3RlbSBVUkxzICh0aGF0IGNhbiBiZSBvYnRhaW5lZCBieSB0 b1VSTCgpKS4KLSAgICAvLyBodHRwOi8vd3d3LnczLm9yZy9UUi9maWxlLXN5c3RlbS1hcGkvI3dp ZGwtRW50cnktdG9VUkwKLSAgICBzdGF0aWMgY29uc3QgY2hhciBwZXJzaXN0ZW50UGF0aFByZWZp eFtdOwotICAgIHN0YXRpYyBjb25zdCBzaXplX3QgcGVyc2lzdGVudFBhdGhQcmVmaXhMZW5ndGg7 Ci0gICAgc3RhdGljIGNvbnN0IGNoYXIgdGVtcG9yYXJ5UGF0aFByZWZpeFtdOwotICAgIHN0YXRp YyBjb25zdCBzaXplX3QgdGVtcG9yYXJ5UGF0aFByZWZpeExlbmd0aDsKLQotICAgIHN0YXRpYyBi b29sIGNyYWNrRmlsZVN5c3RlbVVSTChjb25zdCBLVVJMJiwgQXN5bmNGaWxlU3lzdGVtOjpUeXBl JiwgU3RyaW5nJiBmaWxlUGF0aCk7Ci0KLSAgICAvLyBSZXR1cm5zIHRoZSBmaWxlc3lzdGVtIFVS TCBmb3IgdGhlIGdpdmVuIG9yaWdpblN0cmluZyBhbmQgZnVsbFBhdGguCi0gICAgdmlydHVhbCBT dHJpbmcgdG9VUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIGNvbnN0IFN0cmluZyYgZnVs bFBhdGgpOwotCiAgICAgLy8gU3ViY2xhc3MgbXVzdCBpbXBsZW1lbnQgdGhpcyBpZiBpdCBzdXBw b3J0cyBzeW5jaHJvbm91cyBvcGVyYXRpb25zLgogICAgIC8vIFRoaXMgc2hvdWxkIHJldHVybiBm YWxzZSBpZiB0aGVyZSBhcmUgbm8gcGVuZGluZyBvcGVyYXRpb25zLgogICAgIHZpcnR1YWwgYm9v bCB3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSgpIHsgcmV0dXJuIGZhbHNlOyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcAppbmRleCA4Yjc5MThlLi40YWVjNjlkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQ29udGV4dC5jcHAKQEAgLTM4Niw3ICszODYs NyBAQCB2b2lkIFdvcmtlckNvbnRleHQ6OndlYmtpdFJlcXVlc3RGaWxlU3lzdGVtKGludCB0eXBl LCBsb25nIGxvbmcgc2l6ZSwgUGFzc1JlZlB0cgogICAgIH0KIAogICAgIEFzeW5jRmlsZVN5c3Rl bTo6VHlwZSBmaWxlU3lzdGVtVHlwZSA9IHN0YXRpY19jYXN0PEFzeW5jRmlsZVN5c3RlbTo6VHlw ZT4odHlwZSk7Ci0gICAgaWYgKGZpbGVTeXN0ZW1UeXBlICE9IEFzeW5jRmlsZVN5c3RlbTo6VGVt cG9yYXJ5ICYmIGZpbGVTeXN0ZW1UeXBlICE9IEFzeW5jRmlsZVN5c3RlbTo6UGVyc2lzdGVudCkg eworICAgIGlmIChmaWxlU3lzdGVtVHlwZSAhPSBBc3luY0ZpbGVTeXN0ZW06OlRlbXBvcmFyeSAm JiBmaWxlU3lzdGVtVHlwZSAhPSBBc3luY0ZpbGVTeXN0ZW06OlBlcnNpc3RlbnQgJiYgZmlsZVN5 c3RlbVR5cGUgIT0gQXN5bmNGaWxlU3lzdGVtOjpFeHRlcm5hbCkgewogICAgICAgICBET01GaWxl U3lzdGVtOjpzY2hlZHVsZUNhbGxiYWNrKHRoaXMsIGVycm9yQ2FsbGJhY2ssIEZpbGVFcnJvcjo6 Y3JlYXRlKEZpbGVFcnJvcjo6SU5WQUxJRF9NT0RJRklDQVRJT05fRVJSKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CkBAIC00MDMsNyArNDAzLDcgQEAgUGFzc1JlZlB0cjxET01GaWxlU3lzdGVt U3luYz4gV29ya2VyQ29udGV4dDo6d2Via2l0UmVxdWVzdEZpbGVTeXN0ZW1TeW5jKGludCB0eXAK ICAgICB9CiAKICAgICBBc3luY0ZpbGVTeXN0ZW06OlR5cGUgZmlsZVN5c3RlbVR5cGUgPSBzdGF0 aWNfY2FzdDxBc3luY0ZpbGVTeXN0ZW06OlR5cGU+KHR5cGUpOwotICAgIGlmIChmaWxlU3lzdGVt VHlwZSAhPSBBc3luY0ZpbGVTeXN0ZW06OlRlbXBvcmFyeSAmJiBmaWxlU3lzdGVtVHlwZSAhPSBB c3luY0ZpbGVTeXN0ZW06OlBlcnNpc3RlbnQpIHsKKyAgICBpZiAoZmlsZVN5c3RlbVR5cGUgIT0g QXN5bmNGaWxlU3lzdGVtOjpUZW1wb3JhcnkgJiYgZmlsZVN5c3RlbVR5cGUgIT0gQXN5bmNGaWxl U3lzdGVtOjpQZXJzaXN0ZW50ICYmIGZpbGVTeXN0ZW1UeXBlICE9IEFzeW5jRmlsZVN5c3RlbTo6 RXh0ZXJuYWwpIHsKICAgICAgICAgZWMgPSBGaWxlRXhjZXB0aW9uOjpJTlZBTElEX01PRElGSUNB VElPTl9FUlI7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KQEAgLTQ2Miw2ICs0NjIsNyBAQCBQ YXNzUmVmUHRyPEVudHJ5U3luYz4gV29ya2VyQ29udGV4dDo6d2Via2l0UmVzb2x2ZUxvY2FsRmls ZVN5c3RlbVN5bmNVUkwoY29uc3QgUwogCiBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+ KFdvcmtlckNvbnRleHQ6OlRFTVBPUkFSWSkgPT0gc3RhdGljX2Nhc3Q8aW50PihBc3luY0ZpbGVT eXN0ZW06OlRlbXBvcmFyeSksIGVudW1fbWlzbWF0Y2gpOwogQ09NUElMRV9BU1NFUlQoc3RhdGlj X2Nhc3Q8aW50PihXb3JrZXJDb250ZXh0OjpQRVJTSVNURU5UKSA9PSBzdGF0aWNfY2FzdDxpbnQ+ KEFzeW5jRmlsZVN5c3RlbTo6UGVyc2lzdGVudCksIGVudW1fbWlzbWF0Y2gpOworQ09NUElMRV9B U1NFUlQoc3RhdGljX2Nhc3Q8aW50PihXb3JrZXJDb250ZXh0OjpFWFRFUk5BTCkgPT0gc3RhdGlj X2Nhc3Q8aW50PihBc3luY0ZpbGVTeXN0ZW06OkV4dGVybmFsKSwgZW51bV9taXNtYXRjaCk7CiAj ZW5kaWYKIAogV29ya2VyQ29udGV4dDo6T2JzZXJ2ZXI6Ok9ic2VydmVyKFdvcmtlckNvbnRleHQq IGNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDI4OGQ1NmYuLjI2MDg1OGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDEtMjAg IFNhZHJ1bCBIYWJpYiBDaG93ZGh1cnkgIDxzYWRydWxAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtjaHJvbWl1bV0gUmV2ZXJ0IGEgY291cGxlIG9mIGNoYW5nZXMgaW4gZmlsZWFwaS8gdGhhdCBi cmVhayB0ZXN0cyBpbiBjaHJvbWVvcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc2NzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViRmlsZVN5c3RlbS5oOgorICAgICAg ICAqIHNyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcDoKKyAgICAgICAgKiBzcmMvQXN5bmNGaWxl U3lzdGVtQ2hyb21pdW0uY3BwOgorICAgICAgICAqIHNyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1 bS5oOgorCiAyMDEyLTAxLTIwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbY2hyb21pdW1dIGFkZCBXZWJEZXZUb29sc0Zyb250 ZW5kQ2xpZW50OjpvcGVuSW5OZXdUYWIgZm9yIHVwY29taW5nIFdlYkNvcmUgY2hhbmdlLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViRmlsZVN5 c3RlbS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViRmlsZVN5 c3RlbS5oCmluZGV4IGMzYjEyNDcuLjU4M2VmZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dlYkZpbGVTeXN0ZW0uaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9wbGF0Zm9ybS9XZWJGaWxlU3lzdGVtLmgKQEAgLTQ2LDggKzQ2 LDYgQEAgcHVibGljOgogICAgIGVudW0gVHlwZSB7CiAgICAgICAgIFR5cGVUZW1wb3JhcnksCiAg ICAgICAgIFR5cGVQZXJzaXN0ZW50LAotCi0gICAgICAgIC8vIENocm9tZSBzcGVjaWZpYyBmaWxl c3lzdGVtIHR5cGUgKHVzZWQgYnkgY2hyb21lb3MpLgogICAgICAgICBUeXBlRXh0ZXJuYWwsCiAg ICAgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0 Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRjaGlu Z0VudW1zLmNwcAppbmRleCBhNDUxYjg4Li4xZjkxZDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcApAQCAtNDMzLDYgKzQzMyw3 IEBAIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViSURCS2V5OjpOdW1iZXJUeXBlLCBJ REJLZXk6Ok51bWJlclR5cGUpOwogI2lmIEVOQUJMRShGSUxFX1NZU1RFTSkKIENPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViRmlsZVN5c3RlbTo6VHlwZVRlbXBvcmFyeSwgQXN5bmNGaWxl U3lzdGVtOjpUZW1wb3JhcnkpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJGaWxl U3lzdGVtOjpUeXBlUGVyc2lzdGVudCwgQXN5bmNGaWxlU3lzdGVtOjpQZXJzaXN0ZW50KTsKK0NP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmlsZVN5c3RlbTo6VHlwZUV4dGVybmFsLCBB c3luY0ZpbGVTeXN0ZW06OkV4dGVybmFsKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o V2ViRmlsZUluZm86OlR5cGVVbmtub3duLCBGaWxlTWV0YWRhdGE6OlR5cGVVbmtub3duKTsKIENP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmlsZUluZm86OlR5cGVGaWxlLCBGaWxlTWV0 YWRhdGE6OlR5cGVGaWxlKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmlsZUlu Zm86OlR5cGVEaXJlY3RvcnksIEZpbGVNZXRhZGF0YTo6VHlwZURpcmVjdG9yeSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5j cHAKaW5kZXggNTQ0ZTc4ZC4uYzU1YzcxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0FzeW5jRmlsZVN5c3RlbUNocm9taXVtLmNwcApAQCAtMzQsNyArMzQsNiBA QAogCiAjaW5jbHVkZSAiQXN5bmNGaWxlU3lzdGVtQ2FsbGJhY2tzLmgiCiAjaW5jbHVkZSAiQXN5 bmNGaWxlV3JpdGVyQ2hyb21pdW0uaCIKLSNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2lu Y2x1ZGUgIldlYkZpbGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViRmlsZVN5c3RlbUNhbGxiYWNrc0lt cGwuaCIKICNpbmNsdWRlICJXZWJGaWxlV3JpdGVyLmgiCkBAIC00NSwxNCArNDQsNiBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKLW5hbWVzcGFjZSB7Ci0KLS8vIENocm9tZS1zcGVjaWZpYyBG aWxlU3lzdGVtIHR5cGUuCi1jb25zdCBjaGFyIGV4dGVybmFsUGF0aFByZWZpeFtdID0gImV4dGVy bmFsIjsKLWNvbnN0IHNpemVfdCBleHRlcm5hbFBhdGhQcmVmaXhMZW5ndGggPSBzaXplb2YoZXh0 ZXJuYWxQYXRoUHJlZml4KSAtIDE7Ci0KLX0KLQogYm9vbCBBc3luY0ZpbGVTeXN0ZW06OmlzQXZh aWxhYmxlKCkKIHsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTcwLDE3ICs2MSw2IEBAIEFzeW5jRmls ZVN5c3RlbUNocm9taXVtOjp+QXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0oKQogewogfQogCi1TdHJp bmcgQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW06OnRvVVJMKGNvbnN0IFN0cmluZyYgb3JpZ2luU3Ry aW5nLCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKQotewotICAgIEFTU0VSVCghbV9maWxlc3lzdGVt Um9vdFVSTC5pc0VtcHR5KCkpOwotICAgIEFTU0VSVChTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKG1f ZmlsZXN5c3RlbVJvb3RVUkwpLT50b1N0cmluZygpID09IG9yaWdpblN0cmluZyk7Ci0KLSAgICBL VVJMIHVybCA9IG1fZmlsZXN5c3RlbVJvb3RVUkw7Ci0gICAgLy8gUmVtb3ZlIHRoZSBleHRyYSBs ZWFkaW5nIHNsYXNoLgotICAgIHVybC5zZXRQYXRoKHVybC5wYXRoKCkgKyBlbmNvZGVXaXRoVVJM RXNjYXBlU2VxdWVuY2VzKGZ1bGxQYXRoLnN1YnN0cmluZygxKSkpOwotICAgIHJldHVybiB1cmw7 Ci19Ci0KIHZvaWQgQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW06Om1vdmUoY29uc3QgU3RyaW5nJiBz b3VyY2VQYXRoLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uUGF0aCwgUGFzc093blB0cjxBc3lu Y0ZpbGVTeXN0ZW1DYWxsYmFja3M+IGNhbGxiYWNrcykKIHsKICAgICBtX3dlYkZpbGVTeXN0ZW0t Pm1vdmUodmlydHVhbFBhdGhUb0ZpbGVTeXN0ZW1VUkwoc291cmNlUGF0aCksIHZpcnR1YWxQYXRo VG9GaWxlU3lzdGVtVVJMKGRlc3RpbmF0aW9uUGF0aCksIG5ldyBXZWJLaXQ6OldlYkZpbGVTeXN0 ZW1DYWxsYmFja3NJbXBsKGNhbGxiYWNrcykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0FzeW5jRmlsZVN5c3RlbUNocm9taXVtLmgKaW5kZXggNDhhZjg4NS4uMGM1NTBi NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVt Q2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVTeXN0 ZW1DaHJvbWl1bS5oCkBAIC01NCw3ICs1NCw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgfkFz eW5jRmlsZVN5c3RlbUNocm9taXVtKCk7CiAKLSAgICB2aXJ0dWFsIFN0cmluZyB0b1VSTChjb25z dCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0aCk7CiAgICAgdmly dHVhbCB2b2lkIG1vdmUoY29uc3QgU3RyaW5nJiBzb3VyY2VQYXRoLCBjb25zdCBTdHJpbmcmIGRl c3RpbmF0aW9uUGF0aCwgUGFzc093blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+KTsKICAg ICB2aXJ0dWFsIHZvaWQgY29weShjb25zdCBTdHJpbmcmIHNvdXJjZVBhdGgsIGNvbnN0IFN0cmlu ZyYgZGVzdGluYXRpb25QYXRoLCBQYXNzT3duUHRyPEFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcz4p OwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmUoY29uc3QgU3RyaW5nJiBwYXRoLCBQYXNzT3duUHRy PEFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcz4pOwo=