220914 2021-01-25 03:48:14 -0800 [JSC] WebAssembly.Global should support Funcref and Externref 2021-01-30 11:51:23 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221157 InRadar P2 Normal --- 1 ysuzuki webkit-unassigned chi187 dbezhetskov ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1722013 0 ysuzuki 2021-01-25 03:48:14 -0800 https://webassembly.github.io/reference-types/js-api/index.html#dom-global-global 1722014 1 ysuzuki 2021-01-25 03:50:03 -0800 Note, 1. Wasm::Global itself supports externref / funcref already. 2. But JS binding around WebAssembly.Global does not support it (e.g. new WebAssembly.Global({ type: "externref", mutable: true }); 1722558 2 418433 dbezhetskov 2021-01-26 09:48:25 -0800 Created attachment 418433 Patch 1722644 3 418433 ysuzuki 2021-01-26 11:59:10 -0800 Comment on attachment 418433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418433&action=review r=me with comments. > Source/JavaScriptCore/wasm/js/WebAssemblyGlobalConstructor.cpp:146 > + RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); Use `RETURN_IF_EXCEPTION(throwScope, {});` in newer code. > Source/JavaScriptCore/wasm/js/WebAssemblyGlobalConstructor.cpp:151 > + if (type == Wasm::Type::Funcref && argument.isUndefined()) > + argument = jsNull(); Can we share this "default value" part with WasmTable etc.? > Source/JavaScriptCore/wasm/js/WebAssemblyGlobalConstructor.cpp:152 > + jsWebAssemblyGlobal->global()->set(globalObject, argument); Insert `RETURN_IF_EXCEPTION(throwScope, { });` after calling a function which takes `globalObject` as a first parameter (this is a rough indicator of "it can throw"). > Source/JavaScriptCore/wasm/js/WebAssemblyGlobalConstructor.cpp:154 > + RELEASE_AND_RETURN(throwScope, JSValue::encode(jsWebAssemblyGlobal)); RELEASE_AND_RETURN is not necessary if the evaluated part will not throw. Let's use `return`. > JSTests/wasm/references/globals.js:42 > + assert.throws(() => new WebAssembly.Global({ value: "anyfunc", mutable: true }, new Pelmen(calories)), WebAssembly.RuntimeError, "Funcref must be an exported wasm function (evaluating 'new WebAssembly.Global({ value: \"anyfunc\", mutable: true }, new Pelmen(calories))')"); Let's add a test, setting a wrong value via `.value = xxx`. 1723629 4 418707 dbezhetskov 2021-01-28 23:44:20 -0800 Created attachment 418707 Patch 1723794 5 418707 ysuzuki 2021-01-29 11:09:14 -0800 Comment on attachment 418707 Patch r=me 1723809 6 ews-feeder 2021-01-29 11:26:42 -0800 Committed r272071: <https://trac.webkit.org/changeset/272071> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418707. 1723810 7 webkit-bug-importer 2021-01-29 11:27:14 -0800 <rdar://problem/73763872> 1724045 8 ysuzuki 2021-01-30 10:50:01 -0800 Oops! ::set should not be used since mutability can be an immutable. In that case, assertion hits. https://results.webkit.org/?suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fwasm%2Fjsapi%2Fglobal%2Ftype.tentative.any.html I'll fix. 1724054 9 ysuzuki 2021-01-30 11:51:23 -0800 Committed r272119: <https://trac.webkit.org/changeset/272119> 418433 2021-01-26 09:48:25 -0800 2021-01-28 23:44:13 -0800 Patch bug-220914-20210126204824.patch text/plain 6403 dbezhetskov U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YTExZGJlZmFjOTQ0MDY1MzhjMzdlNTU5ZGZhNmEyYjI4YWM2ZjE2Li4yMzM3ZWYyYWEyMmI3ZGI2 Y2NjNTc3ZmMwMDhlY2ViMzM2NzEwYmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0wMS0yNiAgRG1pdHJ5IEJlemhldHNrb3YgIDxkYmV6aGV0c2tvdkBp Z2FsaWEuY29tPgorCisgICAgICAgIFtKU0NdIFdlYkFzc2VtYmx5Lkdsb2JhbCBzaG91bGQgc3Vw cG9ydCBGdW5jcmVmIGFuZCBFeHRlcm5yZWYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFsbG93IHVzaW5nIHJlZmVyZW5jZSB0eXBlcyBpbiBjdG9yIG9m IFdlYkFzc2VtYmx5Lkdsb2JhbAorICAgICAgICBhY2NvcmRpbmcgdG8gdGhlIHNwZWMKKyAgICAg ICAgaHR0cHM6Ly93ZWJhc3NlbWJseS5naXRodWIuaW8vcmVmZXJlbmNlLXR5cGVzL2pzLWFwaS9p bmRleC5odG1sI2RvbS1nbG9iYWwtZ2xvYmFsLgorCisgICAgICAgICogd2FzbS9qcy9XZWJBc3Nl bWJseUdsb2JhbENvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6SlNDX0RFRklORV9IT1NU X0ZVTkNUSU9OKToKKwogMjAyMS0wMS0yMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIERlZmVycmVkV29ya1RpbWVyIHNob3VsZCBjbGVhciBwZW5k aW5nIHRhc2sgYWZ0ZXIgcnVubmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3dhc20vanMvV2ViQXNzZW1ibHlHbG9iYWxDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUdsb2JhbENvbnN0cnVjdG9yLmNwcAppbmRleCBl YzAwY2Q2YzMyNzQ2MGIyMzE2NzczODg3ZThlN2E5NmI4YjE1ZWNhLi4xOWY2MjZmNzI1YjQ5NGU4 MGZjZWM0OWJlZjEzMzAyZDg2NjVjOTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9qcy9XZWJBc3NlbWJseUdsb2JhbENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUdsb2JhbENvbnN0cnVjdG9yLmNwcApA QCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiSlNDSW5saW5lcy5oIgogI2luY2x1ZGUgIkpT V2ViQXNzZW1ibHlHbG9iYWwuaCIKKyNpbmNsdWRlICJXYXNtRm9ybWF0LmgiCiAjaW5jbHVkZSAi V2ViQXNzZW1ibHlHbG9iYWxQcm90b3R5cGUuaCIKIAogI2luY2x1ZGUgIldlYkFzc2VtYmx5R2xv YmFsQ29uc3RydWN0b3IubHV0LmgiCkBAIC05Myw2ICs5NCwxMCBAQCBKU0NfREVGSU5FX0hPU1Rf RlVOQ1RJT04oY29uc3RydWN0SlNXZWJBc3NlbWJseUdsb2JhbCwgKEpTR2xvYmFsT2JqZWN0KiBn bG9iYWxPYgogICAgICAgICAgICAgdHlwZSA9IFdhc206OlR5cGU6OkYzMjsKICAgICAgICAgZWxz ZSBpZiAodmFsdWVTdHJpbmcgPT0gImY2NCIpCiAgICAgICAgICAgICB0eXBlID0gV2FzbTo6VHlw ZTo6RjY0OworICAgICAgICBlbHNlIGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5j ZXMoKSAmJiB2YWx1ZVN0cmluZyA9PSAiYW55ZnVuYyIpCisgICAgICAgICAgICB0eXBlID0gV2Fz bTo6VHlwZTo6RnVuY3JlZjsKKyAgICAgICAgZWxzZSBpZiAoT3B0aW9uczo6dXNlV2ViQXNzZW1i bHlSZWZlcmVuY2VzKCkgJiYgdmFsdWVTdHJpbmcgPT0gImV4dGVybnJlZiIpCisgICAgICAgICAg ICB0eXBlID0gV2FzbTo6VHlwZTo6RXh0ZXJucmVmOwogICAgICAgICBlbHNlCiAgICAgICAgICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHRocm93RXhjZXB0aW9uKGdsb2JhbE9iamVjdCwgdGhy b3dTY29wZSwgY3JlYXRlVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgIldlYkFzc2VtYmx5Lkdsb2Jh bCBleHBlY3RzIGl0cyAndmFsdWUnIGZpZWxkIHRvIGJlIHRoZSBzdHJpbmcgJ2kzMicsICdpNjQn LCAnZjMyJywgb3IgJ2Y2NCciX3MpKSk7CiAgICAgfQpAQCAtMTI1LDEzICsxMzAsMjggQEAgSlND X0RFRklORV9IT1NUX0ZVTkNUSU9OKGNvbnN0cnVjdEpTV2ViQXNzZW1ibHlHbG9iYWwsIChKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2IKICAgICAgICAgICAgIGluaXRpYWxWYWx1ZSA9IGJpdHdpc2Vf Y2FzdDx1aW50NjRfdD4odmFsdWUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KKyAg ICAgICAgY2FzZSBXYXNtOjpUeXBlOjpGdW5jcmVmOgorICAgICAgICBjYXNlIFdhc206OlR5cGU6 OkV4dGVybnJlZjogeworICAgICAgICAgICAgLy8gV2UgY2hlY2sgZGVmYXVsdCB2YWx1ZSBmb3Ig dGhlc2UgdHlwZXMgbGF0ZXIgaW4gc2V0IG1ldGhvZC4KKyAgICAgICAgICAgIEFTU0VSVChPcHRp b25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgfQogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgfQogICAgIH0KIAogICAgIFJlZjxXYXNtOjpHbG9iYWw+IHdh c21HbG9iYWwgPSBXYXNtOjpHbG9iYWw6OmNyZWF0ZSh0eXBlLCBtdXRhYmlsaXR5LCBpbml0aWFs VmFsdWUpOwotICAgIFJFTEVBU0VfQU5EX1JFVFVSTih0aHJvd1Njb3BlLCBKU1ZhbHVlOjplbmNv ZGUoSlNXZWJBc3NlbWJseUdsb2JhbDo6dHJ5Q3JlYXRlKGdsb2JhbE9iamVjdCwgdm0sIHdlYkFz c2VtYmx5R2xvYmFsU3RydWN0dXJlLCBXVEZNb3ZlKHdhc21HbG9iYWwpKSkpOworICAgIEpTV2Vi QXNzZW1ibHlHbG9iYWwqIGpzV2ViQXNzZW1ibHlHbG9iYWwgPSBKU1dlYkFzc2VtYmx5R2xvYmFs Ojp0cnlDcmVhdGUoZ2xvYmFsT2JqZWN0LCB2bSwgd2ViQXNzZW1ibHlHbG9iYWxTdHJ1Y3R1cmUs IFdURk1vdmUod2FzbUdsb2JhbCkpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29w ZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisKKyAgICBpZiAoV2FzbTo6aXNSZWZUeXBlKHR5cGUpKSB7 CisgICAgICAgIEFTU0VSVChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSk7Cisg ICAgICAgIGlmICh0eXBlID09IFdhc206OlR5cGU6OkZ1bmNyZWYgJiYgYXJndW1lbnQuaXNVbmRl ZmluZWQoKSkKKyAgICAgICAgICAgIGFyZ3VtZW50ID0ganNOdWxsKCk7CisgICAgICAgIGpzV2Vi QXNzZW1ibHlHbG9iYWwtPmdsb2JhbCgpLT5zZXQoZ2xvYmFsT2JqZWN0LCBhcmd1bWVudCk7Cisg ICAgfQorICAgIFJFTEVBU0VfQU5EX1JFVFVSTih0aHJvd1Njb3BlLCBKU1ZhbHVlOjplbmNvZGUo anNXZWJBc3NlbWJseUdsb2JhbCkpOwogfQogCiBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04oY2Fs bEpTV2ViQXNzZW1ibHlHbG9iYWwsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYWxs RnJhbWUqKSkKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VM b2cKaW5kZXggMGIyYmIzOThhOTI5NDVjYjk0ZjU2MjllYjI5OTcwMjdmNjQ2NTAzNC4uMmZlNjg0 ZWMxZTBlNjJhMmE3YWRkMTNmYzllY2NmOTUwYmE1ZjZhZCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9D aGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0w MS0yNiAgRG1pdHJ5IEJlemhldHNrb3YgIDxkYmV6aGV0c2tvdkBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtKU0NdIFdlYkFzc2VtYmx5Lkdsb2JhbCBzaG91bGQgc3VwcG9ydCBGdW5jcmVmIGFuZCBF eHRlcm5yZWYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMDkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCB0ZXN0cyBmb3IgV2ViQXNzZW1ibHkuR2xvYmFsIGN0b3JzIHdpdGgKKyAgICAgICAgbmV3 IHJlZmVyZW5jZSB0eXBlczoKKyAgICAgICAgaHR0cHM6Ly93ZWJhc3NlbWJseS5naXRodWIuaW8v cmVmZXJlbmNlLXR5cGVzL2pzLWFwaS9pbmRleC5odG1sI2RvbS1nbG9iYWwtZ2xvYmFsLgorCisg ICAgICAgICogd2FzbS9yZWZlcmVuY2VzL2dsb2JhbHMuanM6IEFkZGVkLgorICAgICAgICAoUGVs bWVuKToKKyAgICAgICAgKHRlc3RHbG9iYWxDb25zdHJ1Y3RvckZvckV4dGVybnJlZik6CisgICAg ICAgIChhc3luYyB0ZXN0R2xvYmFsQ29uc3RydWN0b3JGb3JGdW5jcmVmKToKKwogMjAyMS0wMS0y MSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEpT UHJvbWlzZSBzaG91bGQgbm90IHByb3BhZ2F0ZSBUZXJtaW5hdGVkRXhlY3V0aW9uRXJyb3IKZGlm ZiAtLWdpdCBhL0pTVGVzdHMvd2FzbS9yZWZlcmVuY2VzL2dsb2JhbHMuanMgYi9KU1Rlc3RzL3dh c20vcmVmZXJlbmNlcy9nbG9iYWxzLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg1YjM4MzFhOTFjODI5Y2M2MjY5 MDNhM2Q1NzQyYTY3ZDkwZTU4ZGUKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3dhc20vcmVm ZXJlbmNlcy9nbG9iYWxzLmpzCkBAIC0wLDAgKzEsNDYgQEAKKy8vQCBydW5XZWJBc3NlbWJseVN1 aXRlKCItLXVzZVdlYkFzc2VtYmx5UmVmZXJlbmNlcz10cnVlIikKK2ltcG9ydCAqIGFzIGFzc2Vy dCBmcm9tICcuLi9hc3NlcnQuanMnOworaW1wb3J0IHsgaW5zdGFudGlhdGUgfSBmcm9tICIuLi93 YWJ0LXdyYXBwZXIuanMiOworCisvLyB0cml2aWFsCitmdW5jdGlvbiBQZWxtZW4oY2Fsb3JpZXMp IHsKKyAgdGhpcy5jYWxvcmllcyA9IGNhbG9yaWVzOworfQorY29uc3QgY2Fsb3JpZXMgPSAxMDA7 CisKK2Z1bmN0aW9uIHRlc3RHbG9iYWxDb25zdHJ1Y3RvckZvckV4dGVybnJlZigpIHsKKyAgewor ICAgICAgbGV0IGdsb2JhbCA9IG5ldyBXZWJBc3NlbWJseS5HbG9iYWwoeyB2YWx1ZTogImV4dGVy bnJlZiIsIG11dGFibGU6IHRydWUgfSk7CisgICAgICBhc3NlcnQuZXEoZ2xvYmFsLnZhbHVlLCB1 bmRlZmluZWQpOworCisgICAgICBnbG9iYWwudmFsdWUgPSBuZXcgUGVsbWVuKGNhbG9yaWVzKTsK KyAgICAgIGFzc2VydC5lcShnbG9iYWwudmFsdWUuY2Fsb3JpZXMsIGNhbG9yaWVzKTsKKyAgfQor CisgIHsKKyAgICAgIGxldCBnbG9iYWwgPSBuZXcgV2ViQXNzZW1ibHkuR2xvYmFsKHsgdmFsdWU6 ICJleHRlcm5yZWYiLCBtdXRhYmxlOiB0cnVlIH0sIG5ldyBQZWxtZW4oY2Fsb3JpZXMpKTsKKyAg ICAgIGFzc2VydC5lcShnbG9iYWwudmFsdWUuY2Fsb3JpZXMsIGNhbG9yaWVzKTsKKyAgfQorfQor Cithc3luYyBmdW5jdGlvbiB0ZXN0R2xvYmFsQ29uc3RydWN0b3JGb3JGdW5jcmVmKCkgeworICBj b25zdCBpbnN0YW5jZSA9IGF3YWl0IGluc3RhbnRpYXRlKGAobW9kdWxlIChmdW5jIChleHBvcnQg ImZvbyIpKSlgLCB7fSwge3JlZmVyZW5jZV90eXBlczogdHJ1ZX0pOworCisgIHsKKyAgICAgIGxl dCBnbG9iYWwgPSBuZXcgV2ViQXNzZW1ibHkuR2xvYmFsKHsgdmFsdWU6ICJhbnlmdW5jIiwgbXV0 YWJsZTogdHJ1ZSB9KTsKKyAgICAgIGFzc2VydC5lcShnbG9iYWwudmFsdWUsIG51bGwpOworCisg ICAgICBnbG9iYWwudmFsdWUgPSBpbnN0YW5jZS5leHBvcnRzLmZvbzsKKyAgICAgIGFzc2VydC5l cShnbG9iYWwudmFsdWUsIGluc3RhbmNlLmV4cG9ydHMuZm9vKTsKKyAgfQorCisgIHsKKyAgICAg IGxldCBnbG9iYWwgPSBuZXcgV2ViQXNzZW1ibHkuR2xvYmFsKHsgdmFsdWU6ICJhbnlmdW5jIiwg bXV0YWJsZTogdHJ1ZSB9LCBpbnN0YW5jZS5leHBvcnRzLmZvbyk7CisgICAgICBhc3NlcnQuZXEo Z2xvYmFsLnZhbHVlLCBpbnN0YW5jZS5leHBvcnRzLmZvbyk7CisgIH0KKworICBhc3NlcnQudGhy b3dzKCgpID0+IG5ldyBXZWJBc3NlbWJseS5HbG9iYWwoeyB2YWx1ZTogImFueWZ1bmMiLCBtdXRh YmxlOiB0cnVlIH0sIG5ldyBQZWxtZW4oY2Fsb3JpZXMpKSwgV2ViQXNzZW1ibHkuUnVudGltZUVy cm9yLCAiRnVuY3JlZiBtdXN0IGJlIGFuIGV4cG9ydGVkIHdhc20gZnVuY3Rpb24gKGV2YWx1YXRp bmcgJ25ldyBXZWJBc3NlbWJseS5HbG9iYWwoeyB2YWx1ZTogXCJhbnlmdW5jXCIsIG11dGFibGU6 IHRydWUgfSwgbmV3IFBlbG1lbihjYWxvcmllcykpJykiKTsKK30KKwordGVzdEdsb2JhbENvbnN0 cnVjdG9yRm9yRXh0ZXJucmVmKCk7Cithc3NlcnQuYXN5bmNUZXN0KHRlc3RHbG9iYWxDb25zdHJ1 Y3RvckZvckZ1bmNyZWYoKSk7Cg== 418707 2021-01-28 23:44:20 -0800 2021-01-29 11:26:43 -0800 Patch bug-220914-20210129104419.patch text/plain 11073 dbezhetskov U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx YjhmYzVmZGIxMmZlMjUyMGJkNzg0NTA1MGMwNTg0MTYwMTIxZjFiLi4xZGE3NjkxMDM3MmMxN2E5 YTQwMGM3ODkyNDE4NjVjNmViMjM0NzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0wMS0yNiAgRG1pdHJ5IEJlemhldHNrb3YgIDxkYmV6aGV0c2tvdkBp Z2FsaWEuY29tPgorCisgICAgICAgIFtKU0NdIFdlYkFzc2VtYmx5Lkdsb2JhbCBzaG91bGQgc3Vw cG9ydCBGdW5jcmVmIGFuZCBFeHRlcm5yZWYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFsbG93IHVzaW5nIHJlZmVyZW5jZSB0eXBlcyBpbiBjdG9yIG9m IFdlYkFzc2VtYmx5Lkdsb2JhbAorICAgICAgICBhY2NvcmRpbmcgdG8gdGhlIHNwZWMKKyAgICAg ICAgaHR0cHM6Ly93ZWJhc3NlbWJseS5naXRodWIuaW8vcmVmZXJlbmNlLXR5cGVzL2pzLWFwaS9p bmRleC5odG1sI2RvbS1nbG9iYWwtZ2xvYmFsLgorCisgICAgICAgICogd2FzbS9qcy9XZWJBc3Nl bWJseUdsb2JhbENvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6SlNDX0RFRklORV9IT1NU X0ZVTkNUSU9OKToKKwogMjAyMS0wMS0yOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEFkZCBKU1Byb21pc2U6OnJlamVjdGVkUHJvbWlzZQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbVRhYmxlLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21UYWJsZS5jcHAKaW5kZXggY2ZhZmQyMDMwZDZhNDI5 NWFkMGYyZTAxZTQ0YzVmM2Q0YWMzYmEzNS4uMzAxZWQxMDM0YzkzMTlhMDkxN2NlYzBhN2Y2NmU0 NTNlOTRhNWMxZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbVRh YmxlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtVGFibGUuY3BwCkBA IC0xNzQsNiArMTc0LDE0IEBAIHZvaWQgVGFibGU6OnZpc2l0QWdncmVnYXRlKFNsb3RWaXNpdG9y JiB2aXNpdG9yKQogICAgICAgICB2aXNpdG9yLmFwcGVuZChtX2pzVmFsdWVzLmdldCgpW2ldKTsK IH0KIAorVHlwZSBUYWJsZTo6d2FzbVR5cGUoKSBjb25zdAoreworICAgIGlmIChpc0V4dGVybnJl ZlRhYmxlKCkpCisgICAgICAgIHJldHVybiBUeXBlOjpFeHRlcm5yZWY7CisgICAgQVNTRVJUKGlz RnVuY3JlZlRhYmxlKCkpOworICAgIHJldHVybiBUeXBlOjpGdW5jcmVmOworfQorCiBGdW5jUmVm VGFibGUqIFRhYmxlOjphc0Z1bmNyZWZUYWJsZSgpCiB7CiAgICAgcmV0dXJuIG1fdHlwZSA9PSBU YWJsZUVsZW1lbnRUeXBlOjpGdW5jcmVmID8gc3RhdGljX2Nhc3Q8RnVuY1JlZlRhYmxlKj4odGhp cykgOiBudWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2Fz bVRhYmxlLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtVGFibGUuaAppbmRleCA1 NjE5ODc0YzEyOGMwZTVjZGI2MTQ3YzZkYTAxYzBmY2I4MjQzYzIyLi5kYmFlNzEwNTRiNGM3ZGQ5 ZWQyOWJhNDBjZTIwMWE1OWM3OWJjMDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9XYXNtVGFibGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNt VGFibGUuaApAQCAtNjgsNiArNjgsNyBAQCBwdWJsaWM6CiAgICAgVGFibGVFbGVtZW50VHlwZSB0 eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CiAgICAgYm9vbCBpc0V4dGVybnJlZlRhYmxl KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFRhYmxlRWxlbWVudFR5cGU6OkV4dGVybnJlZjsg fQogICAgIGJvb2wgaXNGdW5jcmVmVGFibGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gVGFi bGVFbGVtZW50VHlwZTo6RnVuY3JlZjsgfQorICAgIFR5cGUgd2FzbVR5cGUoKSBjb25zdDsKICAg ICBGdW5jUmVmVGFibGUqIGFzRnVuY3JlZlRhYmxlKCk7CiAKICAgICBzdGF0aWMgYm9vbCBpc1Zh bGlkTGVuZ3RoKHVpbnQzMl90IGxlbmd0aCkgeyByZXR1cm4gbGVuZ3RoIDwgbWF4VGFibGVFbnRy aWVzOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFz c2VtYmx5SGVscGVycy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3Nl bWJseUhlbHBlcnMuaAppbmRleCBhM2M0NWJhZjZiOWIyMWM0OGE2MjFhNGVhM2RmZjlkMTg5NDVk MjMxLi42ZjlmM2IxM2JhZDk2NWRkYjIwMTBhMDk3NzgyNzE3ZGVmZmU5MGQ2IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SGVscGVycy5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlIZWxwZXJzLmgK QEAgLTEzNSwxMSArMTM1LDEyIEBAIEFMV0FZU19JTkxJTkUgYm9vbCBpc1dlYkFzc2VtYmx5SG9z dEZ1bmN0aW9uKFZNJiB2bSwgSlNWYWx1ZSBvYmplY3QpCiAgICAgcmV0dXJuIGlzV2ViQXNzZW1i bHlIb3N0RnVuY3Rpb24odm0sIG9iamVjdCwgdW51c2VkLCB1bnVzZWQyKTsKIH0KIAotQUxXQVlT X0lOTElORSBKU1ZhbHVlIGRlZmF1bHRWYWx1ZUZvclRhYmxlKGNvbnN0IFdhc206OlRhYmxlRWxl bWVudFR5cGUgdGFibGVUeXBlKQorQUxXQVlTX0lOTElORSBKU1ZhbHVlIGRlZmF1bHRWYWx1ZUZv clJlZmVyZW5jZVR5cGUoY29uc3QgV2FzbTo6VHlwZSB0eXBlKQogewotICAgIGlmICh0YWJsZVR5 cGUgPT0gV2FzbTo6VGFibGVFbGVtZW50VHlwZTo6RXh0ZXJucmVmKQorICAgIEFTU0VSVChXYXNt Ojppc1JlZlR5cGUodHlwZSkpOworICAgIGlmICh0eXBlID09IFdhc206OlR5cGU6OkV4dGVybnJl ZikKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7Ci0gICAgQVNTRVJUKHRhYmxlVHlwZSA9 PSBXYXNtOjpUYWJsZUVsZW1lbnRUeXBlOjpGdW5jcmVmKTsKKyAgICBBU1NFUlQodHlwZSA9PSBX YXNtOjpUeXBlOjpGdW5jcmVmKTsKICAgICByZXR1cm4ganNOdWxsKCk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5R2xvYmFsQ29uc3Ry dWN0b3IuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlHbG9i YWxDb25zdHJ1Y3Rvci5jcHAKaW5kZXggZWMwMGNkNmMzMjc0NjBiMjMxNjc3Mzg4N2U4ZTdhOTZi OGIxNWVjYS4uOWYzZmM4NmIxMGQ4ZWJjOGUzYzIxNDNkMjQzY2ZjNWNmOTQ3NDczMiAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlHbG9iYWxDb25z dHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1i bHlHbG9iYWxDb25zdHJ1Y3Rvci5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUgIkpT Q0lubGluZXMuaCIKICNpbmNsdWRlICJKU1dlYkFzc2VtYmx5R2xvYmFsLmgiCisjaW5jbHVkZSAi V2FzbUZvcm1hdC5oIgogI2luY2x1ZGUgIldlYkFzc2VtYmx5R2xvYmFsUHJvdG90eXBlLmgiCiAK ICNpbmNsdWRlICJXZWJBc3NlbWJseUdsb2JhbENvbnN0cnVjdG9yLmx1dC5oIgpAQCAtOTMsNiAr OTQsMTAgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKGNvbnN0cnVjdEpTV2ViQXNzZW1ibHlH bG9iYWwsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2IKICAgICAgICAgICAgIHR5cGUgPSBXYXNt OjpUeXBlOjpGMzI7CiAgICAgICAgIGVsc2UgaWYgKHZhbHVlU3RyaW5nID09ICJmNjQiKQogICAg ICAgICAgICAgdHlwZSA9IFdhc206OlR5cGU6OkY2NDsKKyAgICAgICAgZWxzZSBpZiAoT3B0aW9u czo6dXNlV2ViQXNzZW1ibHlSZWZlcmVuY2VzKCkgJiYgdmFsdWVTdHJpbmcgPT0gImFueWZ1bmMi KQorICAgICAgICAgICAgdHlwZSA9IFdhc206OlR5cGU6OkZ1bmNyZWY7CisgICAgICAgIGVsc2Ug aWYgKE9wdGlvbnM6OnVzZVdlYkFzc2VtYmx5UmVmZXJlbmNlcygpICYmIHZhbHVlU3RyaW5nID09 ICJleHRlcm5yZWYiKQorICAgICAgICAgICAgdHlwZSA9IFdhc206OlR5cGU6OkV4dGVybnJlZjsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZSh0aHJvd0V4 Y2VwdGlvbihnbG9iYWxPYmplY3QsIHRocm93U2NvcGUsIGNyZWF0ZVR5cGVFcnJvcihnbG9iYWxP YmplY3QsICJXZWJBc3NlbWJseS5HbG9iYWwgZXhwZWN0cyBpdHMgJ3ZhbHVlJyBmaWVsZCB0byBi ZSB0aGUgc3RyaW5nICdpMzInLCAnaTY0JywgJ2YzMicsIG9yICdmNjQnIl9zKSkpOwogICAgIH0K QEAgLTEyNSwxMyArMTMwLDI5IEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihjb25zdHJ1Y3RK U1dlYkFzc2VtYmx5R2xvYmFsLCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iCiAgICAgICAgICAg ICBpbml0aWFsVmFsdWUgPSBiaXR3aXNlX2Nhc3Q8dWludDY0X3Q+KHZhbHVlKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9CisgICAgICAgIGNhc2UgV2FzbTo6VHlwZTo6RnVuY3JlZjoK KyAgICAgICAgY2FzZSBXYXNtOjpUeXBlOjpFeHRlcm5yZWY6IHsKKyAgICAgICAgICAgIC8vIFdl IGNoZWNrIGRlZmF1bHQgdmFsdWUgZm9yIHRoZXNlIHR5cGVzIGxhdGVyIGluIHNldCBtZXRob2Qu CisgICAgICAgICAgICBBU1NFUlQoT3B0aW9uczo6dXNlV2ViQXNzZW1ibHlSZWZlcmVuY2VzKCkp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAgZGVmYXVsdDoKICAgICAg ICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIH0KICAgICB9CiAK ICAgICBSZWY8V2FzbTo6R2xvYmFsPiB3YXNtR2xvYmFsID0gV2FzbTo6R2xvYmFsOjpjcmVhdGUo dHlwZSwgbXV0YWJpbGl0eSwgaW5pdGlhbFZhbHVlKTsKLSAgICBSRUxFQVNFX0FORF9SRVRVUk4o dGhyb3dTY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKEpTV2ViQXNzZW1ibHlHbG9iYWw6OnRyeUNyZWF0 ZShnbG9iYWxPYmplY3QsIHZtLCB3ZWJBc3NlbWJseUdsb2JhbFN0cnVjdHVyZSwgV1RGTW92ZSh3 YXNtR2xvYmFsKSkpKTsKKyAgICBKU1dlYkFzc2VtYmx5R2xvYmFsKiBqc1dlYkFzc2VtYmx5R2xv YmFsID0gSlNXZWJBc3NlbWJseUdsb2JhbDo6dHJ5Q3JlYXRlKGdsb2JhbE9iamVjdCwgdm0sIHdl YkFzc2VtYmx5R2xvYmFsU3RydWN0dXJlLCBXVEZNb3ZlKHdhc21HbG9iYWwpKTsKKyAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisKKyAgICBpZiAoV2FzbTo6aXNSZWZU eXBlKHR5cGUpKSB7CisgICAgICAgIEFTU0VSVChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVy ZW5jZXMoKSk7CisgICAgICAgIGlmIChhcmd1bWVudC5pc1VuZGVmaW5lZCgpKQorICAgICAgICAg ICAgYXJndW1lbnQgPSBkZWZhdWx0VmFsdWVGb3JSZWZlcmVuY2VUeXBlKHR5cGUpOworICAgICAg ICBqc1dlYkFzc2VtYmx5R2xvYmFsLT5nbG9iYWwoKS0+c2V0KGdsb2JhbE9iamVjdCwgYXJndW1l bnQpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAg fQorICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNXZWJBc3NlbWJseUdsb2JhbCk7CiB9CiAK IEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihjYWxsSlNXZWJBc3NlbWJseUdsb2JhbCwgKEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIENhbGxGcmFtZSopKQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlUYWJsZUNvbnN0cnVjdG9yLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5VGFibGVDb25zdHJ1Y3Rv ci5jcHAKaW5kZXggNGZjYmU1Y2ViZjM0ZGU3Y2U3NTJiNmQyMWE1YWUzZjMyYjkzYzMzMC4uY2I5 Yzg3ZjZjMzFkYjkwNjhjMDU0NTg5ZjBkZWY2NGU0NTg3NTZlZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlUYWJsZUNvbnN0cnVjdG9yLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseVRhYmxlQ29uc3Ry dWN0b3IuY3BwCkBAIC0xMjIsNyArMTIyLDcgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKGNv bnN0cnVjdEpTV2ViQXNzZW1ibHlUYWJsZSwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmoKIAog ICAgIGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSkgewogICAgICAgICBK U1ZhbHVlIGRlZmF1bHRWYWx1ZSA9IGNhbGxGcmFtZS0+YXJndW1lbnRDb3VudCgpIDwgMgotICAg ICAgICAgICAgPyBkZWZhdWx0VmFsdWVGb3JUYWJsZShqc1dlYkFzc2VtYmx5VGFibGUtPnRhYmxl KCktPnR5cGUoKSkKKyAgICAgICAgICAgID8gZGVmYXVsdFZhbHVlRm9yUmVmZXJlbmNlVHlwZShq c1dlYkFzc2VtYmx5VGFibGUtPnRhYmxlKCktPndhc21UeXBlKCkpCiAgICAgICAgICAgICA6IGNh bGxGcmFtZS0+dW5jaGVja2VkQXJndW1lbnQoMSk7CiAgICAgICAgIFdlYkFzc2VtYmx5RnVuY3Rp b24qIHdhc21GdW5jdGlvbiA9IG51bGxwdHI7CiAgICAgICAgIFdlYkFzc2VtYmx5V3JhcHBlckZ1 bmN0aW9uKiB3YXNtV3JhcHBlckZ1bmN0aW9uID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5VGFibGVQcm90b3R5cGUuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlUYWJsZVByb3RvdHlwZS5j cHAKaW5kZXggNmZjMWJlZDgyYjNmMDViZWIzOTIyNzU3MjJmMmYxZWVmNjA3YTBjYS4uMjUxMzA5 MmUzOTZkYmIwMjM0MmI2NDA0N2M3ZjVjZTIxNGM3ZjYxNSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlUYWJsZVByb3RvdHlwZS5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlUYWJsZVByb3RvdHlwZS5j cHAKQEAgLTk0LDcgKzk0LDcgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHdlYkFzc2VtYmx5 VGFibGVQcm90b0Z1bmNHcm93LCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE8KICAgICBKU1ZhbHVl IGRlZmF1bHRWYWx1ZSA9IGpzTnVsbCgpOwogICAgIGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJs eVJlZmVyZW5jZXMoKSkgewogICAgICAgICBpZiAoY2FsbEZyYW1lLT5hcmd1bWVudENvdW50KCkg PCAyKQotICAgICAgICAgICAgZGVmYXVsdFZhbHVlID0gZGVmYXVsdFZhbHVlRm9yVGFibGUodGFi bGUtPnRhYmxlKCktPnR5cGUoKSk7CisgICAgICAgICAgICBkZWZhdWx0VmFsdWUgPSBkZWZhdWx0 VmFsdWVGb3JSZWZlcmVuY2VUeXBlKHRhYmxlLT50YWJsZSgpLT53YXNtVHlwZSgpKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgZGVmYXVsdFZhbHVlID0gY2FsbEZyYW1lLT51bmNoZWNrZWRB cmd1bWVudCgxKTsKICAgICB9CkBAIC0xNDAsNyArMTQwLDcgQEAgSlNDX0RFRklORV9IT1NUX0ZV TkNUSU9OKHdlYkFzc2VtYmx5VGFibGVQcm90b0Z1bmNTZXQsIChKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2IKIAogICAgIEpTVmFsdWUgdmFsdWUgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDEpOwogICAg IGlmIChPcHRpb25zOjp1c2VXZWJBc3NlbWJseVJlZmVyZW5jZXMoKSAmJiBjYWxsRnJhbWUtPmFy Z3VtZW50Q291bnQoKSA8IDIpCi0gICAgICAgIHZhbHVlID0gZGVmYXVsdFZhbHVlRm9yVGFibGUo dGFibGUtPnRhYmxlKCktPnR5cGUoKSk7CisgICAgICAgIHZhbHVlID0gZGVmYXVsdFZhbHVlRm9y UmVmZXJlbmNlVHlwZSh0YWJsZS0+dGFibGUoKS0+d2FzbVR5cGUoKSk7CiAKICAgICBpZiAodGFi bGUtPnRhYmxlKCktPmFzRnVuY3JlZlRhYmxlKCkpIHsKICAgICAgICAgV2ViQXNzZW1ibHlGdW5j dGlvbiogd2FzbUZ1bmN0aW9uID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdl TG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmJjMTFmNzJmMThmMDNiMDk0YzA0MDMwMDEy ODUyOGIxMDA4N2Y0NS4uZGVlZmZiZDNmM2M2ZWVlZWM5N2ZmZTg1OGQwNDg4MTI2NjY2OWFmZSAx MDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAyMS0wMS0yNiAgRG1pdHJ5IEJlemhldHNrb3YgIDxkYmV6aGV0c2tv dkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtKU0NdIFdlYkFzc2VtYmx5Lkdsb2JhbCBzaG91bGQg c3VwcG9ydCBGdW5jcmVmIGFuZCBFeHRlcm5yZWYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyBmb3IgV2ViQXNzZW1ibHkuR2xvYmFsIGN0 b3JzIHdpdGgKKyAgICAgICAgbmV3IHJlZmVyZW5jZSB0eXBlczoKKyAgICAgICAgaHR0cHM6Ly93 ZWJhc3NlbWJseS5naXRodWIuaW8vcmVmZXJlbmNlLXR5cGVzL2pzLWFwaS9pbmRleC5odG1sI2Rv bS1nbG9iYWwtZ2xvYmFsLgorCisgICAgICAgICogd2FzbS9yZWZlcmVuY2VzL2dsb2JhbHMuanM6 IEFkZGVkLgorICAgICAgICAoUGVsbWVuKToKKyAgICAgICAgKHRlc3RHbG9iYWxDb25zdHJ1Y3Rv ckZvckV4dGVybnJlZik6CisgICAgICAgIChhc3luYyB0ZXN0R2xvYmFsQ29uc3RydWN0b3JGb3JG dW5jcmVmKToKKwogMjAyMS0wMS0yNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgogCiAgICAgICAgIFtKU0NdIFVwZGF0ZSB0ZXN0MjYyCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3dh c20vcmVmZXJlbmNlcy9nbG9iYWxzLmpzIGIvSlNUZXN0cy93YXNtL3JlZmVyZW5jZXMvZ2xvYmFs cy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5iNjI0MTVmMmIyNTZlNDFlZDVmYWY5ODQ4MjFiNzQ3YTlmYWFjMDRi Ci0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy93YXNtL3JlZmVyZW5jZXMvZ2xvYmFscy5qcwpA QCAtMCwwICsxLDQ3IEBACisvL0AgcnVuV2ViQXNzZW1ibHlTdWl0ZSgiLS11c2VXZWJBc3NlbWJs eVJlZmVyZW5jZXM9dHJ1ZSIpCitpbXBvcnQgKiBhcyBhc3NlcnQgZnJvbSAnLi4vYXNzZXJ0Lmpz JzsKK2ltcG9ydCB7IGluc3RhbnRpYXRlIH0gZnJvbSAiLi4vd2FidC13cmFwcGVyLmpzIjsKKwor Ly8gdHJpdmlhbAorZnVuY3Rpb24gUGVsbWVuKGNhbG9yaWVzKSB7CisgIHRoaXMuY2Fsb3JpZXMg PSBjYWxvcmllczsKK30KK2NvbnN0IGNhbG9yaWVzID0gMTAwOworCitmdW5jdGlvbiB0ZXN0R2xv YmFsQ29uc3RydWN0b3JGb3JFeHRlcm5yZWYoKSB7CisgIHsKKyAgICAgIGxldCBnbG9iYWwgPSBu ZXcgV2ViQXNzZW1ibHkuR2xvYmFsKHsgdmFsdWU6ICJleHRlcm5yZWYiLCBtdXRhYmxlOiB0cnVl IH0pOworICAgICAgYXNzZXJ0LmVxKGdsb2JhbC52YWx1ZSwgdW5kZWZpbmVkKTsKKworICAgICAg Z2xvYmFsLnZhbHVlID0gbmV3IFBlbG1lbihjYWxvcmllcyk7CisgICAgICBhc3NlcnQuZXEoZ2xv YmFsLnZhbHVlLmNhbG9yaWVzLCBjYWxvcmllcyk7CisgIH0KKworICB7CisgICAgICBsZXQgZ2xv YmFsID0gbmV3IFdlYkFzc2VtYmx5Lkdsb2JhbCh7IHZhbHVlOiAiZXh0ZXJucmVmIiwgbXV0YWJs ZTogdHJ1ZSB9LCBuZXcgUGVsbWVuKGNhbG9yaWVzKSk7CisgICAgICBhc3NlcnQuZXEoZ2xvYmFs LnZhbHVlLmNhbG9yaWVzLCBjYWxvcmllcyk7CisgIH0KK30KKworYXN5bmMgZnVuY3Rpb24gdGVz dEdsb2JhbENvbnN0cnVjdG9yRm9yRnVuY3JlZigpIHsKKyAgY29uc3QgaW5zdGFuY2UgPSBhd2Fp dCBpbnN0YW50aWF0ZShgKG1vZHVsZSAoZnVuYyAoZXhwb3J0ICJmb28iKSkpYCwge30sIHtyZWZl cmVuY2VfdHlwZXM6IHRydWV9KTsKKworICB7CisgICAgICBsZXQgZ2xvYmFsID0gbmV3IFdlYkFz c2VtYmx5Lkdsb2JhbCh7IHZhbHVlOiAiYW55ZnVuYyIsIG11dGFibGU6IHRydWUgfSk7CisgICAg ICBhc3NlcnQuZXEoZ2xvYmFsLnZhbHVlLCBudWxsKTsKKworICAgICAgZ2xvYmFsLnZhbHVlID0g aW5zdGFuY2UuZXhwb3J0cy5mb287CisgICAgICBhc3NlcnQuZXEoZ2xvYmFsLnZhbHVlLCBpbnN0 YW5jZS5leHBvcnRzLmZvbyk7CisgIH0KKworICB7CisgICAgICBsZXQgZ2xvYmFsID0gbmV3IFdl YkFzc2VtYmx5Lkdsb2JhbCh7IHZhbHVlOiAiYW55ZnVuYyIsIG11dGFibGU6IHRydWUgfSwgaW5z dGFuY2UuZXhwb3J0cy5mb28pOworICAgICAgYXNzZXJ0LmVxKGdsb2JhbC52YWx1ZSwgaW5zdGFu Y2UuZXhwb3J0cy5mb28pOworICAgICAgYXNzZXJ0LnRocm93cygoKSA9PiBnbG9iYWwudmFsdWUg PSBuZXcgUGVsbWVuKGNhbG9yaWVzKSwgV2ViQXNzZW1ibHkuUnVudGltZUVycm9yLCAiRnVuY3Jl ZiBtdXN0IGJlIGFuIGV4cG9ydGVkIHdhc20gZnVuY3Rpb24gKGV2YWx1YXRpbmcgJ2dsb2JhbC52 YWx1ZSA9IG5ldyBQZWxtZW4oY2Fsb3JpZXMpJykiKTsKKyAgfQorCisgIGFzc2VydC50aHJvd3Mo KCkgPT4gbmV3IFdlYkFzc2VtYmx5Lkdsb2JhbCh7IHZhbHVlOiAiYW55ZnVuYyIsIG11dGFibGU6 IHRydWUgfSwgbmV3IFBlbG1lbihjYWxvcmllcykpLCBXZWJBc3NlbWJseS5SdW50aW1lRXJyb3Is ICJGdW5jcmVmIG11c3QgYmUgYW4gZXhwb3J0ZWQgd2FzbSBmdW5jdGlvbiAoZXZhbHVhdGluZyAn bmV3IFdlYkFzc2VtYmx5Lkdsb2JhbCh7IHZhbHVlOiBcImFueWZ1bmNcIiwgbXV0YWJsZTogdHJ1 ZSB9LCBuZXcgUGVsbWVuKGNhbG9yaWVzKSknKSIpOworfQorCit0ZXN0R2xvYmFsQ29uc3RydWN0 b3JGb3JFeHRlcm5yZWYoKTsKK2Fzc2VydC5hc3luY1Rlc3QodGVzdEdsb2JhbENvbnN0cnVjdG9y Rm9yRnVuY3JlZigpKTsK