235506 2022-01-24 03:54:16 -0800 [JSC] Wasm module import should be done in sync when WebAssembly.instantiate gets module 2022-01-25 11:56:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1833247 0 ysuzuki 2022-01-24 03:54:16 -0800 [JSC] Wasm module import should be done in sync when WebAssembly.instantiate gets module 1833249 1 449798 ysuzuki 2022-01-24 03:59:07 -0800 Created attachment 449798 Patch 1833426 2 449841 ysuzuki 2022-01-24 12:12:05 -0800 Created attachment 449841 Patch 1833793 3 449841 saam 2022-01-25 11:27:56 -0800 Comment on attachment 449841 Patch r=me 1833800 4 ews-feeder 2022-01-25 11:55:36 -0800 Committed r288573 (246396@main): <https://commits.webkit.org/246396@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449841. 1833802 5 webkit-bug-importer 2022-01-25 11:56:16 -0800 <rdar://problem/88036775> 449798 2022-01-24 03:59:07 -0800 2022-01-24 12:12:04 -0800 Patch bug-235506-20220124035906.patch text/plain 23592 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi YTE4YTgzYTYwMzg1Zjk5YjNkOTNmODdlNzJiZDYzYjYxOTNjZTYyLi45ZWI1ZWFlNDlkYzUyODVi MDExNzc2Y2JiZGUwNjFlY2FhMzY5N2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MiBAQAorMjAyMi0wMS0yNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFdhc20gbW9kdWxlIGltcG9ydCBzaG91bGQgYmUgZG9uZSBpbiBz eW5jIHdoZW4gV2ViQXNzZW1ibHkuaW5zdGFudGlhdGUgZ2V0cyBtb2R1bGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTUwNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjY29yZGluZyB0byB0aGUgc3Bl YywgbW9kdWxlIGltcG9ydHMgbmVlZCB0byBiZSBkb25lIHN5bmNocm9ub3VzbHkgd2hlbiBXZWJB c3NlbWJseS5pbnN0YW50aWF0ZQorICAgICAgICBpcyBjYWxsZWQgd2l0aCBhIHdhc20gbW9kdWxl WzFdLgorCisgICAgICAgIFRvIGFsaWduIG91ciBpbXBsZW1lbnRhdGlvbiB0byB0aGlzIGJlaGF2 aW9yLCB3ZSBzcGxpdCBXZWJBc3NlbWJseU1vZHVsZVJlY29yZDo6aW5pdGlhbGl6ZUltcG9ydHNB bmRFeHBvcnRzCisgICAgICAgIGludG8gV2ViQXNzZW1ibHlNb2R1bGVSZWNvcmQ6OmluaXRpYWxp emVJbXBvcnRzIGFuZCBXZWJBc3NlbWJseU1vZHVsZVJlY29yZDo6aW5pdGlhbGl6ZUV4cG9ydHMu IFRoZSBmb3JtZXIKKyAgICAgICAgZG9lcyBub3QgcmVxdWlyZSBDYWxsZWVHcm91cHMgc28gd2Ug Y2FuIGV4ZWN1dGUgYmVmb3JlIGNvbXBpbGluZyBDYWxsZWVHcm91cHMuCisKKyAgICAgICAgWzFd OiBodHRwczovL3dlYmFzc2VtYmx5LmdpdGh1Yi5pby9zcGVjL2pzLWFwaS8jYXN5bmNocm9ub3Vz bHktaW5zdGFudGlhdGUtYS13ZWJhc3NlbWJseS1tb2R1bGUKKworICAgICAgICAqIHJ1bnRpbWUv QWJzdHJhY3RNb2R1bGVSZWNvcmQuY3BwOgorICAgICAgICAoSlNDOjpBYnN0cmFjdE1vZHVsZVJl Y29yZDo6ZXZhbHVhdGUpOgorICAgICAgICAqIHdhc20vV2FzbUluc3RhbmNlLmg6CisgICAgICAg IChKU0M6Oldhc206Okluc3RhbmNlOjpzZXRPd25lcik6CisgICAgICAgIChKU0M6Oldhc206Oklu c3RhbmNlOjpmaW5hbGl6ZUNyZWF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiB3YXNtL1dhc21N b2R1bGVJbmZvcm1hdGlvbi5oOgorICAgICAgICAoSlNDOjpXYXNtOjpNb2R1bGVJbmZvcm1hdGlv bjo6aGFzTWVtb3J5SW1wb3J0IGNvbnN0KToKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1i bHkuY3BwOgorICAgICAgICAoSlNDOjppbnN0YW50aWF0ZSk6CisgICAgICAgIChKU0M6OnJlc29s dmUpOiBEZWxldGVkLgorICAgICAgICAqIHdhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNw cDoKKyAgICAgICAgKEpTQzo6SlNXZWJBc3NlbWJseUluc3RhbmNlOjpKU1dlYkFzc2VtYmx5SW5z dGFuY2UpOgorICAgICAgICAoSlNDOjpKU1dlYkFzc2VtYmx5SW5zdGFuY2U6OmluaXRpYWxpemVJ bXBvcnRzKToKKyAgICAgICAgKEpTQzo6SlNXZWJBc3NlbWJseUluc3RhbmNlOjpmaW5hbGl6ZUNy ZWF0aW9uKToKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5oOgorICAg ICAgICAqIHdhc20vanMvV2ViQXNzZW1ibHlJbnN0YW5jZUNvbnN0cnVjdG9yLmNwcDoKKyAgICAg ICAgKEpTQzo6SlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKToKKyAgICAgICAgKiB3YXNtL2pzL1dl YkFzc2VtYmx5TW9kdWxlUmVjb3JkLmNwcDoKKyAgICAgICAgKEpTQzo6V2ViQXNzZW1ibHlNb2R1 bGVSZWNvcmQ6OmluaXRpYWxpemVJbXBvcnRzKToKKyAgICAgICAgKEpTQzo6V2ViQXNzZW1ibHlN b2R1bGVSZWNvcmQ6OmluaXRpYWxpemVFeHBvcnRzKToKKyAgICAgICAgKEpTQzo6V2ViQXNzZW1i bHlNb2R1bGVSZWNvcmQ6OmluaXRpYWxpemVJbXBvcnRzQW5kRXhwb3J0cyk6IERlbGV0ZWQuCisg ICAgICAgICogd2FzbS9qcy9XZWJBc3NlbWJseU1vZHVsZVJlY29yZC5oOgorCiAyMDIyLTAxLTIx ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLCByZXZlcnRpbmcgcjI4ODQwMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0Fic3RyYWN0TW9kdWxlUmVjb3JkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0Fic3RyYWN0TW9kdWxlUmVjb3JkLmNwcAppbmRleCA4ZmQ3NjdjNjE2ZDJm ODA1ZGIxYmRmOTY4NDM4YzE2N2EyYjBmNDcyLi40MjViOGZhZDEzODBlNzNjNjhlODIxNmRlNDVi ZWQ0NmRiYWFkZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9B YnN0cmFjdE1vZHVsZVJlY29yZC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQWJzdHJhY3RNb2R1bGVSZWNvcmQuY3BwCkBAIC04NDMsNyArODQzLDkgQEAgSlNfRVhQT1JU X1BSSVZBVEUgSlNWYWx1ZSBBYnN0cmFjdE1vZHVsZVJlY29yZDo6ZXZhbHVhdGUoSlNHbG9iYWxP YmplY3QqIGdsb2JhbE8KICAgICAgICAgLy8gV2ViQXNzZW1ibHkgaW1wb3J0cyBuZWVkIHRvIGJl IHN1cHBsaWVkIGR1cmluZyBldmFsdWF0aW9uIHNvIHRoYXQsIGUuZy4sCiAgICAgICAgIC8vIEpT IG1vZHVsZSBleHBvcnRzIGFyZSBhY3R1YWxseSBhdmFpbGFibGUgdG8gYmUgcmVhZCBhbmQgaW5z dGFsbGVkIGFzIGltcG9ydAogICAgICAgICAvLyBiaW5kaW5ncy4KLSAgICAgICAgd2FzbU1vZHVs ZVJlY29yZC0+aW5pdGlhbGl6ZUltcG9ydHNBbmRFeHBvcnRzKGdsb2JhbE9iamVjdCwgbnVsbHB0 ciwgV2FzbTo6Q3JlYXRpb25Nb2RlOjpGcm9tTW9kdWxlTG9hZGVyKTsKKyAgICAgICAgd2FzbU1v ZHVsZVJlY29yZC0+aW5pdGlhbGl6ZUltcG9ydHMoZ2xvYmFsT2JqZWN0LCBudWxscHRyLCBXYXNt OjpDcmVhdGlvbk1vZGU6OkZyb21Nb2R1bGVMb2FkZXIpOworICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHNjb3BlLCBqc1VuZGVmaW5lZCgpKTsKKyAgICAgICAgd2FzbU1vZHVsZVJlY29yZC0+ aW5pdGlhbGl6ZUV4cG9ydHMoZ2xvYmFsT2JqZWN0KTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwganNVbmRlZmluZWQoKSk7CiAgICAgICAgIFJFTEVBU0VfQU5EX1JFVFVSTihz Y29wZSwgd2FzbU1vZHVsZVJlY29yZC0+ZXZhbHVhdGUoZ2xvYmFsT2JqZWN0KSk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUluc3RhbmNlLmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtSW5zdGFuY2UuaAppbmRleCA3NDBlNzljNTE1 MDZlYTc3OWM5ZDg4NWNkYWEwYjcwNjA4NWU2NmZkLi43MTBiODc2ZTIyNDVlM2ZjMWZmZWRjYmVl ODhjNDg0MTEwNzFkNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X YXNtSW5zdGFuY2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtSW5zdGFu Y2UuaApAQCAtNTYsNyArNTYsNyBAQCBjbGFzcyBJbnN0YW5jZSA6IHB1YmxpYyBUaHJlYWRTYWZl UmVmQ291bnRlZDxJbnN0YW5jZT4sIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxJbgogCiAgICAgc3Rh dGljIFJlZjxJbnN0YW5jZT4gY3JlYXRlKENvbnRleHQqLCBSZWY8TW9kdWxlPiYmLCBFbnRyeUZy YW1lKiogcG9pbnRlclRvVG9wRW50cnlGcmFtZSwgdm9pZCoqIHBvaW50ZXJUb0FjdHVhbFN0YWNr TGltaXQsIFN0b3JlVG9wQ2FsbEZyYW1lQ2FsbGJhY2smJik7CiAKLSAgICB2b2lkIGZpbmFsaXpl Q3JlYXRpb24odm9pZCogb3duZXIpCisgICAgdm9pZCBzZXRPd25lcih2b2lkKiBvd25lcikKICAg ICB7CiAgICAgICAgIG1fb3duZXIgPSBvd25lcjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTW9kdWxlSW5mb3JtYXRpb24uaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL1dhc21Nb2R1bGVJbmZvcm1hdGlvbi5oCmluZGV4IDIxYTM5MjdmMjUx ZjAxOWYyZjBjNTRlMjkxN2IxMjU1N2FiZDQ2ZjcuLmE2MWY2OTIwZjVhYmNjNzMzN2IzYWNkZWEy YmE0YzY5YjI3YmRjNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21Nb2R1bGVJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21Nb2R1bGVJbmZvcm1hdGlvbi5oCkBAIC05NCw2ICs5NCw4IEBAIHN0cnVjdCBNb2R1bGVJbmZv cm1hdGlvbiA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxNb2R1bGVJbmZvcm1hdGlvbj4g ewogICAgIGJvb2wgaXNEZWNsYXJlZEV4Y2VwdGlvbih1aW50MzJfdCBpbmRleCkgY29uc3QgeyBy ZXR1cm4gbV9kZWNsYXJlZEV4Y2VwdGlvbnMuY29udGFpbnMoaW5kZXgpOyB9CiAgICAgdm9pZCBh ZGREZWNsYXJlZEV4Y2VwdGlvbih1aW50MzJfdCBpbmRleCkgeyBtX2RlY2xhcmVkRXhjZXB0aW9u cy5zZXQoaW5kZXgpOyB9CiAKKyAgICBib29sIGhhc01lbW9yeUltcG9ydCgpIGNvbnN0IHsgcmV0 dXJuIG1lbW9yeS5pc0ltcG9ydCgpOyB9CisKICAgICBWZWN0b3I8SW1wb3J0PiBpbXBvcnRzOwog ICAgIFZlY3RvcjxTaWduYXR1cmVJbmRleD4gaW1wb3J0RnVuY3Rpb25TaWduYXR1cmVJbmRpY2Vz OwogICAgIFZlY3RvcjxTaWduYXR1cmVJbmRleD4gaW50ZXJuYWxGdW5jdGlvblNpZ25hdHVyZUlu ZGljZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFz c2VtYmx5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHku Y3BwCmluZGV4IDRkMWVhNDE1MTVlOGFmODAwNDZjOTA3YmEyNTc0MTFjZTg5OWI3MGQuLjgyZDYz MTljNjE2MzViNTdmNjQ0ODM4OTQ5MjYwNDdjYjM4MzNmYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHkuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHkuY3BwCkBAIC0xMzcsMzIgKzEzNyw2IEBA IEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTih3ZWJBc3NlbWJseUNvbXBpbGVGdW5jLCAoSlNHbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCwKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHByb21p c2UpOwogfQogCi1lbnVtIGNsYXNzIFJlc29sdmUgeyBXaXRoSW5zdGFuY2UsIFdpdGhNb2R1bGVS ZWNvcmQsIFdpdGhNb2R1bGVBbmRJbnN0YW5jZSB9Owotc3RhdGljIHZvaWQgcmVzb2x2ZShWTSYg dm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTUHJvbWlzZSogcHJvbWlzZSwgSlNX ZWJBc3NlbWJseUluc3RhbmNlKiBpbnN0YW5jZSwgSlNXZWJBc3NlbWJseU1vZHVsZSogbW9kdWxl LCBKU09iamVjdCogaW1wb3J0T2JqZWN0LCBSZWY8V2FzbTo6Q2FsbGVlR3JvdXA+JiYgY2FsbGVl R3JvdXAsIFJlc29sdmUgcmVzb2x2ZUtpbmQsIFdhc206OkNyZWF0aW9uTW9kZSBjcmVhdGlvbk1v ZGUpCi17Ci0gICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwotICAgIGlu c3RhbmNlLT5maW5hbGl6ZUNyZWF0aW9uKHZtLCBnbG9iYWxPYmplY3QsIFdURk1vdmUoY2FsbGVl R3JvdXApLCBpbXBvcnRPYmplY3QsIGNyZWF0aW9uTW9kZSk7Ci0gICAgaWYgKFVOTElLRUxZKHNj b3BlLmV4Y2VwdGlvbigpKSkgewotICAgICAgICBwcm9taXNlLT5yZWplY3RXaXRoQ2F1Z2h0RXhj ZXB0aW9uKGdsb2JhbE9iamVjdCwgc2NvcGUpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0g ICAgc2NvcGUucmVsZWFzZSgpOwotICAgIGlmIChyZXNvbHZlS2luZCA9PSBSZXNvbHZlOjpXaXRo SW5zdGFuY2UpCi0gICAgICAgIHByb21pc2UtPnJlc29sdmUoZ2xvYmFsT2JqZWN0LCBpbnN0YW5j ZSk7Ci0gICAgZWxzZSBpZiAocmVzb2x2ZUtpbmQgPT0gUmVzb2x2ZTo6V2l0aE1vZHVsZVJlY29y ZCkgewotICAgICAgICBhdXRvKiBtb2R1bGVSZWNvcmQgPSBpbnN0YW5jZS0+bW9kdWxlUmVjb3Jk KCk7Ci0gICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjpkdW1wTW9kdWxlUmVjb3JkKCkpKQot ICAgICAgICAgICAgbW9kdWxlUmVjb3JkLT5kdW1wKCk7Ci0gICAgICAgIHByb21pc2UtPnJlc29s dmUoZ2xvYmFsT2JqZWN0LCBtb2R1bGVSZWNvcmQpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIEpT T2JqZWN0KiByZXN1bHQgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChnbG9iYWxPYmplY3QpOwotICAg ICAgICByZXN1bHQtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgIm1v ZHVsZSJfcyksIG1vZHVsZSk7Ci0gICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBJZGVudGlm aWVyOjpmcm9tU3RyaW5nKHZtLCAiaW5zdGFuY2UiX3MpLCBpbnN0YW5jZSk7Ci0gICAgICAgIHBy b21pc2UtPnJlc29sdmUoZ2xvYmFsT2JqZWN0LCByZXN1bHQpOwotICAgIH0KLX0KLQogdm9pZCBK U1dlYkFzc2VtYmx5Ojp3ZWJBc3NlbWJseU1vZHVsZVZhbGlkYXRlQXN5bmMoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgSlNQcm9taXNlKiBwcm9taXNlLCBWZWN0b3I8dWludDhfdD4mJiBz b3VyY2UpCiB7CiAgICAgVk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOwpAQCAtMTg2LDYgKzE2 MCw3IEBAIHZvaWQgSlNXZWJBc3NlbWJseTo6d2ViQXNzZW1ibHlNb2R1bGVWYWxpZGF0ZUFzeW5j KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsCiAgICAgfSkpOwogfQogCitlbnVtIGNsYXNz IFJlc29sdmUgeyBXaXRoSW5zdGFuY2UsIFdpdGhNb2R1bGVSZWNvcmQsIFdpdGhNb2R1bGVBbmRJ bnN0YW5jZSB9Owogc3RhdGljIHZvaWQgaW5zdGFudGlhdGUoVk0mIHZtLCBKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0LCBKU1Byb21pc2UqIHByb21pc2UsIEpTV2ViQXNzZW1ibHlNb2R1bGUq IG1vZHVsZSwgSlNPYmplY3QqIGltcG9ydE9iamVjdCwgY29uc3QgSWRlbnRpZmllciYgbW9kdWxl S2V5LCBSZXNvbHZlIHJlc29sdmVLaW5kLCBXYXNtOjpDcmVhdGlvbk1vZGUgY3JlYXRpb25Nb2Rl KQogewogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKQEAgLTE5Nywx OCArMTcyLDUxIEBAIHN0YXRpYyB2b2lkIGluc3RhbnRpYXRlKFZNJiB2bSwgSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgSlNQcm9taXNlKiBwcm9taXNlCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKKyAgICBpbnN0YW5jZS0+aW5pdGlhbGl6ZUltcG9ydHMoZ2xvYmFsT2JqZWN0LCBpbXBv cnRPYmplY3QsIGNyZWF0aW9uTW9kZSk7CisgICAgaWYgKFVOTElLRUxZKHNjb3BlLmV4Y2VwdGlv bigpKSkgeworICAgICAgICBwcm9taXNlLT5yZWplY3RXaXRoQ2F1Z2h0RXhjZXB0aW9uKGdsb2Jh bE9iamVjdCwgc2NvcGUpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgVmVjdG9yPFN0 cm9uZzxKU0NlbGw+PiBkZXBlbmRlbmNpZXM7CiAgICAgLy8gVGhlIGluc3RhbmNlIGtlZXBzIHRo ZSBtb2R1bGUgYWxpdmUuCiAgICAgZGVwZW5kZW5jaWVzLmFwcGVuZChTdHJvbmc8SlNDZWxsPih2 bSwgcHJvbWlzZSkpOwotICAgIGRlcGVuZGVuY2llcy5hcHBlbmQoU3Ryb25nPEpTQ2VsbD4odm0s IGltcG9ydE9iamVjdCkpOwogCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIGF1dG8gdGlja2V0 ID0gdm0uZGVmZXJyZWRXb3JrVGltZXItPmFkZFBlbmRpbmdXb3JrKHZtLCBpbnN0YW5jZSwgV1RG TW92ZShkZXBlbmRlbmNpZXMpKTsKICAgICAvLyBOb3RlOiBUaGlzIGNvbXBsZXRpb24gdGFzayBt YXkgb3IgbWF5IG5vdCBnZXQgY2FsbGVkIGltbWVkaWF0ZWx5LgotICAgIG1vZHVsZS0+bW9kdWxl KCkuY29tcGlsZUFzeW5jKCZ2bS53YXNtQ29udGV4dCwgaW5zdGFuY2UtPm1lbW9yeU1vZGUoKSwg Y3JlYXRlU2hhcmVkVGFzazxXYXNtOjpDYWxsZWVHcm91cDo6Q2FsbGJhY2tUeXBlPihbdGlja2V0 LCBwcm9taXNlLCBpbnN0YW5jZSwgbW9kdWxlLCBpbXBvcnRPYmplY3QsIHJlc29sdmVLaW5kLCBj cmVhdGlvbk1vZGUsICZ2bV0gKFJlZjxXYXNtOjpDYWxsZWVHcm91cD4mJiByZWZDYWxsZWVHcm91 cCkgbXV0YWJsZSB7CisgICAgbW9kdWxlLT5tb2R1bGUoKS5jb21waWxlQXN5bmMoJnZtLndhc21D b250ZXh0LCBpbnN0YW5jZS0+bWVtb3J5TW9kZSgpLCBjcmVhdGVTaGFyZWRUYXNrPFdhc206OkNh bGxlZUdyb3VwOjpDYWxsYmFja1R5cGU+KFt0aWNrZXQsIHByb21pc2UsIGluc3RhbmNlLCBtb2R1 bGUsIHJlc29sdmVLaW5kLCBjcmVhdGlvbk1vZGUsICZ2bV0gKFJlZjxXYXNtOjpDYWxsZWVHcm91 cD4mJiByZWZDYWxsZWVHcm91cCkgbXV0YWJsZSB7CiAgICAgICAgIFJlZlB0cjxXYXNtOjpDYWxs ZWVHcm91cD4gY2FsbGVlR3JvdXAgPSBXVEZNb3ZlKHJlZkNhbGxlZUdyb3VwKTsKLSAgICAgICAg dm0uZGVmZXJyZWRXb3JrVGltZXItPnNjaGVkdWxlV29ya1Nvb24odGlja2V0LCBbcHJvbWlzZSwg aW5zdGFuY2UsIG1vZHVsZSwgaW1wb3J0T2JqZWN0LCByZXNvbHZlS2luZCwgY3JlYXRpb25Nb2Rl LCAmdm0sIGNhbGxlZUdyb3VwID0gV1RGTW92ZShjYWxsZWVHcm91cCldKERlZmVycmVkV29ya1Rp bWVyOjpUaWNrZXQpIG11dGFibGUgeworICAgICAgICB2bS5kZWZlcnJlZFdvcmtUaW1lci0+c2No ZWR1bGVXb3JrU29vbih0aWNrZXQsIFtwcm9taXNlLCBpbnN0YW5jZSwgbW9kdWxlLCByZXNvbHZl S2luZCwgY3JlYXRpb25Nb2RlLCAmdm0sIGNhbGxlZUdyb3VwID0gV1RGTW92ZShjYWxsZWVHcm91 cCldKERlZmVycmVkV29ya1RpbWVyOjpUaWNrZXQpIG11dGFibGUgeworICAgICAgICAgICAgYXV0 byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogICAgICAgICAgICAgSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCA9IGluc3RhbmNlLT5nbG9iYWxPYmplY3QoKTsKLSAgICAgICAg ICAgIHJlc29sdmUodm0sIGdsb2JhbE9iamVjdCwgcHJvbWlzZSwgaW5zdGFuY2UsIG1vZHVsZSwg aW1wb3J0T2JqZWN0LCBjYWxsZWVHcm91cC5yZWxlYXNlTm9uTnVsbCgpLCByZXNvbHZlS2luZCwg Y3JlYXRpb25Nb2RlKTsKKyAgICAgICAgICAgIGluc3RhbmNlLT5maW5hbGl6ZUNyZWF0aW9uKHZt LCBnbG9iYWxPYmplY3QsIGNhbGxlZUdyb3VwLnJlbGVhc2VOb25OdWxsKCksIGNyZWF0aW9uTW9k ZSk7CisgICAgICAgICAgICBpZiAoVU5MSUtFTFkoc2NvcGUuZXhjZXB0aW9uKCkpKSB7CisgICAg ICAgICAgICAgICAgcHJvbWlzZS0+cmVqZWN0V2l0aENhdWdodEV4Y2VwdGlvbihnbG9iYWxPYmpl Y3QsIHNjb3BlKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKKyAgICAgICAgICAgIHN3aXRjaCAocmVzb2x2ZUtp bmQpIHsKKyAgICAgICAgICAgIGNhc2UgUmVzb2x2ZTo6V2l0aEluc3RhbmNlOiB7CisgICAgICAg ICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZShnbG9iYWxPYmplY3QsIGluc3RhbmNlKTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNhc2UgUmVzb2x2 ZTo6V2l0aE1vZHVsZVJlY29yZDogeworICAgICAgICAgICAgICAgIGF1dG8qIG1vZHVsZVJlY29y ZCA9IGluc3RhbmNlLT5tb2R1bGVSZWNvcmQoKTsKKyAgICAgICAgICAgICAgICBpZiAoVU5MSUtF TFkoT3B0aW9uczo6ZHVtcE1vZHVsZVJlY29yZCgpKSkKKyAgICAgICAgICAgICAgICAgICAgbW9k dWxlUmVjb3JkLT5kdW1wKCk7CisgICAgICAgICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZShnbG9i YWxPYmplY3QsIG1vZHVsZVJlY29yZCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBjYXNlIFJlc29sdmU6OldpdGhNb2R1bGVBbmRJbnN0YW5jZTog eworICAgICAgICAgICAgICAgIEpTT2JqZWN0KiByZXN1bHQgPSBjb25zdHJ1Y3RFbXB0eU9iamVj dChnbG9iYWxPYmplY3QpOworICAgICAgICAgICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBJ ZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAibW9kdWxlIl9zKSwgbW9kdWxlKTsKKyAgICAgICAg ICAgICAgICByZXN1bHQtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwg Imluc3RhbmNlIl9zKSwgaW5zdGFuY2UpOworICAgICAgICAgICAgICAgIHByb21pc2UtPnJlc29s dmUoZ2xvYmFsT2JqZWN0LCByZXN1bHQpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICB9KTsKICAgICB9KSk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2Uu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNl LmNwcAppbmRleCA3Yjg2NzUzMzI5ZTI1M2I3NTBlODQ0Mjg5MDQyYjBlYTQ0YjRhMWQ2Li43ZjFi YTkyNjY5NmI0NzBiNTMyMjIxMWZjZWRiNjA3MzQ3YTNjZmY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5jcHAKQEAg LTUzLDYgKzUzLDcgQEAgSlNXZWJBc3NlbWJseUluc3RhbmNlOjpKU1dlYkFzc2VtYmx5SW5zdGFu Y2UoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgUmVmPFcKICAgICAsIG1fZ2xvYmFsT2Jq ZWN0KHZtLCB0aGlzLCBzdHJ1Y3R1cmUtPmdsb2JhbE9iamVjdCgpKQogICAgICwgbV90YWJsZXMo bV9pbnN0YW5jZS0+bW9kdWxlKCkubW9kdWxlSW5mb3JtYXRpb24oKS50YWJsZUNvdW50KCkpCiB7 CisgICAgbV9pbnN0YW5jZS0+c2V0T3duZXIodGhpcyk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHRoaXMtPmluc3RhbmNlKCkubnVtSW1wb3J0RnVuY3Rpb25zKCk7ICsraSkKICAgICAg ICAgbmV3ICh0aGlzLT5pbnN0YW5jZSgpLmltcG9ydEZ1bmN0aW9uPFdyaXRlQmFycmllcjxKU09i amVjdD4+KGkpKSBXcml0ZUJhcnJpZXI8SlNPYmplY3Q+KCk7CiB9CkBAIC0xMDQsMTAgKzEwNSwy MiBAQCB2b2lkIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6dmlzaXRDaGlsZHJlbkltcGwoSlNDZWxs KiBjZWxsLCBWaXNpdG9yJiB2aXNpdG9yKQogCiBERUZJTkVfVklTSVRfQ0hJTERSRU4oSlNXZWJB c3NlbWJseUluc3RhbmNlKTsKIAotdm9pZCBKU1dlYkFzc2VtYmx5SW5zdGFuY2U6OmZpbmFsaXpl Q3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBSZWY8V2FzbTo6 Q2FsbGVlR3JvdXA+JiYgd2FzbUNhbGxlZUdyb3VwLCBKU09iamVjdCogaW1wb3J0T2JqZWN0LCBX YXNtOjpDcmVhdGlvbk1vZGUgY3JlYXRpb25Nb2RlKQordm9pZCBKU1dlYkFzc2VtYmx5SW5zdGFu Y2U6OmluaXRpYWxpemVJbXBvcnRzKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTT2Jq ZWN0KiBpbXBvcnRPYmplY3QsIFdhc206OkNyZWF0aW9uTW9kZSBjcmVhdGlvbk1vZGUpCiB7Ci0g ICAgbV9pbnN0YW5jZS0+ZmluYWxpemVDcmVhdGlvbih0aGlzKTsKKyAgICBWTSYgdm0gPSBnbG9i YWxPYmplY3QtPnZtKCk7CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0p OworCisgICAgbV9tb2R1bGVSZWNvcmQtPnByZXBhcmVMaW5rKHZtLCB0aGlzKTsKKyAgICBpZiAo Y3JlYXRpb25Nb2RlID09IFdhc206OkNyZWF0aW9uTW9kZTo6RnJvbUpTKSB7CisgICAgICAgIG1f bW9kdWxlUmVjb3JkLT5saW5rKGdsb2JhbE9iamVjdCwganNOdWxsKCkpOworICAgICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOworICAgICAgICBtX21vZHVsZVJlY29yZC0+ aW5pdGlhbGl6ZUltcG9ydHMoZ2xvYmFsT2JqZWN0LCBpbXBvcnRPYmplY3QsIGNyZWF0aW9uTW9k ZSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CisgICAgfQor fQogCit2b2lkIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6ZmluYWxpemVDcmVhdGlvbihWTSYgdm0s IEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFJlZjxXYXNtOjpDYWxsZWVHcm91cD4mJiB3 YXNtQ2FsbGVlR3JvdXAsIFdhc206OkNyZWF0aW9uTW9kZSBjcmVhdGlvbk1vZGUpCit7CiAgICAg YXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCiAgICAgaWYgKCF3YXNtQ2Fs bGVlR3JvdXAtPnJ1bm5hYmxlKCkpIHsKQEAgLTEyMSw4ICsxMzQsNyBAQCB2b2lkIEpTV2ViQXNz ZW1ibHlJbnN0YW5jZTo6ZmluYWxpemVDcmVhdGlvbihWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBn bG9iYWxPYmplYwogICAgIC8vIHJlc3VsdHMsIHNvIHRoYXQgbGF0ZXIgd2hlbiBtZW1vcnkgaW1w b3J0cyBiZWNvbWUgYXZhaWxhYmxlLCB0aGUgYXBwcm9wcmlhdGUgQ2FsbGVlR3JvdXAgY2FuIGJl IHVzZWQuCiAgICAgLy8gSWYgTExJbnQgaXMgZGlzYWJsZWQsIHdlIGluc3RlYWQgZGVmZXIgY29t cGlsYXRpb24gdG8gbW9kdWxlIGV2YWx1YXRpb24uCiAgICAgLy8gSWYgdGhlIGNvZGUgaXMgYWxy ZWFkeSBjb21waWxlZCwgZS5nLiB0aGUgbW9kdWxlIHdhcyBhbHJlYWR5IGluc3RhbnRpYXRlZCBi ZWZvcmUsIHdlIGRvIG5vdCByZS1pbml0aWFsaXplLgotICAgIGJvb2wgaGFzTWVtb3J5SW1wb3J0 ID0gbW9kdWxlKCktPm1vZHVsZUluZm9ybWF0aW9uKCkubWVtb3J5LmlzSW1wb3J0KCk7Ci0gICAg aWYgKE9wdGlvbnM6OnVzZVdhc21MTEludCgpICYmIGhhc01lbW9yeUltcG9ydCkgeworICAgIGlm IChPcHRpb25zOjp1c2VXYXNtTExJbnQoKSAmJiBtb2R1bGUoKS0+bW9kdWxlSW5mb3JtYXRpb24o KS5oYXNNZW1vcnlJbXBvcnQoKSkgewogICAgICAgICBXYXNtOjpNZW1vcnlNb2RlIGluaXRpYWxN b2RlID0gV2FzbTo6TWVtb3J5TW9kZTo6Qm91bmRzQ2hlY2tpbmc7CiAgICAgICAgIEFTU0VSVCht ZW1vcnlNb2RlKCkgPT0gaW5pdGlhbE1vZGUpOwogICAgICAgICBtb2R1bGUoKS0+bW9kdWxlKCku Y29weUluaXRpYWxDYWxsZWVHcm91cFRvQWxsTWVtb3J5TW9kZXMoaW5pdGlhbE1vZGUpOwpAQCAt MTQwLDEyICsxNTIsOCBAQCB2b2lkIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6ZmluYWxpemVDcmVh dGlvbihWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplYwogICAgICAgICBpbmZvLT53 YXNtVG9FbWJlZGRlclN0dWIgPSBtX21vZHVsZS0+d2FzbVRvRW1iZWRkZXJTdHViKGltcG9ydEZ1 bmN0aW9uTnVtKTsKICAgICB9CiAKLSAgICBtX21vZHVsZVJlY29yZC0+cHJlcGFyZUxpbmsodm0s IHRoaXMpOwotCiAgICAgaWYgKGNyZWF0aW9uTW9kZSA9PSBXYXNtOjpDcmVhdGlvbk1vZGU6OkZy b21KUykgewotICAgICAgICBtX21vZHVsZVJlY29yZC0+bGluayhnbG9iYWxPYmplY3QsIGpzTnVs bCgpKTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKLSAgICAg ICAgbV9tb2R1bGVSZWNvcmQtPmluaXRpYWxpemVJbXBvcnRzQW5kRXhwb3J0cyhnbG9iYWxPYmpl Y3QsIGltcG9ydE9iamVjdCwgY3JlYXRpb25Nb2RlKTsKKyAgICAgICAgbV9tb2R1bGVSZWNvcmQt PmluaXRpYWxpemVFeHBvcnRzKGdsb2JhbE9iamVjdCk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIHZvaWQoKSk7CiAKICAgICAgICAgSlNWYWx1ZSBzdGFydFJlc3VsdCA9IG1f bW9kdWxlUmVjb3JkLT5ldmFsdWF0ZShnbG9iYWxPYmplY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuaAppbmRleCAwYjFi N2E3ZGIxMGQ3MzUzZmI2OTM2MGE1ZmY0ODNkNzI4NDMwZjczLi5kNDE1MWMzMDQ4MTkxNmMyYzFh MzY2MmY5YTQ0YmE0MjAzZjIwZjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuaApAQCAtNjcsNyArNjcsOCBAQCBjbGFz cyBKU1dlYkFzc2VtYmx5SW5zdGFuY2UgZmluYWwgOiBwdWJsaWMgSlNOb25GaW5hbE9iamVjdCB7 CiAKICAgICBERUNMQVJFX0VYUE9SVF9JTkZPOwogCi0gICAgdm9pZCBmaW5hbGl6ZUNyZWF0aW9u KFZNJiwgSlNHbG9iYWxPYmplY3QqLCBSZWY8V2FzbTo6Q2FsbGVlR3JvdXA+JiYsIEpTT2JqZWN0 KiBpbXBvcnRPYmplY3QsIFdhc206OkNyZWF0aW9uTW9kZSk7CisgICAgdm9pZCBpbml0aWFsaXpl SW1wb3J0cyhKU0dsb2JhbE9iamVjdCosIEpTT2JqZWN0KiBpbXBvcnRPYmplY3QsIFdhc206OkNy ZWF0aW9uTW9kZSk7CisgICAgdm9pZCBmaW5hbGl6ZUNyZWF0aW9uKFZNJiwgSlNHbG9iYWxPYmpl Y3QqLCBSZWY8V2FzbTo6Q2FsbGVlR3JvdXA+JiYsIFdhc206OkNyZWF0aW9uTW9kZSk7CiAgICAg CiAgICAgV2FzbTo6SW5zdGFuY2UmIGluc3RhbmNlKCkgeyByZXR1cm4gbV9pbnN0YW5jZS5nZXQo KTsgfQogICAgIFdlYkFzc2VtYmx5TW9kdWxlUmVjb3JkKiBtb2R1bGVSZWNvcmQoKSB7IHJldHVy biBtX21vZHVsZVJlY29yZC5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vanMvV2ViQXNzZW1ibHlJbnN0YW5jZUNvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5SW5zdGFuY2VDb25zdHJ1Y3Rvci5jcHAK aW5kZXggN2ExMDdlMjFjZjY1NmNkODkyMjgzMzJlZTg4MzFiYmU1ZDBiZTdkNC4uNzUyMzMzMzMy ZmZmNjY4NzBjZGE5NTkzZWFlYzcxNDkxMTM1ZWQ0ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlJbnN0YW5jZUNvbnN0cnVjdG9yLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUluc3RhbmNlQ29uc3Ry dWN0b3IuY3BwCkBAIC03Miw3ICs3MiwxMCBAQCBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04oY29u c3RydWN0SlNXZWJBc3NlbWJseUluc3RhbmNlLCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbAogICAg IEpTV2ViQXNzZW1ibHlJbnN0YW5jZSogaW5zdGFuY2UgPSBKU1dlYkFzc2VtYmx5SW5zdGFuY2U6 OnRyeUNyZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0LCBKU1dlYkFzc2VtYmx5SW5zdGFuY2U6OmNyZWF0 ZVByaXZhdGVNb2R1bGVLZXkoKSwgbW9kdWxlLCBpbXBvcnRPYmplY3QsIGluc3RhbmNlU3RydWN0 dXJlLCBSZWY8V2FzbTo6TW9kdWxlPihtb2R1bGUtPm1vZHVsZSgpKSwgV2FzbTo6Q3JlYXRpb25N b2RlOjpGcm9tSlMpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7CiAKLSAg ICBpbnN0YW5jZS0+ZmluYWxpemVDcmVhdGlvbih2bSwgZ2xvYmFsT2JqZWN0LCBtb2R1bGUtPm1v ZHVsZSgpLmNvbXBpbGVTeW5jKCZ2bS53YXNtQ29udGV4dCwgaW5zdGFuY2UtPm1lbW9yeU1vZGUo KSksIGltcG9ydE9iamVjdCwgV2FzbTo6Q3JlYXRpb25Nb2RlOjpGcm9tSlMpOworICAgIGluc3Rh bmNlLT5pbml0aWFsaXplSW1wb3J0cyhnbG9iYWxPYmplY3QsIGltcG9ydE9iamVjdCwgV2FzbTo6 Q3JlYXRpb25Nb2RlOjpGcm9tSlMpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsg fSk7CisKKyAgICBpbnN0YW5jZS0+ZmluYWxpemVDcmVhdGlvbih2bSwgZ2xvYmFsT2JqZWN0LCBt b2R1bGUtPm1vZHVsZSgpLmNvbXBpbGVTeW5jKCZ2bS53YXNtQ29udGV4dCwgaW5zdGFuY2UtPm1l bW9yeU1vZGUoKSksIFdhc206OkNyZWF0aW9uTW9kZTo6RnJvbUpTKTsKICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoaW5zdGFu Y2UpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNz ZW1ibHlNb2R1bGVSZWNvcmQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2Vi QXNzZW1ibHlNb2R1bGVSZWNvcmQuY3BwCmluZGV4IDU5OWUyMzRmNjU1NDQwYWNlMmU3NWI4ODRl NTViMjQ5NjcyOTcwZTQuLjdmYTgxZTc5NzMyYjIyNTU2MzJhNzQ4ZjY5MmViYWFiOTgzZDVmN2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5TW9k dWxlUmVjb3JkLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3Nl bWJseU1vZHVsZVJlY29yZC5jcHAKQEAgLTExMywxMSArMTEzLDExIEBAIFN5bmNocm9ub3VzbmVz cyBXZWJBc3NlbWJseU1vZHVsZVJlY29yZDo6bGluayhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0LCBKU1ZhCiAgICAgcmV0dXJuIFN5bmNocm9ub3VzbmVzczo6U3luYzsKIH0KIAotdm9pZCBX ZWJBc3NlbWJseU1vZHVsZVJlY29yZDo6aW5pdGlhbGl6ZUltcG9ydHNBbmRFeHBvcnRzKEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTT2JqZWN0KiBpbXBvcnRPYmplY3QsIFdhc206OkNy ZWF0aW9uTW9kZSBjcmVhdGlvbk1vZGUpCisvLyBodHRwczovL3dlYmFzc2VtYmx5LmdpdGh1Yi5p by9zcGVjL2pzLWFwaS8jcmVhZC10aGUtaW1wb3J0cwordm9pZCBXZWJBc3NlbWJseU1vZHVsZVJl Y29yZDo6aW5pdGlhbGl6ZUltcG9ydHMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNP YmplY3QqIGltcG9ydE9iamVjdCwgV2FzbTo6Q3JlYXRpb25Nb2RlIGNyZWF0aW9uTW9kZSkKIHsK ICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xB UkVfVEhST1dfU0NPUEUodm0pOwotICAgIFVOVVNFRF9QQVJBTShzY29wZSk7CiAKICAgICBSRUxF QVNFX0FTU0VSVChtX2luc3RhbmNlKTsKIApAQCAtNDIyLDIxICs0MjIsMzkgQEAgdm9pZCBXZWJB c3NlbWJseU1vZHVsZVJlY29yZDo6aW5pdGlhbGl6ZUltcG9ydHNBbmRFeHBvcnRzKEpTR2xvYmFs T2JqZWN0KiBnbG9iYWwKICAgICAgICAgICAgIC8vIGlpaS4gQXBwZW5kIHYuW1tNZW1vcnldXSB0 byBpbXBvcnRzLgogICAgICAgICAgICAgbV9pbnN0YW5jZS0+c2V0TWVtb3J5KHZtLCBtZW1vcnkp OwogICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKLQotICAg ICAgICAgICAgLy8gVXN1YWxseSBhdCB0aGlzIHBvaW50IHRoZSBtb2R1bGUncyBjb2RlIGJsb2Nr IGluIGFueSBtZW1vcnkgbW9kZSBzaG91bGQgYmUKLSAgICAgICAgICAgIC8vIHJ1bm5hYmxlIGR1 ZSB0byB0aGUgTExpbnQgdGllciBjb2RlIGJlaW5nIHNoYXJlZCBhbW9uZyBhbGwgbW9kZXMuIEhv d2V2ZXIsCi0gICAgICAgICAgICAvLyBpZiBMTEludCBpcyBkaXNhYmxlZCwgaXQgaXMgcG9zc2li bGUgdGhhdCB0aGUgY29kZSBuZWVkcyB0byBiZSBjb21waWxlZCBhdAotICAgICAgICAgICAgLy8g dGhpcyBwb2ludCB3aGVuIHdlIGtub3cgd2hpY2ggbWVtb3J5IG1vZGUgdG8gdXNlLgotICAgICAg ICAgICAgV2FzbTo6Q2FsbGVlR3JvdXAqIGNhbGxlZUdyb3VwID0gbV9pbnN0YW5jZS0+aW5zdGFu Y2UoKS5jYWxsZWVHcm91cCgpOwotICAgICAgICAgICAgaWYgKCFjYWxsZWVHcm91cCB8fCAhY2Fs bGVlR3JvdXAtPnJ1bm5hYmxlKCkpIHsKLSAgICAgICAgICAgICAgICBjYWxsZWVHcm91cCA9IG1f aW5zdGFuY2UtPm1vZHVsZSgpLT5tb2R1bGUoKS5jb21waWxlU3luYygmdm0ud2FzbUNvbnRleHQs IG1lbW9yeS0+bWVtb3J5KCkubW9kZSgpKS5wdHIoKTsKLSAgICAgICAgICAgICAgICBpZiAoIWNh bGxlZUdyb3VwLT5ydW5uYWJsZSgpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZXhjZXB0 aW9uKGNyZWF0ZUpTV2ViQXNzZW1ibHlMaW5rRXJyb3IoZ2xvYmFsT2JqZWN0LCB2bSwgY2FsbGVl R3JvdXAtPmVycm9yTWVzc2FnZSgpKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBSRUxF QVNFX0FTU0VSVChjYWxsZWVHcm91cC0+aXNTYWZlVG9SdW4obWVtb3J5LT5tZW1vcnkoKS5tb2Rl KCkpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQorfQorCisvLyBodHRw czovL3dlYmFzc2VtYmx5LmdpdGh1Yi5pby9zcGVjL2pzLWFwaS8jY3JlYXRlLWFuLWV4cG9ydHMt b2JqZWN0Cit2b2lkIFdlYkFzc2VtYmx5TW9kdWxlUmVjb3JkOjppbml0aWFsaXplRXhwb3J0cyhK U0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQoreworICAgIFZNJiB2bSA9IGdsb2JhbE9iamVj dC0+dm0oKTsKKyAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CisKKyAg ICBSRUxFQVNFX0FTU0VSVChtX2luc3RhbmNlKTsKKworICAgIEpTV2ViQXNzZW1ibHlNb2R1bGUq IG1vZHVsZSA9IG1faW5zdGFuY2UtPm1vZHVsZSgpOworICAgIGNvbnN0IFdhc206Ok1vZHVsZUlu Zm9ybWF0aW9uJiBtb2R1bGVJbmZvcm1hdGlvbiA9IG1vZHVsZS0+bW9kdWxlSW5mb3JtYXRpb24o KTsKKworICAgIGF1dG8gZXhjZXB0aW9uID0gWyZdIChKU09iamVjdCogZXJyb3IpIHsKKyAgICAg ICAgdGhyb3dFeGNlcHRpb24oZ2xvYmFsT2JqZWN0LCBzY29wZSwgZXJyb3IpOworICAgIH07CisK KyAgICBpZiAobW9kdWxlSW5mb3JtYXRpb24uaGFzTWVtb3J5SW1wb3J0KCkpIHsKKyAgICAgICAg Ly8gVXN1YWxseSBhdCB0aGlzIHBvaW50IHRoZSBtb2R1bGUncyBjb2RlIGJsb2NrIGluIGFueSBt ZW1vcnkgbW9kZSBzaG91bGQgYmUKKyAgICAgICAgLy8gcnVubmFibGUgZHVlIHRvIHRoZSBMTGlu dCB0aWVyIGNvZGUgYmVpbmcgc2hhcmVkIGFtb25nIGFsbCBtb2Rlcy4gSG93ZXZlciwKKyAgICAg ICAgLy8gaWYgTExJbnQgaXMgZGlzYWJsZWQsIGl0IGlzIHBvc3NpYmxlIHRoYXQgdGhlIGNvZGUg bmVlZHMgdG8gYmUgY29tcGlsZWQgYXQKKyAgICAgICAgLy8gdGhpcyBwb2ludCB3aGVuIHdlIGtu b3cgd2hpY2ggbWVtb3J5IG1vZGUgdG8gdXNlLgorICAgICAgICBXYXNtOjpDYWxsZWVHcm91cCog Y2FsbGVlR3JvdXAgPSBtX2luc3RhbmNlLT5pbnN0YW5jZSgpLmNhbGxlZUdyb3VwKCk7CisgICAg ICAgIGlmICghY2FsbGVlR3JvdXAgfHwgIWNhbGxlZUdyb3VwLT5ydW5uYWJsZSgpKSB7CisgICAg ICAgICAgICBjYWxsZWVHcm91cCA9IG1faW5zdGFuY2UtPm1vZHVsZSgpLT5tb2R1bGUoKS5jb21w aWxlU3luYygmdm0ud2FzbUNvbnRleHQsIG1faW5zdGFuY2UtPmluc3RhbmNlKCkubWVtb3J5KCkt Pm1vZGUoKSkucHRyKCk7CisgICAgICAgICAgICBpZiAoIWNhbGxlZUdyb3VwLT5ydW5uYWJsZSgp KQorICAgICAgICAgICAgICAgIHJldHVybiBleGNlcHRpb24oY3JlYXRlSlNXZWJBc3NlbWJseUxp bmtFcnJvcihnbG9iYWxPYmplY3QsIHZtLCBjYWxsZWVHcm91cC0+ZXJyb3JNZXNzYWdlKCkpKTsK KyAgICAgICAgfQorICAgICAgICBSRUxFQVNFX0FTU0VSVChjYWxsZWVHcm91cC0+aXNTYWZlVG9S dW4obV9pbnN0YW5jZS0+aW5zdGFuY2UoKS5tZW1vcnkoKS0+bW9kZSgpKSk7CisgICAgfQogCiAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1vZHVsZUluZm9ybWF0aW9uLnRhYmxlQ291bnQo KTsgKytpKSB7CiAgICAgICAgIGlmIChtb2R1bGVJbmZvcm1hdGlvbi50YWJsZXNbaV0uaXNJbXBv cnQoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNz ZW1ibHlNb2R1bGVSZWNvcmQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFz c2VtYmx5TW9kdWxlUmVjb3JkLmgKaW5kZXggZjk0OGFiMDRmMTQ5ZWM4ZTE3ODI3YjY5M2E0ZWZi YWYyZGQ4N2U2Yi4uZmQ5MmM5NDZkODdiZGJmYzIzZDUzY2Q5Nzk3ZTExNTU2NDRhN2Q0ZCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlNb2R1bGVS ZWNvcmQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseU1v ZHVsZVJlY29yZC5oCkBAIC02MCw3ICs2MCw4IEBAIGNsYXNzIFdlYkFzc2VtYmx5TW9kdWxlUmVj b3JkIGZpbmFsIDogcHVibGljIEFic3RyYWN0TW9kdWxlUmVjb3JkIHsKIAogICAgIHZvaWQgcHJl cGFyZUxpbmsoVk0mLCBKU1dlYkFzc2VtYmx5SW5zdGFuY2UqKTsKICAgICBTeW5jaHJvbm91c25l c3MgbGluayhKU0dsb2JhbE9iamVjdCosIEpTVmFsdWUgc2NyaXB0RmV0Y2hlcik7Ci0gICAgdm9p ZCBpbml0aWFsaXplSW1wb3J0c0FuZEV4cG9ydHMoSlNHbG9iYWxPYmplY3QqLCBKU09iamVjdCog aW1wb3J0T2JqZWN0LCBXYXNtOjpDcmVhdGlvbk1vZGUpOworICAgIHZvaWQgaW5pdGlhbGl6ZUlt cG9ydHMoSlNHbG9iYWxPYmplY3QqLCBKU09iamVjdCogaW1wb3J0T2JqZWN0LCBXYXNtOjpDcmVh dGlvbk1vZGUpOworICAgIHZvaWQgaW5pdGlhbGl6ZUV4cG9ydHMoSlNHbG9iYWxPYmplY3QqKTsK ICAgICBKU19FWFBPUlRfUFJJVkFURSBKU1ZhbHVlIGV2YWx1YXRlKEpTR2xvYmFsT2JqZWN0Kik7 CiAKICAgICBKU09iamVjdCogZXhwb3J0c09iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fZXhwb3J0 c09iamVjdC5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNWI1Njkz Yzk3YmUzY2RkMDliZmE5Nzg1MTkwZTAxZTQyOTNkNWRmYS4uMWVkYWIzZjNlOTA5NGZjZDBmODVm ODNjZDYyNzMzN2FlMmNmMTVmZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMjItMDEtMjQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNv bT4KKworICAgICAgICBbSlNDXSBXYXNtIG1vZHVsZSBpbXBvcnQgc2hvdWxkIGJlIGRvbmUgaW4g c3luYyB3aGVuIFdlYkFzc2VtYmx5Lmluc3RhbnRpYXRlIGdldHMgbW9kdWxlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU1MDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0 cy93YXNtL2pzYXBpL2NvbnN0cnVjdG9yL2luc3RhbnRpYXRlLmFueS1leHBlY3RlZC50eHQ6Cisg ICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dhc20vanNhcGkvY29uc3RydWN0b3IvaW5zdGFu dGlhdGUuYW55Lndvcmtlci1leHBlY3RlZC50eHQ6CisKIDIwMjItMDEtMjMgIFNhbSBXZWluaWcg IDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgaW50ZXJwb2xhdGluZyBjb2xv cnMgd2l0aCBtaXNzaW5nL25vbmUgY29tcG9uZW50cyB2aWEgY29sb3ItbWl4KCkKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2FzbS9qc2Fw aS9jb25zdHJ1Y3Rvci9pbnN0YW50aWF0ZS5hbnktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93YXNtL2pzYXBpL2NvbnN0cnVjdG9yL2lu c3RhbnRpYXRlLmFueS1leHBlY3RlZC50eHQKaW5kZXggODY0MmE1ZWFlMDYwMTM1MWFmZDE1NTQy MTNiODM2ZTFkNzkxMzA4MC4uMWUwOGEwZDA1ZDE5YjhmODdkYTQ1MDFkMDE4NzNkZTQ2MDE5NzM3 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy93YXNtL2pzYXBpL2NvbnN0cnVjdG9yL2luc3RhbnRpYXRlLmFueS1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93YXNtL2pzYXBp L2NvbnN0cnVjdG9yL2luc3RhbnRpYXRlLmFueS1leHBlY3RlZC50eHQKQEAgLTUyLDcgKzUyLDcg QEAgUEFTUyBNdWx0aXBsZSBpNjQgYXJndW1lbnRzOiBNb2R1bGUgYXJndW1lbnQKIFBBU1Mgc3Ry YXkgYXJndW1lbnQ6IEJ1ZmZlclNvdXJjZSBhcmd1bWVudAogUEFTUyBzdHJheSBhcmd1bWVudDog TW9kdWxlIGFyZ3VtZW50CiBQQVNTIFN5bmNocm9ub3VzIG9wdGlvbnMgaGFuZGxpbmc6IEJ1ZmZl ciBhcmd1bWVudAotRkFJTCBTeW5jaHJvbm91cyBvcHRpb25zIGhhbmRsaW5nOiBNb2R1bGUgYXJn dW1lbnQgYXNzZXJ0X2FycmF5X2VxdWFsczogbGVuZ3RocyBkaWZmZXIsIGV4cGVjdGVkIGFycmF5 IFsibW9kdWxlIGdldHRlciIsICJnbG9iYWwgZ2V0dGVyIl0gbGVuZ3RoIDIsIGdvdCBbXSBsZW5n dGggMAorUEFTUyBTeW5jaHJvbm91cyBvcHRpb25zIGhhbmRsaW5nOiBNb2R1bGUgYXJndW1lbnQK IFBBU1MgRW1wdHkgYnVmZmVyCiBQQVNTIEludmFsaWQgY29kZQogUEFTUyBDaGFuZ2luZyB0aGUg YnVmZmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dhc20vanNhcGkvY29uc3RydWN0b3IvaW5zdGFudGlhdGUuYW55Lndvcmtlci1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dh c20vanNhcGkvY29uc3RydWN0b3IvaW5zdGFudGlhdGUuYW55Lndvcmtlci1leHBlY3RlZC50eHQK aW5kZXggODY0MmE1ZWFlMDYwMTM1MWFmZDE1NTQyMTNiODM2ZTFkNzkxMzA4MC4uMWUwOGEwZDA1 ZDE5YjhmODdkYTQ1MDFkMDE4NzNkZTQ2MDE5NzM3NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93YXNtL2pzYXBpL2NvbnN0cnVjdG9yL2lu c3RhbnRpYXRlLmFueS53b3JrZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2FzbS9qc2FwaS9jb25zdHJ1Y3Rvci9pbnN0YW50 aWF0ZS5hbnkud29ya2VyLWV4cGVjdGVkLnR4dApAQCAtNTIsNyArNTIsNyBAQCBQQVNTIE11bHRp cGxlIGk2NCBhcmd1bWVudHM6IE1vZHVsZSBhcmd1bWVudAogUEFTUyBzdHJheSBhcmd1bWVudDog QnVmZmVyU291cmNlIGFyZ3VtZW50CiBQQVNTIHN0cmF5IGFyZ3VtZW50OiBNb2R1bGUgYXJndW1l bnQKIFBBU1MgU3luY2hyb25vdXMgb3B0aW9ucyBoYW5kbGluZzogQnVmZmVyIGFyZ3VtZW50Ci1G QUlMIFN5bmNocm9ub3VzIG9wdGlvbnMgaGFuZGxpbmc6IE1vZHVsZSBhcmd1bWVudCBhc3NlcnRf YXJyYXlfZXF1YWxzOiBsZW5ndGhzIGRpZmZlciwgZXhwZWN0ZWQgYXJyYXkgWyJtb2R1bGUgZ2V0 dGVyIiwgImdsb2JhbCBnZXR0ZXIiXSBsZW5ndGggMiwgZ290IFtdIGxlbmd0aCAwCitQQVNTIFN5 bmNocm9ub3VzIG9wdGlvbnMgaGFuZGxpbmc6IE1vZHVsZSBhcmd1bWVudAogUEFTUyBFbXB0eSBi dWZmZXIKIFBBU1MgSW52YWxpZCBjb2RlCiBQQVNTIENoYW5naW5nIHRoZSBidWZmZXIK 449841 2022-01-24 12:12:05 -0800 2022-01-25 11:55:38 -0800 Patch bug-235506-20220124121204.patch text/plain 24107 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi YTE4YTgzYTYwMzg1Zjk5YjNkOTNmODdlNzJiZDYzYjYxOTNjZTYyLi45ZWI1ZWFlNDlkYzUyODVi MDExNzc2Y2JiZGUwNjFlY2FhMzY5N2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MiBAQAorMjAyMi0wMS0yNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFdhc20gbW9kdWxlIGltcG9ydCBzaG91bGQgYmUgZG9uZSBpbiBz eW5jIHdoZW4gV2ViQXNzZW1ibHkuaW5zdGFudGlhdGUgZ2V0cyBtb2R1bGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTUwNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjY29yZGluZyB0byB0aGUgc3Bl YywgbW9kdWxlIGltcG9ydHMgbmVlZCB0byBiZSBkb25lIHN5bmNocm9ub3VzbHkgd2hlbiBXZWJB c3NlbWJseS5pbnN0YW50aWF0ZQorICAgICAgICBpcyBjYWxsZWQgd2l0aCBhIHdhc20gbW9kdWxl WzFdLgorCisgICAgICAgIFRvIGFsaWduIG91ciBpbXBsZW1lbnRhdGlvbiB0byB0aGlzIGJlaGF2 aW9yLCB3ZSBzcGxpdCBXZWJBc3NlbWJseU1vZHVsZVJlY29yZDo6aW5pdGlhbGl6ZUltcG9ydHNB bmRFeHBvcnRzCisgICAgICAgIGludG8gV2ViQXNzZW1ibHlNb2R1bGVSZWNvcmQ6OmluaXRpYWxp emVJbXBvcnRzIGFuZCBXZWJBc3NlbWJseU1vZHVsZVJlY29yZDo6aW5pdGlhbGl6ZUV4cG9ydHMu IFRoZSBmb3JtZXIKKyAgICAgICAgZG9lcyBub3QgcmVxdWlyZSBDYWxsZWVHcm91cHMgc28gd2Ug Y2FuIGV4ZWN1dGUgYmVmb3JlIGNvbXBpbGluZyBDYWxsZWVHcm91cHMuCisKKyAgICAgICAgWzFd OiBodHRwczovL3dlYmFzc2VtYmx5LmdpdGh1Yi5pby9zcGVjL2pzLWFwaS8jYXN5bmNocm9ub3Vz bHktaW5zdGFudGlhdGUtYS13ZWJhc3NlbWJseS1tb2R1bGUKKworICAgICAgICAqIHJ1bnRpbWUv QWJzdHJhY3RNb2R1bGVSZWNvcmQuY3BwOgorICAgICAgICAoSlNDOjpBYnN0cmFjdE1vZHVsZVJl Y29yZDo6ZXZhbHVhdGUpOgorICAgICAgICAqIHdhc20vV2FzbUluc3RhbmNlLmg6CisgICAgICAg IChKU0M6Oldhc206Okluc3RhbmNlOjpzZXRPd25lcik6CisgICAgICAgIChKU0M6Oldhc206Oklu c3RhbmNlOjpmaW5hbGl6ZUNyZWF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiB3YXNtL1dhc21N b2R1bGVJbmZvcm1hdGlvbi5oOgorICAgICAgICAoSlNDOjpXYXNtOjpNb2R1bGVJbmZvcm1hdGlv bjo6aGFzTWVtb3J5SW1wb3J0IGNvbnN0KToKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1i bHkuY3BwOgorICAgICAgICAoSlNDOjppbnN0YW50aWF0ZSk6CisgICAgICAgIChKU0M6OnJlc29s dmUpOiBEZWxldGVkLgorICAgICAgICAqIHdhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNw cDoKKyAgICAgICAgKEpTQzo6SlNXZWJBc3NlbWJseUluc3RhbmNlOjpKU1dlYkFzc2VtYmx5SW5z dGFuY2UpOgorICAgICAgICAoSlNDOjpKU1dlYkFzc2VtYmx5SW5zdGFuY2U6OmluaXRpYWxpemVJ bXBvcnRzKToKKyAgICAgICAgKEpTQzo6SlNXZWJBc3NlbWJseUluc3RhbmNlOjpmaW5hbGl6ZUNy ZWF0aW9uKToKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5oOgorICAg ICAgICAqIHdhc20vanMvV2ViQXNzZW1ibHlJbnN0YW5jZUNvbnN0cnVjdG9yLmNwcDoKKyAgICAg ICAgKEpTQzo6SlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKToKKyAgICAgICAgKiB3YXNtL2pzL1dl YkFzc2VtYmx5TW9kdWxlUmVjb3JkLmNwcDoKKyAgICAgICAgKEpTQzo6V2ViQXNzZW1ibHlNb2R1 bGVSZWNvcmQ6OmluaXRpYWxpemVJbXBvcnRzKToKKyAgICAgICAgKEpTQzo6V2ViQXNzZW1ibHlN b2R1bGVSZWNvcmQ6OmluaXRpYWxpemVFeHBvcnRzKToKKyAgICAgICAgKEpTQzo6V2ViQXNzZW1i bHlNb2R1bGVSZWNvcmQ6OmluaXRpYWxpemVJbXBvcnRzQW5kRXhwb3J0cyk6IERlbGV0ZWQuCisg ICAgICAgICogd2FzbS9qcy9XZWJBc3NlbWJseU1vZHVsZVJlY29yZC5oOgorCiAyMDIyLTAxLTIx ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLCByZXZlcnRpbmcgcjI4ODQwMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0Fic3RyYWN0TW9kdWxlUmVjb3JkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0Fic3RyYWN0TW9kdWxlUmVjb3JkLmNwcAppbmRleCA4ZmQ3NjdjNjE2ZDJm ODA1ZGIxYmRmOTY4NDM4YzE2N2EyYjBmNDcyLi40MjViOGZhZDEzODBlNzNjNjhlODIxNmRlNDVi ZWQ0NmRiYWFkZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9B YnN0cmFjdE1vZHVsZVJlY29yZC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQWJzdHJhY3RNb2R1bGVSZWNvcmQuY3BwCkBAIC04NDMsNyArODQzLDkgQEAgSlNfRVhQT1JU X1BSSVZBVEUgSlNWYWx1ZSBBYnN0cmFjdE1vZHVsZVJlY29yZDo6ZXZhbHVhdGUoSlNHbG9iYWxP YmplY3QqIGdsb2JhbE8KICAgICAgICAgLy8gV2ViQXNzZW1ibHkgaW1wb3J0cyBuZWVkIHRvIGJl IHN1cHBsaWVkIGR1cmluZyBldmFsdWF0aW9uIHNvIHRoYXQsIGUuZy4sCiAgICAgICAgIC8vIEpT IG1vZHVsZSBleHBvcnRzIGFyZSBhY3R1YWxseSBhdmFpbGFibGUgdG8gYmUgcmVhZCBhbmQgaW5z dGFsbGVkIGFzIGltcG9ydAogICAgICAgICAvLyBiaW5kaW5ncy4KLSAgICAgICAgd2FzbU1vZHVs ZVJlY29yZC0+aW5pdGlhbGl6ZUltcG9ydHNBbmRFeHBvcnRzKGdsb2JhbE9iamVjdCwgbnVsbHB0 ciwgV2FzbTo6Q3JlYXRpb25Nb2RlOjpGcm9tTW9kdWxlTG9hZGVyKTsKKyAgICAgICAgd2FzbU1v ZHVsZVJlY29yZC0+aW5pdGlhbGl6ZUltcG9ydHMoZ2xvYmFsT2JqZWN0LCBudWxscHRyLCBXYXNt OjpDcmVhdGlvbk1vZGU6OkZyb21Nb2R1bGVMb2FkZXIpOworICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHNjb3BlLCBqc1VuZGVmaW5lZCgpKTsKKyAgICAgICAgd2FzbU1vZHVsZVJlY29yZC0+ aW5pdGlhbGl6ZUV4cG9ydHMoZ2xvYmFsT2JqZWN0KTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwganNVbmRlZmluZWQoKSk7CiAgICAgICAgIFJFTEVBU0VfQU5EX1JFVFVSTihz Y29wZSwgd2FzbU1vZHVsZVJlY29yZC0+ZXZhbHVhdGUoZ2xvYmFsT2JqZWN0KSk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUluc3RhbmNlLmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtSW5zdGFuY2UuaAppbmRleCA3NDBlNzljNTE1 MDZlYTc3OWM5ZDg4NWNkYWEwYjcwNjA4NWU2NmZkLi43MTBiODc2ZTIyNDVlM2ZjMWZmZWRjYmVl ODhjNDg0MTEwNzFkNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X YXNtSW5zdGFuY2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtSW5zdGFu Y2UuaApAQCAtNTYsNyArNTYsNyBAQCBjbGFzcyBJbnN0YW5jZSA6IHB1YmxpYyBUaHJlYWRTYWZl UmVmQ291bnRlZDxJbnN0YW5jZT4sIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxJbgogCiAgICAgc3Rh dGljIFJlZjxJbnN0YW5jZT4gY3JlYXRlKENvbnRleHQqLCBSZWY8TW9kdWxlPiYmLCBFbnRyeUZy YW1lKiogcG9pbnRlclRvVG9wRW50cnlGcmFtZSwgdm9pZCoqIHBvaW50ZXJUb0FjdHVhbFN0YWNr TGltaXQsIFN0b3JlVG9wQ2FsbEZyYW1lQ2FsbGJhY2smJik7CiAKLSAgICB2b2lkIGZpbmFsaXpl Q3JlYXRpb24odm9pZCogb3duZXIpCisgICAgdm9pZCBzZXRPd25lcih2b2lkKiBvd25lcikKICAg ICB7CiAgICAgICAgIG1fb3duZXIgPSBvd25lcjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTW9kdWxlSW5mb3JtYXRpb24uaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL1dhc21Nb2R1bGVJbmZvcm1hdGlvbi5oCmluZGV4IDIxYTM5MjdmMjUx ZjAxOWYyZjBjNTRlMjkxN2IxMjU1N2FiZDQ2ZjcuLmE2MWY2OTIwZjVhYmNjNzMzN2IzYWNkZWEy YmE0YzY5YjI3YmRjNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21Nb2R1bGVJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21Nb2R1bGVJbmZvcm1hdGlvbi5oCkBAIC05NCw2ICs5NCw4IEBAIHN0cnVjdCBNb2R1bGVJbmZv cm1hdGlvbiA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxNb2R1bGVJbmZvcm1hdGlvbj4g ewogICAgIGJvb2wgaXNEZWNsYXJlZEV4Y2VwdGlvbih1aW50MzJfdCBpbmRleCkgY29uc3QgeyBy ZXR1cm4gbV9kZWNsYXJlZEV4Y2VwdGlvbnMuY29udGFpbnMoaW5kZXgpOyB9CiAgICAgdm9pZCBh ZGREZWNsYXJlZEV4Y2VwdGlvbih1aW50MzJfdCBpbmRleCkgeyBtX2RlY2xhcmVkRXhjZXB0aW9u cy5zZXQoaW5kZXgpOyB9CiAKKyAgICBib29sIGhhc01lbW9yeUltcG9ydCgpIGNvbnN0IHsgcmV0 dXJuIG1lbW9yeS5pc0ltcG9ydCgpOyB9CisKICAgICBWZWN0b3I8SW1wb3J0PiBpbXBvcnRzOwog ICAgIFZlY3RvcjxTaWduYXR1cmVJbmRleD4gaW1wb3J0RnVuY3Rpb25TaWduYXR1cmVJbmRpY2Vz OwogICAgIFZlY3RvcjxTaWduYXR1cmVJbmRleD4gaW50ZXJuYWxGdW5jdGlvblNpZ25hdHVyZUlu ZGljZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFz c2VtYmx5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHku Y3BwCmluZGV4IDRkMWVhNDE1MTVlOGFmODAwNDZjOTA3YmEyNTc0MTFjZTg5OWI3MGQuLjgyZDYz MTljNjE2MzViNTdmNjQ0ODM4OTQ5MjYwNDdjYjM4MzNmYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHkuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHkuY3BwCkBAIC0xMzcsMzIgKzEzNyw2IEBA IEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTih3ZWJBc3NlbWJseUNvbXBpbGVGdW5jLCAoSlNHbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCwKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHByb21p c2UpOwogfQogCi1lbnVtIGNsYXNzIFJlc29sdmUgeyBXaXRoSW5zdGFuY2UsIFdpdGhNb2R1bGVS ZWNvcmQsIFdpdGhNb2R1bGVBbmRJbnN0YW5jZSB9Owotc3RhdGljIHZvaWQgcmVzb2x2ZShWTSYg dm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTUHJvbWlzZSogcHJvbWlzZSwgSlNX ZWJBc3NlbWJseUluc3RhbmNlKiBpbnN0YW5jZSwgSlNXZWJBc3NlbWJseU1vZHVsZSogbW9kdWxl LCBKU09iamVjdCogaW1wb3J0T2JqZWN0LCBSZWY8V2FzbTo6Q2FsbGVlR3JvdXA+JiYgY2FsbGVl R3JvdXAsIFJlc29sdmUgcmVzb2x2ZUtpbmQsIFdhc206OkNyZWF0aW9uTW9kZSBjcmVhdGlvbk1v ZGUpCi17Ci0gICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwotICAgIGlu c3RhbmNlLT5maW5hbGl6ZUNyZWF0aW9uKHZtLCBnbG9iYWxPYmplY3QsIFdURk1vdmUoY2FsbGVl R3JvdXApLCBpbXBvcnRPYmplY3QsIGNyZWF0aW9uTW9kZSk7Ci0gICAgaWYgKFVOTElLRUxZKHNj b3BlLmV4Y2VwdGlvbigpKSkgewotICAgICAgICBwcm9taXNlLT5yZWplY3RXaXRoQ2F1Z2h0RXhj ZXB0aW9uKGdsb2JhbE9iamVjdCwgc2NvcGUpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0g ICAgc2NvcGUucmVsZWFzZSgpOwotICAgIGlmIChyZXNvbHZlS2luZCA9PSBSZXNvbHZlOjpXaXRo SW5zdGFuY2UpCi0gICAgICAgIHByb21pc2UtPnJlc29sdmUoZ2xvYmFsT2JqZWN0LCBpbnN0YW5j ZSk7Ci0gICAgZWxzZSBpZiAocmVzb2x2ZUtpbmQgPT0gUmVzb2x2ZTo6V2l0aE1vZHVsZVJlY29y ZCkgewotICAgICAgICBhdXRvKiBtb2R1bGVSZWNvcmQgPSBpbnN0YW5jZS0+bW9kdWxlUmVjb3Jk KCk7Ci0gICAgICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjpkdW1wTW9kdWxlUmVjb3JkKCkpKQot ICAgICAgICAgICAgbW9kdWxlUmVjb3JkLT5kdW1wKCk7Ci0gICAgICAgIHByb21pc2UtPnJlc29s dmUoZ2xvYmFsT2JqZWN0LCBtb2R1bGVSZWNvcmQpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIEpT T2JqZWN0KiByZXN1bHQgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChnbG9iYWxPYmplY3QpOwotICAg ICAgICByZXN1bHQtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgIm1v ZHVsZSJfcyksIG1vZHVsZSk7Ci0gICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBJZGVudGlm aWVyOjpmcm9tU3RyaW5nKHZtLCAiaW5zdGFuY2UiX3MpLCBpbnN0YW5jZSk7Ci0gICAgICAgIHBy b21pc2UtPnJlc29sdmUoZ2xvYmFsT2JqZWN0LCByZXN1bHQpOwotICAgIH0KLX0KLQogdm9pZCBK U1dlYkFzc2VtYmx5Ojp3ZWJBc3NlbWJseU1vZHVsZVZhbGlkYXRlQXN5bmMoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgSlNQcm9taXNlKiBwcm9taXNlLCBWZWN0b3I8dWludDhfdD4mJiBz b3VyY2UpCiB7CiAgICAgVk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOwpAQCAtMTg2LDYgKzE2 MCw3IEBAIHZvaWQgSlNXZWJBc3NlbWJseTo6d2ViQXNzZW1ibHlNb2R1bGVWYWxpZGF0ZUFzeW5j KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsCiAgICAgfSkpOwogfQogCitlbnVtIGNsYXNz IFJlc29sdmUgeyBXaXRoSW5zdGFuY2UsIFdpdGhNb2R1bGVSZWNvcmQsIFdpdGhNb2R1bGVBbmRJ bnN0YW5jZSB9Owogc3RhdGljIHZvaWQgaW5zdGFudGlhdGUoVk0mIHZtLCBKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0LCBKU1Byb21pc2UqIHByb21pc2UsIEpTV2ViQXNzZW1ibHlNb2R1bGUq IG1vZHVsZSwgSlNPYmplY3QqIGltcG9ydE9iamVjdCwgY29uc3QgSWRlbnRpZmllciYgbW9kdWxl S2V5LCBSZXNvbHZlIHJlc29sdmVLaW5kLCBXYXNtOjpDcmVhdGlvbk1vZGUgY3JlYXRpb25Nb2Rl KQogewogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKQEAgLTE5Nywx OCArMTcyLDUxIEBAIHN0YXRpYyB2b2lkIGluc3RhbnRpYXRlKFZNJiB2bSwgSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgSlNQcm9taXNlKiBwcm9taXNlCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKKyAgICBpbnN0YW5jZS0+aW5pdGlhbGl6ZUltcG9ydHMoZ2xvYmFsT2JqZWN0LCBpbXBv cnRPYmplY3QsIGNyZWF0aW9uTW9kZSk7CisgICAgaWYgKFVOTElLRUxZKHNjb3BlLmV4Y2VwdGlv bigpKSkgeworICAgICAgICBwcm9taXNlLT5yZWplY3RXaXRoQ2F1Z2h0RXhjZXB0aW9uKGdsb2Jh bE9iamVjdCwgc2NvcGUpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgVmVjdG9yPFN0 cm9uZzxKU0NlbGw+PiBkZXBlbmRlbmNpZXM7CiAgICAgLy8gVGhlIGluc3RhbmNlIGtlZXBzIHRo ZSBtb2R1bGUgYWxpdmUuCiAgICAgZGVwZW5kZW5jaWVzLmFwcGVuZChTdHJvbmc8SlNDZWxsPih2 bSwgcHJvbWlzZSkpOwotICAgIGRlcGVuZGVuY2llcy5hcHBlbmQoU3Ryb25nPEpTQ2VsbD4odm0s IGltcG9ydE9iamVjdCkpOwogCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIGF1dG8gdGlja2V0 ID0gdm0uZGVmZXJyZWRXb3JrVGltZXItPmFkZFBlbmRpbmdXb3JrKHZtLCBpbnN0YW5jZSwgV1RG TW92ZShkZXBlbmRlbmNpZXMpKTsKICAgICAvLyBOb3RlOiBUaGlzIGNvbXBsZXRpb24gdGFzayBt YXkgb3IgbWF5IG5vdCBnZXQgY2FsbGVkIGltbWVkaWF0ZWx5LgotICAgIG1vZHVsZS0+bW9kdWxl KCkuY29tcGlsZUFzeW5jKCZ2bS53YXNtQ29udGV4dCwgaW5zdGFuY2UtPm1lbW9yeU1vZGUoKSwg Y3JlYXRlU2hhcmVkVGFzazxXYXNtOjpDYWxsZWVHcm91cDo6Q2FsbGJhY2tUeXBlPihbdGlja2V0 LCBwcm9taXNlLCBpbnN0YW5jZSwgbW9kdWxlLCBpbXBvcnRPYmplY3QsIHJlc29sdmVLaW5kLCBj cmVhdGlvbk1vZGUsICZ2bV0gKFJlZjxXYXNtOjpDYWxsZWVHcm91cD4mJiByZWZDYWxsZWVHcm91 cCkgbXV0YWJsZSB7CisgICAgbW9kdWxlLT5tb2R1bGUoKS5jb21waWxlQXN5bmMoJnZtLndhc21D b250ZXh0LCBpbnN0YW5jZS0+bWVtb3J5TW9kZSgpLCBjcmVhdGVTaGFyZWRUYXNrPFdhc206OkNh bGxlZUdyb3VwOjpDYWxsYmFja1R5cGU+KFt0aWNrZXQsIHByb21pc2UsIGluc3RhbmNlLCBtb2R1 bGUsIHJlc29sdmVLaW5kLCBjcmVhdGlvbk1vZGUsICZ2bV0gKFJlZjxXYXNtOjpDYWxsZWVHcm91 cD4mJiByZWZDYWxsZWVHcm91cCkgbXV0YWJsZSB7CiAgICAgICAgIFJlZlB0cjxXYXNtOjpDYWxs ZWVHcm91cD4gY2FsbGVlR3JvdXAgPSBXVEZNb3ZlKHJlZkNhbGxlZUdyb3VwKTsKLSAgICAgICAg dm0uZGVmZXJyZWRXb3JrVGltZXItPnNjaGVkdWxlV29ya1Nvb24odGlja2V0LCBbcHJvbWlzZSwg aW5zdGFuY2UsIG1vZHVsZSwgaW1wb3J0T2JqZWN0LCByZXNvbHZlS2luZCwgY3JlYXRpb25Nb2Rl LCAmdm0sIGNhbGxlZUdyb3VwID0gV1RGTW92ZShjYWxsZWVHcm91cCldKERlZmVycmVkV29ya1Rp bWVyOjpUaWNrZXQpIG11dGFibGUgeworICAgICAgICB2bS5kZWZlcnJlZFdvcmtUaW1lci0+c2No ZWR1bGVXb3JrU29vbih0aWNrZXQsIFtwcm9taXNlLCBpbnN0YW5jZSwgbW9kdWxlLCByZXNvbHZl S2luZCwgY3JlYXRpb25Nb2RlLCAmdm0sIGNhbGxlZUdyb3VwID0gV1RGTW92ZShjYWxsZWVHcm91 cCldKERlZmVycmVkV29ya1RpbWVyOjpUaWNrZXQpIG11dGFibGUgeworICAgICAgICAgICAgYXV0 byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogICAgICAgICAgICAgSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCA9IGluc3RhbmNlLT5nbG9iYWxPYmplY3QoKTsKLSAgICAgICAg ICAgIHJlc29sdmUodm0sIGdsb2JhbE9iamVjdCwgcHJvbWlzZSwgaW5zdGFuY2UsIG1vZHVsZSwg aW1wb3J0T2JqZWN0LCBjYWxsZWVHcm91cC5yZWxlYXNlTm9uTnVsbCgpLCByZXNvbHZlS2luZCwg Y3JlYXRpb25Nb2RlKTsKKyAgICAgICAgICAgIGluc3RhbmNlLT5maW5hbGl6ZUNyZWF0aW9uKHZt LCBnbG9iYWxPYmplY3QsIGNhbGxlZUdyb3VwLnJlbGVhc2VOb25OdWxsKCksIGNyZWF0aW9uTW9k ZSk7CisgICAgICAgICAgICBpZiAoVU5MSUtFTFkoc2NvcGUuZXhjZXB0aW9uKCkpKSB7CisgICAg ICAgICAgICAgICAgcHJvbWlzZS0+cmVqZWN0V2l0aENhdWdodEV4Y2VwdGlvbihnbG9iYWxPYmpl Y3QsIHNjb3BlKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKKyAgICAgICAgICAgIHN3aXRjaCAocmVzb2x2ZUtp bmQpIHsKKyAgICAgICAgICAgIGNhc2UgUmVzb2x2ZTo6V2l0aEluc3RhbmNlOiB7CisgICAgICAg ICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZShnbG9iYWxPYmplY3QsIGluc3RhbmNlKTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNhc2UgUmVzb2x2 ZTo6V2l0aE1vZHVsZVJlY29yZDogeworICAgICAgICAgICAgICAgIGF1dG8qIG1vZHVsZVJlY29y ZCA9IGluc3RhbmNlLT5tb2R1bGVSZWNvcmQoKTsKKyAgICAgICAgICAgICAgICBpZiAoVU5MSUtF TFkoT3B0aW9uczo6ZHVtcE1vZHVsZVJlY29yZCgpKSkKKyAgICAgICAgICAgICAgICAgICAgbW9k dWxlUmVjb3JkLT5kdW1wKCk7CisgICAgICAgICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZShnbG9i YWxPYmplY3QsIG1vZHVsZVJlY29yZCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBjYXNlIFJlc29sdmU6OldpdGhNb2R1bGVBbmRJbnN0YW5jZTog eworICAgICAgICAgICAgICAgIEpTT2JqZWN0KiByZXN1bHQgPSBjb25zdHJ1Y3RFbXB0eU9iamVj dChnbG9iYWxPYmplY3QpOworICAgICAgICAgICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBJ ZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAibW9kdWxlIl9zKSwgbW9kdWxlKTsKKyAgICAgICAg ICAgICAgICByZXN1bHQtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwg Imluc3RhbmNlIl9zKSwgaW5zdGFuY2UpOworICAgICAgICAgICAgICAgIHByb21pc2UtPnJlc29s dmUoZ2xvYmFsT2JqZWN0LCByZXN1bHQpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICB9KTsKICAgICB9KSk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2Uu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNl LmNwcAppbmRleCA3Yjg2NzUzMzI5ZTI1M2I3NTBlODQ0Mjg5MDQyYjBlYTQ0YjRhMWQ2Li5lNzU5 MThiOTkxMDVlYTc5NTMwYjU0NDk4NTJmNGVmNTJjNWI0MzFjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5jcHAKQEAg LTUzLDYgKzUzLDcgQEAgSlNXZWJBc3NlbWJseUluc3RhbmNlOjpKU1dlYkFzc2VtYmx5SW5zdGFu Y2UoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgUmVmPFcKICAgICAsIG1fZ2xvYmFsT2Jq ZWN0KHZtLCB0aGlzLCBzdHJ1Y3R1cmUtPmdsb2JhbE9iamVjdCgpKQogICAgICwgbV90YWJsZXMo bV9pbnN0YW5jZS0+bW9kdWxlKCkubW9kdWxlSW5mb3JtYXRpb24oKS50YWJsZUNvdW50KCkpCiB7 CisgICAgbV9pbnN0YW5jZS0+c2V0T3duZXIodGhpcyk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHRoaXMtPmluc3RhbmNlKCkubnVtSW1wb3J0RnVuY3Rpb25zKCk7ICsraSkKICAgICAg ICAgbmV3ICh0aGlzLT5pbnN0YW5jZSgpLmltcG9ydEZ1bmN0aW9uPFdyaXRlQmFycmllcjxKU09i amVjdD4+KGkpKSBXcml0ZUJhcnJpZXI8SlNPYmplY3Q+KCk7CiB9CkBAIC0xMDQsMTAgKzEwNSwy MiBAQCB2b2lkIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6dmlzaXRDaGlsZHJlbkltcGwoSlNDZWxs KiBjZWxsLCBWaXNpdG9yJiB2aXNpdG9yKQogCiBERUZJTkVfVklTSVRfQ0hJTERSRU4oSlNXZWJB c3NlbWJseUluc3RhbmNlKTsKIAotdm9pZCBKU1dlYkFzc2VtYmx5SW5zdGFuY2U6OmZpbmFsaXpl Q3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBSZWY8V2FzbTo6 Q2FsbGVlR3JvdXA+JiYgd2FzbUNhbGxlZUdyb3VwLCBKU09iamVjdCogaW1wb3J0T2JqZWN0LCBX YXNtOjpDcmVhdGlvbk1vZGUgY3JlYXRpb25Nb2RlKQordm9pZCBKU1dlYkFzc2VtYmx5SW5zdGFu Y2U6OmluaXRpYWxpemVJbXBvcnRzKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTT2Jq ZWN0KiBpbXBvcnRPYmplY3QsIFdhc206OkNyZWF0aW9uTW9kZSBjcmVhdGlvbk1vZGUpCiB7Ci0g ICAgbV9pbnN0YW5jZS0+ZmluYWxpemVDcmVhdGlvbih0aGlzKTsKKyAgICBWTSYgdm0gPSBnbG9i YWxPYmplY3QtPnZtKCk7CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0p OwogCisgICAgbV9tb2R1bGVSZWNvcmQtPnByZXBhcmVMaW5rKHZtLCB0aGlzKTsKKyAgICBpZiAo Y3JlYXRpb25Nb2RlID09IFdhc206OkNyZWF0aW9uTW9kZTo6RnJvbUpTKSB7CisgICAgICAgIG1f bW9kdWxlUmVjb3JkLT5saW5rKGdsb2JhbE9iamVjdCwganNOdWxsKCkpOworICAgICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOworICAgICAgICBtX21vZHVsZVJlY29yZC0+ aW5pdGlhbGl6ZUltcG9ydHMoZ2xvYmFsT2JqZWN0LCBpbXBvcnRPYmplY3QsIGNyZWF0aW9uTW9k ZSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CisgICAgfQor fQorCit2b2lkIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6ZmluYWxpemVDcmVhdGlvbihWTSYgdm0s IEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFJlZjxXYXNtOjpDYWxsZWVHcm91cD4mJiB3 YXNtQ2FsbGVlR3JvdXAsIFdhc206OkNyZWF0aW9uTW9kZSBjcmVhdGlvbk1vZGUpCit7CiAgICAg YXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCiAgICAgaWYgKCF3YXNtQ2Fs bGVlR3JvdXAtPnJ1bm5hYmxlKCkpIHsKQEAgLTEyMSwzMSArMTM0LDE2IEBAIHZvaWQgSlNXZWJB c3NlbWJseUluc3RhbmNlOjpmaW5hbGl6ZUNyZWF0aW9uKFZNJiB2bSwgSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjCiAgICAgLy8gcmVzdWx0cywgc28gdGhhdCBsYXRlciB3aGVuIG1lbW9yeSBp bXBvcnRzIGJlY29tZSBhdmFpbGFibGUsIHRoZSBhcHByb3ByaWF0ZSBDYWxsZWVHcm91cCBjYW4g YmUgdXNlZC4KICAgICAvLyBJZiBMTEludCBpcyBkaXNhYmxlZCwgd2UgaW5zdGVhZCBkZWZlciBj b21waWxhdGlvbiB0byBtb2R1bGUgZXZhbHVhdGlvbi4KICAgICAvLyBJZiB0aGUgY29kZSBpcyBh bHJlYWR5IGNvbXBpbGVkLCBlLmcuIHRoZSBtb2R1bGUgd2FzIGFscmVhZHkgaW5zdGFudGlhdGVk IGJlZm9yZSwgd2UgZG8gbm90IHJlLWluaXRpYWxpemUuCi0gICAgYm9vbCBoYXNNZW1vcnlJbXBv cnQgPSBtb2R1bGUoKS0+bW9kdWxlSW5mb3JtYXRpb24oKS5tZW1vcnkuaXNJbXBvcnQoKTsKLSAg ICBpZiAoT3B0aW9uczo6dXNlV2FzbUxMSW50KCkgJiYgaGFzTWVtb3J5SW1wb3J0KSB7Ci0gICAg ICAgIFdhc206Ok1lbW9yeU1vZGUgaW5pdGlhbE1vZGUgPSBXYXNtOjpNZW1vcnlNb2RlOjpCb3Vu ZHNDaGVja2luZzsKLSAgICAgICAgQVNTRVJUKG1lbW9yeU1vZGUoKSA9PSBpbml0aWFsTW9kZSk7 Ci0gICAgICAgIG1vZHVsZSgpLT5tb2R1bGUoKS5jb3B5SW5pdGlhbENhbGxlZUdyb3VwVG9BbGxN ZW1vcnlNb2Rlcyhpbml0aWFsTW9kZSk7Ci0KLSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IFdhc206Ok51bWJlck9mTWVtb3J5TW9kZXM7IGkrKykgewotICAgICAgICAgICAgaWYgKGkg PT0gc3RhdGljX2Nhc3Q8dWludDhfdD4oaW5pdGlhbE1vZGUpKQotICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICAgICAgV2FzbTo6TWVtb3J5TW9kZSBtZW1vcnlNb2RlID0gc3RhdGlj X2Nhc3Q8V2FzbTo6TWVtb3J5TW9kZT4oaSk7Ci0gICAgICAgICAgICBtb2R1bGUoKS0+bW9kdWxl KCkuY2FsbGVlR3JvdXBGb3IobWVtb3J5TW9kZSk7IC8vIE1hdGVyaWFsaXplIFdhc206OkNhbGxl ZUdyb3VwLgotICAgICAgICB9Ci0gICAgfQorICAgIGlmIChPcHRpb25zOjp1c2VXYXNtTExJbnQo KSAmJiBtb2R1bGUoKS0+bW9kdWxlSW5mb3JtYXRpb24oKS5oYXNNZW1vcnlJbXBvcnQoKSkKKyAg ICAgICAgbW9kdWxlKCktPm1vZHVsZSgpLmNvcHlJbml0aWFsQ2FsbGVlR3JvdXBUb0FsbE1lbW9y eU1vZGVzKG1lbW9yeU1vZGUoKSk7CiAKICAgICBmb3IgKHVuc2lnbmVkIGltcG9ydEZ1bmN0aW9u TnVtID0gMDsgaW1wb3J0RnVuY3Rpb25OdW0gPCBpbnN0YW5jZSgpLm51bUltcG9ydEZ1bmN0aW9u cygpOyArK2ltcG9ydEZ1bmN0aW9uTnVtKSB7CiAgICAgICAgIGF1dG8qIGluZm8gPSBpbnN0YW5j ZSgpLmltcG9ydEZ1bmN0aW9uSW5mbyhpbXBvcnRGdW5jdGlvbk51bSk7CiAgICAgICAgIGluZm8t Pndhc21Ub0VtYmVkZGVyU3R1YiA9IG1fbW9kdWxlLT53YXNtVG9FbWJlZGRlclN0dWIoaW1wb3J0 RnVuY3Rpb25OdW0pOwogICAgIH0KIAotICAgIG1fbW9kdWxlUmVjb3JkLT5wcmVwYXJlTGluayh2 bSwgdGhpcyk7Ci0KICAgICBpZiAoY3JlYXRpb25Nb2RlID09IFdhc206OkNyZWF0aW9uTW9kZTo6 RnJvbUpTKSB7Ci0gICAgICAgIG1fbW9kdWxlUmVjb3JkLT5saW5rKGdsb2JhbE9iamVjdCwganNO dWxsKCkpOwotICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwotICAg ICAgICBtX21vZHVsZVJlY29yZC0+aW5pdGlhbGl6ZUltcG9ydHNBbmRFeHBvcnRzKGdsb2JhbE9i amVjdCwgaW1wb3J0T2JqZWN0LCBjcmVhdGlvbk1vZGUpOworICAgICAgICBtX21vZHVsZVJlY29y ZC0+aW5pdGlhbGl6ZUV4cG9ydHMoZ2xvYmFsT2JqZWN0KTsKICAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTihzY29wZSwgdm9pZCgpKTsKIAogICAgICAgICBKU1ZhbHVlIHN0YXJ0UmVzdWx0ID0g bV9tb2R1bGVSZWNvcmQtPmV2YWx1YXRlKGdsb2JhbE9iamVjdCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5oCmluZGV4IDBi MWI3YTdkYjEwZDczNTNmYjY5MzYwYTVmZjQ4M2Q3Mjg0MzBmNzMuLmQ0MTUxYzMwNDgxOTE2YzJj MWEzNjYyZjlhNDRiYTQyMDNmMjBmNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5oCkBAIC02Nyw3ICs2Nyw4IEBAIGNs YXNzIEpTV2ViQXNzZW1ibHlJbnN0YW5jZSBmaW5hbCA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0 IHsKIAogICAgIERFQ0xBUkVfRVhQT1JUX0lORk87CiAKLSAgICB2b2lkIGZpbmFsaXplQ3JlYXRp b24oVk0mLCBKU0dsb2JhbE9iamVjdCosIFJlZjxXYXNtOjpDYWxsZWVHcm91cD4mJiwgSlNPYmpl Y3QqIGltcG9ydE9iamVjdCwgV2FzbTo6Q3JlYXRpb25Nb2RlKTsKKyAgICB2b2lkIGluaXRpYWxp emVJbXBvcnRzKEpTR2xvYmFsT2JqZWN0KiwgSlNPYmplY3QqIGltcG9ydE9iamVjdCwgV2FzbTo6 Q3JlYXRpb25Nb2RlKTsKKyAgICB2b2lkIGZpbmFsaXplQ3JlYXRpb24oVk0mLCBKU0dsb2JhbE9i amVjdCosIFJlZjxXYXNtOjpDYWxsZWVHcm91cD4mJiwgV2FzbTo6Q3JlYXRpb25Nb2RlKTsKICAg ICAKICAgICBXYXNtOjpJbnN0YW5jZSYgaW5zdGFuY2UoKSB7IHJldHVybiBtX2luc3RhbmNlLmdl dCgpOyB9CiAgICAgV2ViQXNzZW1ibHlNb2R1bGVSZWNvcmQqIG1vZHVsZVJlY29yZCgpIHsgcmV0 dXJuIG1fbW9kdWxlUmVjb3JkLmdldCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUluc3RhbmNlQ29uc3RydWN0b3IuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlJbnN0YW5jZUNvbnN0cnVjdG9yLmNw cAppbmRleCA3YTEwN2UyMWNmNjU2Y2Q4OTIyODMzMmVlODgzMWJiZTVkMGJlN2Q0Li43NTIzMzMz MzJmZmY2Njg3MGNkYTk1OTNlYWVjNzE0OTExMzVlZDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUluc3RhbmNlQ29uc3RydWN0b3IuY3BwCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5SW5zdGFuY2VDb25z dHJ1Y3Rvci5jcHAKQEAgLTcyLDcgKzcyLDEwIEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihj b25zdHJ1Y3RKU1dlYkFzc2VtYmx5SW5zdGFuY2UsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsCiAg ICAgSlNXZWJBc3NlbWJseUluc3RhbmNlKiBpbnN0YW5jZSA9IEpTV2ViQXNzZW1ibHlJbnN0YW5j ZTo6dHJ5Q3JlYXRlKHZtLCBnbG9iYWxPYmplY3QsIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6Y3Jl YXRlUHJpdmF0ZU1vZHVsZUtleSgpLCBtb2R1bGUsIGltcG9ydE9iamVjdCwgaW5zdGFuY2VTdHJ1 Y3R1cmUsIFJlZjxXYXNtOjpNb2R1bGU+KG1vZHVsZS0+bW9kdWxlKCkpLCBXYXNtOjpDcmVhdGlv bk1vZGU6OkZyb21KUyk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKIAot ICAgIGluc3RhbmNlLT5maW5hbGl6ZUNyZWF0aW9uKHZtLCBnbG9iYWxPYmplY3QsIG1vZHVsZS0+ bW9kdWxlKCkuY29tcGlsZVN5bmMoJnZtLndhc21Db250ZXh0LCBpbnN0YW5jZS0+bWVtb3J5TW9k ZSgpKSwgaW1wb3J0T2JqZWN0LCBXYXNtOjpDcmVhdGlvbk1vZGU6OkZyb21KUyk7CisgICAgaW5z dGFuY2UtPmluaXRpYWxpemVJbXBvcnRzKGdsb2JhbE9iamVjdCwgaW1wb3J0T2JqZWN0LCBXYXNt OjpDcmVhdGlvbk1vZGU6OkZyb21KUyk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg eyB9KTsKKworICAgIGluc3RhbmNlLT5maW5hbGl6ZUNyZWF0aW9uKHZtLCBnbG9iYWxPYmplY3Qs IG1vZHVsZS0+bW9kdWxlKCkuY29tcGlsZVN5bmMoJnZtLndhc21Db250ZXh0LCBpbnN0YW5jZS0+ bWVtb3J5TW9kZSgpKSwgV2FzbTo6Q3JlYXRpb25Nb2RlOjpGcm9tSlMpOwogICAgIFJFVFVSTl9J Rl9FWENFUFRJT04oc2NvcGUsIHsgfSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShpbnN0 YW5jZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJB c3NlbWJseU1vZHVsZVJlY29yZC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9X ZWJBc3NlbWJseU1vZHVsZVJlY29yZC5jcHAKaW5kZXggNTk5ZTIzNGY2NTU0NDBhY2UyZTc1Yjg4 NGU1NWIyNDk2NzI5NzBlNC4uN2ZhODFlNzk3MzJiMjI1NTYzMmE3NDhmNjkyZWJhYWI5ODNkNWY3 YiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlN b2R1bGVSZWNvcmQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFz c2VtYmx5TW9kdWxlUmVjb3JkLmNwcApAQCAtMTEzLDExICsxMTMsMTEgQEAgU3luY2hyb25vdXNu ZXNzIFdlYkFzc2VtYmx5TW9kdWxlUmVjb3JkOjpsaW5rKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QsIEpTVmEKICAgICByZXR1cm4gU3luY2hyb25vdXNuZXNzOjpTeW5jOwogfQogCi12b2lk IFdlYkFzc2VtYmx5TW9kdWxlUmVjb3JkOjppbml0aWFsaXplSW1wb3J0c0FuZEV4cG9ydHMoSlNH bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNPYmplY3QqIGltcG9ydE9iamVjdCwgV2FzbTo6 Q3JlYXRpb25Nb2RlIGNyZWF0aW9uTW9kZSkKKy8vIGh0dHBzOi8vd2ViYXNzZW1ibHkuZ2l0aHVi LmlvL3NwZWMvanMtYXBpLyNyZWFkLXRoZS1pbXBvcnRzCit2b2lkIFdlYkFzc2VtYmx5TW9kdWxl UmVjb3JkOjppbml0aWFsaXplSW1wb3J0cyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBK U09iamVjdCogaW1wb3J0T2JqZWN0LCBXYXNtOjpDcmVhdGlvbk1vZGUgY3JlYXRpb25Nb2RlKQog ewogICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsKICAgICBhdXRvIHNjb3BlID0gREVD TEFSRV9USFJPV19TQ09QRSh2bSk7Ci0gICAgVU5VU0VEX1BBUkFNKHNjb3BlKTsKIAogICAgIFJF TEVBU0VfQVNTRVJUKG1faW5zdGFuY2UpOwogCkBAIC00MjIsMjEgKzQyMiwzOSBAQCB2b2lkIFdl YkFzc2VtYmx5TW9kdWxlUmVjb3JkOjppbml0aWFsaXplSW1wb3J0c0FuZEV4cG9ydHMoSlNHbG9i YWxPYmplY3QqIGdsb2JhbAogICAgICAgICAgICAgLy8gaWlpLiBBcHBlbmQgdi5bW01lbW9yeV1d IHRvIGltcG9ydHMuCiAgICAgICAgICAgICBtX2luc3RhbmNlLT5zZXRNZW1vcnkodm0sIG1lbW9y eSk7CiAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwotCi0g ICAgICAgICAgICAvLyBVc3VhbGx5IGF0IHRoaXMgcG9pbnQgdGhlIG1vZHVsZSdzIGNvZGUgYmxv Y2sgaW4gYW55IG1lbW9yeSBtb2RlIHNob3VsZCBiZQotICAgICAgICAgICAgLy8gcnVubmFibGUg ZHVlIHRvIHRoZSBMTGludCB0aWVyIGNvZGUgYmVpbmcgc2hhcmVkIGFtb25nIGFsbCBtb2Rlcy4g SG93ZXZlciwKLSAgICAgICAgICAgIC8vIGlmIExMSW50IGlzIGRpc2FibGVkLCBpdCBpcyBwb3Nz aWJsZSB0aGF0IHRoZSBjb2RlIG5lZWRzIHRvIGJlIGNvbXBpbGVkIGF0Ci0gICAgICAgICAgICAv LyB0aGlzIHBvaW50IHdoZW4gd2Uga25vdyB3aGljaCBtZW1vcnkgbW9kZSB0byB1c2UuCi0gICAg ICAgICAgICBXYXNtOjpDYWxsZWVHcm91cCogY2FsbGVlR3JvdXAgPSBtX2luc3RhbmNlLT5pbnN0 YW5jZSgpLmNhbGxlZUdyb3VwKCk7Ci0gICAgICAgICAgICBpZiAoIWNhbGxlZUdyb3VwIHx8ICFj YWxsZWVHcm91cC0+cnVubmFibGUoKSkgewotICAgICAgICAgICAgICAgIGNhbGxlZUdyb3VwID0g bV9pbnN0YW5jZS0+bW9kdWxlKCktPm1vZHVsZSgpLmNvbXBpbGVTeW5jKCZ2bS53YXNtQ29udGV4 dCwgbWVtb3J5LT5tZW1vcnkoKS5tb2RlKCkpLnB0cigpOwotICAgICAgICAgICAgICAgIGlmICgh Y2FsbGVlR3JvdXAtPnJ1bm5hYmxlKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBleGNl cHRpb24oY3JlYXRlSlNXZWJBc3NlbWJseUxpbmtFcnJvcihnbG9iYWxPYmplY3QsIHZtLCBjYWxs ZWVHcm91cC0+ZXJyb3JNZXNzYWdlKCkpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUKGNhbGxlZUdyb3VwLT5pc1NhZmVUb1J1bihtZW1vcnktPm1lbW9yeSgpLm1v ZGUoKSkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9Cit9CisKKy8vIGh0 dHBzOi8vd2ViYXNzZW1ibHkuZ2l0aHViLmlvL3NwZWMvanMtYXBpLyNjcmVhdGUtYW4tZXhwb3J0 cy1vYmplY3QKK3ZvaWQgV2ViQXNzZW1ibHlNb2R1bGVSZWNvcmQ6OmluaXRpYWxpemVFeHBvcnRz KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCit7CisgICAgVk0mIHZtID0gZ2xvYmFsT2Jq ZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKwor ICAgIFJFTEVBU0VfQVNTRVJUKG1faW5zdGFuY2UpOworCisgICAgSlNXZWJBc3NlbWJseU1vZHVs ZSogbW9kdWxlID0gbV9pbnN0YW5jZS0+bW9kdWxlKCk7CisgICAgY29uc3QgV2FzbTo6TW9kdWxl SW5mb3JtYXRpb24mIG1vZHVsZUluZm9ybWF0aW9uID0gbW9kdWxlLT5tb2R1bGVJbmZvcm1hdGlv bigpOworCisgICAgYXV0byBleGNlcHRpb24gPSBbJl0gKEpTT2JqZWN0KiBlcnJvcikgeworICAg ICAgICB0aHJvd0V4Y2VwdGlvbihnbG9iYWxPYmplY3QsIHNjb3BlLCBlcnJvcik7CisgICAgfTsK KworICAgIGlmIChtb2R1bGVJbmZvcm1hdGlvbi5oYXNNZW1vcnlJbXBvcnQoKSkgeworICAgICAg ICAvLyBVc3VhbGx5IGF0IHRoaXMgcG9pbnQgdGhlIG1vZHVsZSdzIGNvZGUgYmxvY2sgaW4gYW55 IG1lbW9yeSBtb2RlIHNob3VsZCBiZQorICAgICAgICAvLyBydW5uYWJsZSBkdWUgdG8gdGhlIExM aW50IHRpZXIgY29kZSBiZWluZyBzaGFyZWQgYW1vbmcgYWxsIG1vZGVzLiBIb3dldmVyLAorICAg ICAgICAvLyBpZiBMTEludCBpcyBkaXNhYmxlZCwgaXQgaXMgcG9zc2libGUgdGhhdCB0aGUgY29k ZSBuZWVkcyB0byBiZSBjb21waWxlZCBhdAorICAgICAgICAvLyB0aGlzIHBvaW50IHdoZW4gd2Ug a25vdyB3aGljaCBtZW1vcnkgbW9kZSB0byB1c2UuCisgICAgICAgIFdhc206OkNhbGxlZUdyb3Vw KiBjYWxsZWVHcm91cCA9IG1faW5zdGFuY2UtPmluc3RhbmNlKCkuY2FsbGVlR3JvdXAoKTsKKyAg ICAgICAgaWYgKCFjYWxsZWVHcm91cCB8fCAhY2FsbGVlR3JvdXAtPnJ1bm5hYmxlKCkpIHsKKyAg ICAgICAgICAgIGNhbGxlZUdyb3VwID0gbV9pbnN0YW5jZS0+bW9kdWxlKCktPm1vZHVsZSgpLmNv bXBpbGVTeW5jKCZ2bS53YXNtQ29udGV4dCwgbV9pbnN0YW5jZS0+aW5zdGFuY2UoKS5tZW1vcnko KS0+bW9kZSgpKS5wdHIoKTsKKyAgICAgICAgICAgIGlmICghY2FsbGVlR3JvdXAtPnJ1bm5hYmxl KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGV4Y2VwdGlvbihjcmVhdGVKU1dlYkFzc2VtYmx5 TGlua0Vycm9yKGdsb2JhbE9iamVjdCwgdm0sIGNhbGxlZUdyb3VwLT5lcnJvck1lc3NhZ2UoKSkp OworICAgICAgICB9CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNhbGxlZUdyb3VwLT5pc1NhZmVU b1J1bihtX2luc3RhbmNlLT5pbnN0YW5jZSgpLm1lbW9yeSgpLT5tb2RlKCkpKTsKKyAgICB9CiAK ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbW9kdWxlSW5mb3JtYXRpb24udGFibGVDb3Vu dCgpOyArK2kpIHsKICAgICAgICAgaWYgKG1vZHVsZUluZm9ybWF0aW9uLnRhYmxlc1tpXS5pc0lt cG9ydCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJB c3NlbWJseU1vZHVsZVJlY29yZC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2Vi QXNzZW1ibHlNb2R1bGVSZWNvcmQuaAppbmRleCBmOTQ4YWIwNGYxNDllYzhlMTc4MjdiNjkzYTRl ZmJhZjJkZDg3ZTZiLi5mZDkyYzk0NmQ4N2JkYmZjMjNkNTNjZDk3OTdlMTE1NTY0NGE3ZDRkIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseU1vZHVs ZVJlY29yZC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5 TW9kdWxlUmVjb3JkLmgKQEAgLTYwLDcgKzYwLDggQEAgY2xhc3MgV2ViQXNzZW1ibHlNb2R1bGVS ZWNvcmQgZmluYWwgOiBwdWJsaWMgQWJzdHJhY3RNb2R1bGVSZWNvcmQgewogCiAgICAgdm9pZCBw cmVwYXJlTGluayhWTSYsIEpTV2ViQXNzZW1ibHlJbnN0YW5jZSopOwogICAgIFN5bmNocm9ub3Vz bmVzcyBsaW5rKEpTR2xvYmFsT2JqZWN0KiwgSlNWYWx1ZSBzY3JpcHRGZXRjaGVyKTsKLSAgICB2 b2lkIGluaXRpYWxpemVJbXBvcnRzQW5kRXhwb3J0cyhKU0dsb2JhbE9iamVjdCosIEpTT2JqZWN0 KiBpbXBvcnRPYmplY3QsIFdhc206OkNyZWF0aW9uTW9kZSk7CisgICAgdm9pZCBpbml0aWFsaXpl SW1wb3J0cyhKU0dsb2JhbE9iamVjdCosIEpTT2JqZWN0KiBpbXBvcnRPYmplY3QsIFdhc206OkNy ZWF0aW9uTW9kZSk7CisgICAgdm9pZCBpbml0aWFsaXplRXhwb3J0cyhKU0dsb2JhbE9iamVjdCop OwogICAgIEpTX0VYUE9SVF9QUklWQVRFIEpTVmFsdWUgZXZhbHVhdGUoSlNHbG9iYWxPYmplY3Qq KTsKIAogICAgIEpTT2JqZWN0KiBleHBvcnRzT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gbV9leHBv cnRzT2JqZWN0LmdldCgpOyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA1YjU2 OTNjOTdiZTNjZGQwOWJmYTk3ODUxOTBlMDFlNDI5M2Q1ZGZhLi4xZWRhYjNmM2U5MDk0ZmNkMGY4 NWY4M2NkNjI3MzM3YWUyY2YxNWZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMyBAQAorMjAyMi0wMS0yNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgorCisgICAgICAgIFtKU0NdIFdhc20gbW9kdWxlIGltcG9ydCBzaG91bGQgYmUgZG9uZSBp biBzeW5jIHdoZW4gV2ViQXNzZW1ibHkuaW5zdGFudGlhdGUgZ2V0cyBtb2R1bGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTUwNgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRl c3RzL3dhc20vanNhcGkvY29uc3RydWN0b3IvaW5zdGFudGlhdGUuYW55LWV4cGVjdGVkLnR4dDoK KyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2FzbS9qc2FwaS9jb25zdHJ1Y3Rvci9pbnN0 YW50aWF0ZS5hbnkud29ya2VyLWV4cGVjdGVkLnR4dDoKKwogMjAyMi0wMS0yMyAgU2FtIFdlaW5p ZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBpbnRlcnBvbGF0aW5nIGNv bG9ycyB3aXRoIG1pc3Npbmcvbm9uZSBjb21wb25lbnRzIHZpYSBjb2xvci1taXgoKQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93YXNtL2pz YXBpL2NvbnN0cnVjdG9yL2luc3RhbnRpYXRlLmFueS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dhc20vanNhcGkvY29uc3RydWN0b3Iv aW5zdGFudGlhdGUuYW55LWV4cGVjdGVkLnR4dAppbmRleCA4NjQyYTVlYWUwNjAxMzUxYWZkMTU1 NDIxM2I4MzZlMWQ3OTEzMDgwLi4xZTA4YTBkMDVkMTliOGY4N2RhNDUwMWQwMTg3M2RlNDYwMTk3 Mzc1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3dhc20vanNhcGkvY29uc3RydWN0b3IvaW5zdGFudGlhdGUuYW55LWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dhc20vanNh cGkvY29uc3RydWN0b3IvaW5zdGFudGlhdGUuYW55LWV4cGVjdGVkLnR4dApAQCAtNTIsNyArNTIs NyBAQCBQQVNTIE11bHRpcGxlIGk2NCBhcmd1bWVudHM6IE1vZHVsZSBhcmd1bWVudAogUEFTUyBz dHJheSBhcmd1bWVudDogQnVmZmVyU291cmNlIGFyZ3VtZW50CiBQQVNTIHN0cmF5IGFyZ3VtZW50 OiBNb2R1bGUgYXJndW1lbnQKIFBBU1MgU3luY2hyb25vdXMgb3B0aW9ucyBoYW5kbGluZzogQnVm ZmVyIGFyZ3VtZW50Ci1GQUlMIFN5bmNocm9ub3VzIG9wdGlvbnMgaGFuZGxpbmc6IE1vZHVsZSBh cmd1bWVudCBhc3NlcnRfYXJyYXlfZXF1YWxzOiBsZW5ndGhzIGRpZmZlciwgZXhwZWN0ZWQgYXJy YXkgWyJtb2R1bGUgZ2V0dGVyIiwgImdsb2JhbCBnZXR0ZXIiXSBsZW5ndGggMiwgZ290IFtdIGxl bmd0aCAwCitQQVNTIFN5bmNocm9ub3VzIG9wdGlvbnMgaGFuZGxpbmc6IE1vZHVsZSBhcmd1bWVu dAogUEFTUyBFbXB0eSBidWZmZXIKIFBBU1MgSW52YWxpZCBjb2RlCiBQQVNTIENoYW5naW5nIHRo ZSBidWZmZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvd2FzbS9qc2FwaS9jb25zdHJ1Y3Rvci9pbnN0YW50aWF0ZS5hbnkud29ya2VyLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv d2FzbS9qc2FwaS9jb25zdHJ1Y3Rvci9pbnN0YW50aWF0ZS5hbnkud29ya2VyLWV4cGVjdGVkLnR4 dAppbmRleCA4NjQyYTVlYWUwNjAxMzUxYWZkMTU1NDIxM2I4MzZlMWQ3OTEzMDgwLi4xZTA4YTBk MDVkMTliOGY4N2RhNDUwMWQwMTg3M2RlNDYwMTk3Mzc1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dhc20vanNhcGkvY29uc3RydWN0b3Iv aW5zdGFudGlhdGUuYW55Lndvcmtlci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93YXNtL2pzYXBpL2NvbnN0cnVjdG9yL2luc3Rh bnRpYXRlLmFueS53b3JrZXItZXhwZWN0ZWQudHh0CkBAIC01Miw3ICs1Miw3IEBAIFBBU1MgTXVs dGlwbGUgaTY0IGFyZ3VtZW50czogTW9kdWxlIGFyZ3VtZW50CiBQQVNTIHN0cmF5IGFyZ3VtZW50 OiBCdWZmZXJTb3VyY2UgYXJndW1lbnQKIFBBU1Mgc3RyYXkgYXJndW1lbnQ6IE1vZHVsZSBhcmd1 bWVudAogUEFTUyBTeW5jaHJvbm91cyBvcHRpb25zIGhhbmRsaW5nOiBCdWZmZXIgYXJndW1lbnQK LUZBSUwgU3luY2hyb25vdXMgb3B0aW9ucyBoYW5kbGluZzogTW9kdWxlIGFyZ3VtZW50IGFzc2Vy dF9hcnJheV9lcXVhbHM6IGxlbmd0aHMgZGlmZmVyLCBleHBlY3RlZCBhcnJheSBbIm1vZHVsZSBn ZXR0ZXIiLCAiZ2xvYmFsIGdldHRlciJdIGxlbmd0aCAyLCBnb3QgW10gbGVuZ3RoIDAKK1BBU1Mg U3luY2hyb25vdXMgb3B0aW9ucyBoYW5kbGluZzogTW9kdWxlIGFyZ3VtZW50CiBQQVNTIEVtcHR5 IGJ1ZmZlcgogUEFTUyBJbnZhbGlkIGNvZGUKIFBBU1MgQ2hhbmdpbmcgdGhlIGJ1ZmZlcgo=