137084 2014-09-24 16:18:26 -0700 Web Replay: code generator shouldn't complain about enums without a storage type if they are in an enclosing scope 2015-01-18 23:02:03 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 burg burg commit-queue joepeck kling oldest_to_newest 1037072 0 burg 2014-09-24 16:18:26 -0700 . 1037073 1 238622 burg 2014-09-24 16:19:15 -0700 Created attachment 238622 WIP 1037256 2 238622 joepeck 2014-09-25 11:40:28 -0700 Comment on attachment 238622 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=238622&action=review > Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.cpp:181 > + if (enumString == "Mouse") > + enumValue = static_cast<WebCore::PlatformEvent::Type>(enumValue | WebCore::PlatformEvent::Mouse); > + if (enumString == "Key") Nit: Should be an else/if chain. 1037584 3 238746 burg 2014-09-26 16:30:04 -0700 Created attachment 238746 Patch 1037585 4 commit-queue 2014-09-26 16:32:45 -0700 This patch modifies the WEB_REPLAY inputs generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-input-generator-tests --reset-results`) 1042241 5 238746 joepeck 2014-10-16 16:53:14 -0700 Comment on attachment 238746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238746&action=review r=me > Source/JavaScriptCore/ChangeLog:11 > + Change the generator to not require an explicit size if an enum is declared inside a struct or class definition. In that case, it must pull in headers since scoped enums can't be Style: wrap line earlier. > Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-encoding-helpers.json-TestReplayInputs.cpp:178 > + for (String enumString : enumStrings) { Nit: Unrelated to your changes, but I wonder if "for (const String& : ...)" would be better. 1042617 6 burg 2014-10-18 11:13:04 -0700 Committed r174863: <http://trac.webkit.org/changeset/174863> 1044963 7 burg 2014-10-29 20:10:14 -0700 *** Bug 136296 has been marked as a duplicate of this bug. *** 238622 2014-09-24 16:19:15 -0700 2014-09-26 16:30:02 -0700 WIP bug-137084-20140924161908.patch text/plain 7013 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcmVwbGF5L3NjcmlwdHMvQ29kZUdlbmVyYXRvclJlcGxheUlucHV0cy5weSBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy9Db2RlR2VuZXJhdG9yUmVwbGF5SW5wdXRz LnB5CmluZGV4IDk2YzRlNTljZWUwZDA1ZWYwMjQ3NGUwMWRjZmQ3NzEyNjVlOGIwYzguLmEyM2Ez NGI1NmJlYWM0YjA2OTY1NjMzNWZjYjdjNzc1MDZkZmEyMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy9Db2RlR2VuZXJhdG9yUmVwbGF5SW5wdXRzLnB5 CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy9Db2RlR2VuZXJhdG9y UmVwbGF5SW5wdXRzLnB5CkBAIC00NjgsOCArNDY4LDggQEAgY2xhc3MgSW5wdXRzTW9kZWw6CiAg ICAgICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShqc29uWyd2YWx1ZXMnXSwgbGlzdCkgb3IgbGVu KF90eXBlLnZhbHVlcykgPT0gMDoKICAgICAgICAgICAgICAgICByYWlzZSBQYXJzZUV4Y2VwdGlv bigiTWFsZm9ybWVkIHNwZWNpZmljYXRpb246IGVudW0gJXMgZG9lcyBub3Qgc3VwcGx5IGEgbGlz dCBvZiB2YWx1ZXMiICUgdHlwZV9uYW1lKQogCi0gICAgICAgICAgICBpZiBfdHlwZS5pc19lbnVt KCkgYW5kICJzdG9yYWdlIiBub3QgaW4ganNvbjoKLSAgICAgICAgICAgICAgICByYWlzZSBQYXJz ZUV4Y2VwdGlvbigiQ291bGQgbm90IHBhcnNlIGVudW0gJXM6IEMtc3R5bGUgZW51bXMgbXVzdCBh bHNvIHNwZWNpZnkgdGhlaXIgc3RvcmFnZSB0eXBlIHNvIHRoZXkgY2FuIGJlIGZvcndhcmQgZGVj bGFyZWQuIiAlIHR5cGVfbmFtZSkKKyAgICAgICAgICAgIGlmIF90eXBlLmlzX2VudW0oKSBhbmQg ZW5jbG9zaW5nX2NsYXNzIGlzIE5vbmUgYW5kIHR5cGVfc3RvcmFnZSBpcyBOb25lOgorICAgICAg ICAgICAgICAgIHJhaXNlIFBhcnNlRXhjZXB0aW9uKCJDb3VsZCBub3QgcGFyc2UgZW51bSAlczog Qy1zdHlsZSBlbnVtcyBub3QgZW5jbG9zZWQgYnkgYSBjbGFzcyBtdXN0IHNwZWNpZnkgdGhlaXIg c3RvcmFnZSB0eXBlIHNvIHRoZXkgY2FuIGJlIGZvcndhcmQgZGVjbGFyZWQuIiAlIHR5cGVfbmFt ZSkKIAogICAgICAgICBzZWxmLnR5cGVzLmFwcGVuZChfdHlwZSkKIApkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2ZhaWwtb24t Yy1zdHlsZS1lbnVtLW5vLXN0b3JhZ2UuanNvbi1lcnJvciBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9mYWlsLW9uLWMtc3R5bGUtZW51bS1uby1z dG9yYWdlLmpzb24tZXJyb3IKaW5kZXggMmU4YmVlNjdjZmUxOGY4YzljNWJjYWJmNDE0NjU3NmVk ZmE4MjA1Ny4uMzgyZmIwNDA3ZTkyY2ZiY2JkZTAyMTM5NDE0YTM5ZjAxNjAwNDVjNiAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVk L2ZhaWwtb24tYy1zdHlsZS1lbnVtLW5vLXN0b3JhZ2UuanNvbi1lcnJvcgorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZmFpbC1vbi1jLXN0 eWxlLWVudW0tbm8tc3RvcmFnZS5qc29uLWVycm9yCkBAIC0xICsxIEBACi1FUlJPUjogQ291bGQg bm90IHBhcnNlIGVudW0gTW91c2VCdXR0b246IEMtc3R5bGUgZW51bXMgbXVzdCBhbHNvIHNwZWNp ZnkgdGhlaXIgc3RvcmFnZSB0eXBlIHNvIHRoZXkgY2FuIGJlIGZvcndhcmQgZGVjbGFyZWQuCitF UlJPUjogQ291bGQgbm90IHBhcnNlIGVudW0gTW91c2VCdXR0b246IEMtc3R5bGUgZW51bXMgbm90 IGVuY2xvc2VkIGJ5IGEgY2xhc3MgbXVzdCBzcGVjaWZ5IHRoZWlyIHN0b3JhZ2UgdHlwZSBzbyB0 aGV5IGNhbiBiZSBmb3J3YXJkIGRlY2xhcmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dlbmVyYXRlLWVudW0tZW5jb2Rp bmctaGVscGVycy5qc29uLVRlc3RSZXBsYXlJbnB1dHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dlbmVyYXRlLWVudW0tZW5jb2Rpbmct aGVscGVycy5qc29uLVRlc3RSZXBsYXlJbnB1dHMuY3BwCmluZGV4IDZiNWYxM2ExZTI2NDkxMWVj YjRlZjZjOTBmYmJkY2Q3YmY5ODQ2ZTAuLjllOTUyNmE5NzY5ZTc2NjkyNmU0N2Q2MTQ2NTI4N2Fi N2I3ZWJhNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0 cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbi1UZXN0 UmVwbGF5SW5wdXRzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3Njcmlw dHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxwZXJzLmpzb24tVGVz dFJlcGxheUlucHV0cy5jcHAKQEAgLTE0Miw2ICsxNDIsNTIgQEAgYm9vbCBFbmNvZGluZ1RyYWl0 czxXZWJDb3JlOjpNb3VzZUJ1dHRvbj46OmRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYgZW5jb2Rl ZFZhbHUKIAogICAgIHJldHVybiB0cnVlOwogfQorCitFbmNvZGVkVmFsdWUgRW5jb2RpbmdUcmFp dHM8V2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6VHlwZT46OmVuY29kZVZhbHVlKGNvbnN0IFdlYkNv cmU6OlBsYXRmb3JtRXZlbnQ6OlR5cGUmIGVudW1WYWx1ZSkKK3sKKyAgICBFbmNvZGVkVmFsdWUg ZW5jb2RlZFZhbHVlID0gRW5jb2RlZFZhbHVlOjpjcmVhdGVBcnJheSgpOworICAgIGlmIChlbnVt VmFsdWUgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpNb3VzZSkgeworICAgICAgICBlbmNvZGVk VmFsdWUuYXBwZW5kPFN0cmluZz4oQVNDSUlMaXRlcmFsKCJNb3VzZSIpKTsKKyAgICAgICAgaWYg KGVudW1WYWx1ZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpNb3VzZSkKKyAgICAgICAgICAg IHJldHVybiBlbmNvZGVkVmFsdWU7CisgICAgfQorICAgIGlmIChlbnVtVmFsdWUgJiBXZWJDb3Jl OjpQbGF0Zm9ybUV2ZW50OjpLZXkpIHsKKyAgICAgICAgZW5jb2RlZFZhbHVlLmFwcGVuZDxTdHJp bmc+KEFTQ0lJTGl0ZXJhbCgiS2V5IikpOworICAgICAgICBpZiAoZW51bVZhbHVlID09IFdlYkNv cmU6OlBsYXRmb3JtRXZlbnQ6OktleSkKKyAgICAgICAgICAgIHJldHVybiBlbmNvZGVkVmFsdWU7 CisgICAgfQorICAgIGlmIChlbnVtVmFsdWUgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpUb3Vj aCkgeworICAgICAgICBlbmNvZGVkVmFsdWUuYXBwZW5kPFN0cmluZz4oQVNDSUlMaXRlcmFsKCJU b3VjaCIpKTsKKyAgICAgICAgaWYgKGVudW1WYWx1ZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpUb3VjaCkKKyAgICAgICAgICAgIHJldHVybiBlbmNvZGVkVmFsdWU7CisgICAgfQorICAgIGlm IChlbnVtVmFsdWUgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpXaGVlbCkgeworICAgICAgICBl bmNvZGVkVmFsdWUuYXBwZW5kPFN0cmluZz4oQVNDSUlMaXRlcmFsKCJXaGVlbCIpKTsKKyAgICAg ICAgaWYgKGVudW1WYWx1ZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpXaGVlbCkKKyAgICAg ICAgICAgIHJldHVybiBlbmNvZGVkVmFsdWU7CisgICAgfQorICAgIHJldHVybiBlbmNvZGVkVmFs dWU7Cit9CisKK2Jvb2wgRW5jb2RpbmdUcmFpdHM8V2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6VHlw ZT46OmRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYgZW5jb2RlZFZhbHVlLCBXZWJDb3JlOjpQbGF0 Zm9ybUV2ZW50OjpUeXBlJiBlbnVtVmFsdWUpCit7CisgICAgVmVjdG9yPFN0cmluZz4gZW51bVN0 cmluZ3M7CisgICAgaWYgKCFFbmNvZGluZ1RyYWl0czxWZWN0b3I8U3RyaW5nPj46OmRlY29kZVZh bHVlKGVuY29kZWRWYWx1ZSwgZW51bVN0cmluZ3MpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICBmb3IgKFN0cmluZyBlbnVtU3RyaW5nIDogZW51bVN0cmluZ3MpIHsKKyAgICAgICAgaWYg KGVudW1TdHJpbmcgPT0gIk1vdXNlIikKKyAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRpY19j YXN0PFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OlR5cGU+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OlBs YXRmb3JtRXZlbnQ6Ok1vdXNlKTsKKyAgICAgICAgaWYgKGVudW1TdHJpbmcgPT0gIktleSIpCisg ICAgICAgICAgICBlbnVtVmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpUeXBlPihlbnVtVmFsdWUgfCBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpLZXkpOworICAgICAg ICBpZiAoZW51bVN0cmluZyA9PSAiVG91Y2giKQorICAgICAgICAgICAgZW51bVZhbHVlID0gc3Rh dGljX2Nhc3Q8V2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6VHlwZT4oZW51bVZhbHVlIHwgV2ViQ29y ZTo6UGxhdGZvcm1FdmVudDo6VG91Y2gpOworICAgICAgICBpZiAoZW51bVN0cmluZyA9PSAiV2hl ZWwiKQorICAgICAgICAgICAgZW51bVZhbHVlID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6UGxhdGZv cm1FdmVudDo6VHlwZT4oZW51bVZhbHVlIHwgV2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6V2hlZWwp OworICAgIH0KKworICAgIHJldHVybiB0cnVlOworfQogfSAvLyBuYW1lc3BhY2UgSlNDCiAKICNl bmRpZiAvLyBFTkFCTEUoV0VCX1JFUExBWSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1lbnVtLWVuY29kaW5n LWhlbHBlcnMuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cmVwbGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxw ZXJzLmpzb24tVGVzdFJlcGxheUlucHV0cy5oCmluZGV4IGRkODdkZDI4NzZhMjc5MzdmYWEwODlm Zjc3MjRhN2ZiMTc3NDMyMjcuLjhjZDRlYWE2Y2U2Njc3ZWM0MzdmZmIzZWEwMDQ0ZGVkMTM1YjA4 N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0 cy9leHBlY3RlZC9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbi1UZXN0UmVwbGF5 SW5wdXRzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3Rz L2V4cGVjdGVkL2dlbmVyYXRlLWVudW0tZW5jb2RpbmctaGVscGVycy5qc29uLVRlc3RSZXBsYXlJ bnB1dHMuaApAQCAtMzMsNiArMzMsNyBAQAogI2lmIEVOQUJMRShXRUJfUkVQTEFZKQogI2luY2x1 ZGUgIkludGVybmFsTmFtZXNwYWNlSGVhZGVySW5jbHVkZUR1bW15LmgiCiAjaW5jbHVkZSA8cGxh dGZvcm0vRXh0ZXJuYWxOYW1lc3BhY2VIZWFkZXJJbmNsdWRlRHVtbXkuaD4KKyNpbmNsdWRlIDxw bGF0Zm9ybS9QbGF0Zm9ybUV2ZW50Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGVudW0gTW91 c2VCdXR0b24gOiB1bnNpZ25lZDsKQEAgLTY4LDYgKzY5LDEzIEBAIHRlbXBsYXRlPD4gc3RydWN0 IEVuY29kaW5nVHJhaXRzPFdlYkNvcmU6Ok1vdXNlQnV0dG9uPiB7CiAgICAgc3RhdGljIEVuY29k ZWRWYWx1ZSBlbmNvZGVWYWx1ZShjb25zdCBXZWJDb3JlOjpNb3VzZUJ1dHRvbiYgdmFsdWUpOwog ICAgIHN0YXRpYyBib29sIGRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYsIFdlYkNvcmU6Ok1vdXNl QnV0dG9uJiB2YWx1ZSk7CiB9OworCit0ZW1wbGF0ZTw+IHN0cnVjdCBFbmNvZGluZ1RyYWl0czxX ZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpUeXBlPiB7CisgICAgdHlwZWRlZiBXZWJDb3JlOjpQbGF0 Zm9ybUV2ZW50OjpUeXBlIERlY29kZWRUeXBlOworCisgICAgc3RhdGljIEVuY29kZWRWYWx1ZSBl bmNvZGVWYWx1ZShjb25zdCBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpUeXBlJiB2YWx1ZSk7Cisg ICAgc3RhdGljIGJvb2wgZGVjb2RlVmFsdWUoRW5jb2RlZFZhbHVlJiwgV2ViQ29yZTo6UGxhdGZv cm1FdmVudDo6VHlwZSYgdmFsdWUpOworfTsKIH0gLy8gbmFtZXNwYWNlIEpTQwogCiBuYW1lc3Bh Y2UgVGVzdCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3Njcmlw dHMvdGVzdHMvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxwZXJzLmpzb24gYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1o ZWxwZXJzLmpzb24KaW5kZXggNjVkNzFhMzE3ZjhmZDNkNDExNWZhNDZkZjIyMzZiZWQ4NjE2ZWZj OC4uOGRmMTc3MjAxNDFiMzNlYmQ4ODhjZTEwMDE2ODZkOTdmNTE5MDIxOCAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2dlbmVyYXRlLWVudW0t ZW5jb2RpbmctaGVscGVycy5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkv c2NyaXB0cy90ZXN0cy9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbgpAQCAtMTQs NiArMTQsMTMgQEAKICAgICAgICAgICAgICAgICAiZmxhZ3MiOiBbIkVOVU0iXSwKICAgICAgICAg ICAgICAgICAidmFsdWVzIjogWyJOb0J1dHRvbiIsICJMZWZ0QnV0dG9uIiwgIk1pZGRsZUJ1dHRv biIsICJSaWdodEJ1dHRvbiJdLAogICAgICAgICAgICAgICAgICJoZWFkZXIiOiAicGxhdGZvcm0v UGxhdGZvcm1Nb3VzZUV2ZW50LmgiCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICJuYW1lIjogIlR5cGUiLCAibW9kZSI6ICJTQ0FMQVIiLAorICAgICAgICAg ICAgICAgICJmbGFncyI6IFsiRU5VTSJdLAorICAgICAgICAgICAgICAgICJlbmNsb3NpbmdfY2xh c3MiOiAiUGxhdGZvcm1FdmVudCIsCisgICAgICAgICAgICAgICAgInZhbHVlcyI6IFsiTW91c2Ui LCAiS2V5IiwgIlRvdWNoIiwgIldoZWVsIl0sCisgICAgICAgICAgICAgICAgImhlYWRlciI6ICJw bGF0Zm9ybS9QbGF0Zm9ybUV2ZW50LmgiCiAgICAgICAgICAgICB9CiAgICAgICAgIF0KICAgICB9 LAo= 238746 2014-09-26 16:30:04 -0700 2014-10-16 16:53:14 -0700 Patch bug-137084-20140926162950.patch text/plain 15628 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl MjBjNWQzZjI5Mjc2ZWY2MTdlOGE2ZjdjY2QzYWUwMzI2MjhhYjVmLi41Mjk0YmU2NmQwNGNkYWFi YWVlNzdlOWFjYzQ2NzdjNDkwZTU1OTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAxNC0wOS0yNiAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIFJlcGxheTogY29kZSBnZW5lcmF0b3Igc2hvdWxkbid0IGNv bXBsYWluIGFib3V0IGVudW1zIHdpdGhvdXQgYSBzdG9yYWdlIHR5cGUgaWYgdGhleSBhcmUgaW4g YW4gZW5jbG9zaW5nIHNjb3BlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzcwODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiBvcmRlciB0byBnZW5lcmF0ZSBlbmNvZGUvZGVjb2RlIG1ldGhvZCBkZWNs YXJhdGlvbnMgd2l0aG91dCBwdWxsaW5nIGluIGxvdHMgb2YgaGVhZGVycywKKyAgICAgICAgdGhl IGdlbmVyYXRvciBtdXN0IGZvcndhcmQgZGVjbGFyZSBlbnVtcyAoZm9yIGVudW0gY2xhc3NlcyBv ciBlbnVtcyB3aXRoIGV4cGxpY2l0IHNpemVzKS4KKworICAgICAgICBDaGFuZ2UgdGhlIGdlbmVy YXRvciB0byBub3QgcmVxdWlyZSBhbiBleHBsaWNpdCBzaXplIGlmIGFuIGVudW0gaXMgZGVjbGFy ZWQgaW5zaWRlIGEgc3RydWN0IG9yIGNsYXNzIGRlZmluaXRpb24uIEluIHRoYXQgY2FzZSwgaXQg bXVzdCBwdWxsIGluIGhlYWRlcnMgc2luY2Ugc2NvcGVkIGVudW1zIGNhbid0IGJlCisgICAgICAg IGZvcndhcmQgZGVjbGFyZWQuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIGZpeGVzIHNvbWUg Y2hhaW5lZCBpZi1zdGF0ZW1lbnRzIHRoYXQgc2hvdWxkIGJlIGlmLWVsc2Ugc3RhdGVtZW50cy4K KworICAgICAgICBUZXN0OiB1cGRhdGVkIHJlcGxheS9zY3JpcHRzL3Rlc3RzL2dlbmVyYXRlLWVu dW0tZW5jb2RpbmctaGVscGVycy5qc29uIHRvIGNvdmVyIHRoZSBuZXcgY2FzZS4KKworICAgICAg ICAqIHJlcGxheS9zY3JpcHRzL0NvZGVHZW5lcmF0b3JSZXBsYXlJbnB1dHMucHk6CisgICAgICAg IChJbnB1dHNNb2RlbC5wYXJzZV90eXBlX3dpdGhfZnJhbWV3b3JrX25hbWUuaXMpOgorICAgICAg ICAoSW5wdXRzTW9kZWwucGFyc2VfdHlwZV93aXRoX2ZyYW1ld29ya19uYW1lLmlzLm11c3QpOgor ICAgICAgICAoR2VuZXJhdG9yLmdlbmVyYXRlX2VudW1fdHJhaXRfaW1wbGVtZW50YXRpb24pOgor ICAgICAgICAoSW5wdXRzTW9kZWwucGFyc2VfdHlwZV93aXRoX2ZyYW1ld29ya19uYW1lKTogRGVs ZXRlZC4KKyAgICAgICAgKiByZXBsYXkvc2NyaXB0cy9Db2RlR2VuZXJhdG9yUmVwbGF5SW5wdXRz VGVtcGxhdGVzLnB5OgorICAgICAgICAqIHJlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2Zh aWwtb24tYy1zdHlsZS1lbnVtLW5vLXN0b3JhZ2UuanNvbi1lcnJvcjoKKyAgICAgICAgKiByZXBs YXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMt d2l0aC1ndWFyZGVkLXZhbHVlcy5qc29uLVRlc3RSZXBsYXlJbnB1dHMuY3BwOgorICAgICAgICAo SlNDOjpFbmNvZGluZ1RyYWl0czxXZWJDb3JlOjpNb3VzZUJ1dHRvbj46OmRlY29kZVZhbHVlKToK KyAgICAgICAgKiByZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1lbnVtLWVu Y29kaW5nLWhlbHBlcnMuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmNwcDoKKyAgICAgICAgKEpTQzo6 RW5jb2RpbmdUcmFpdHM8V2ViQ29yZTo6TW91c2VCdXR0b24+OjpkZWNvZGVWYWx1ZSk6CisgICAg ICAgIChKU0M6OkVuY29kaW5nVHJhaXRzPFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OlR5cGU+Ojpl bmNvZGVWYWx1ZSk6CisgICAgICAgIChKU0M6OkVuY29kaW5nVHJhaXRzPFdlYkNvcmU6OlBsYXRm b3JtRXZlbnQ6OlR5cGU+OjpkZWNvZGVWYWx1ZSk6CisgICAgICAgICogcmVwbGF5L3NjcmlwdHMv dGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxwZXJzLmpzb24tVGVzdFJl cGxheUlucHV0cy5oOgorICAgICAgICAqIHJlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dl bmVyYXRlLWVudW1zLXdpdGgtc2FtZS1iYXNlLW5hbWUuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmNw cDoKKyAgICAgICAgKEpTQzo6RW5jb2RpbmdUcmFpdHM8V2ViQ29yZTo6Rm9ybURhdGExOjpUeXBl Pjo6ZGVjb2RlVmFsdWUpOgorICAgICAgICAoSlNDOjpFbmNvZGluZ1RyYWl0czxQbGF0Zm9ybUV2 ZW50MTo6VHlwZT46OmRlY29kZVZhbHVlKToKKyAgICAgICAgKiByZXBsYXkvc2NyaXB0cy90ZXN0 cy9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbjogQWRkZWQgYSBuZXcgaW5wdXQg dG8gY292ZXIgdGhpcyBjYXNlLgorCiAyMDE0LTA5LTI2ICBQZXRlciBWYXJnYSAgPHB2YXJnYUB3 ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCB0eXBvIGluIFlBUlIgYXQgQk9MIGNoZWNrCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvQ29kZUdlbmVyYXRv clJlcGxheUlucHV0cy5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy9D b2RlR2VuZXJhdG9yUmVwbGF5SW5wdXRzLnB5CmluZGV4IDZmZWIzMjNlMmE5YWI0OTQyMmVmZDZi MTRjMDJkOWM5YmU0OWE2OTAuLjBkZGU5MWMyNjY4MTZjNGVmZjE2NjVjYzEyOTg4OTYzMjE4N2Ux MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy9Db2Rl R2VuZXJhdG9yUmVwbGF5SW5wdXRzLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBs YXkvc2NyaXB0cy9Db2RlR2VuZXJhdG9yUmVwbGF5SW5wdXRzLnB5CkBAIC00NjMsOCArNDYzLDgg QEAgY2xhc3MgSW5wdXRzTW9kZWw6CiAgICAgICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShqc29u Wyd2YWx1ZXMnXSwgbGlzdCkgb3IgbGVuKF90eXBlLnZhbHVlcykgPT0gMDoKICAgICAgICAgICAg ICAgICByYWlzZSBQYXJzZUV4Y2VwdGlvbigiTWFsZm9ybWVkIHNwZWNpZmljYXRpb246IGVudW0g JXMgZG9lcyBub3Qgc3VwcGx5IGEgbGlzdCBvZiB2YWx1ZXMiICUgdHlwZV9uYW1lKQogCi0gICAg ICAgICAgICBpZiBfdHlwZS5pc19lbnVtKCkgYW5kICJzdG9yYWdlIiBub3QgaW4ganNvbjoKLSAg ICAgICAgICAgICAgICByYWlzZSBQYXJzZUV4Y2VwdGlvbigiQ291bGQgbm90IHBhcnNlIGVudW0g JXM6IEMtc3R5bGUgZW51bXMgbXVzdCBhbHNvIHNwZWNpZnkgdGhlaXIgc3RvcmFnZSB0eXBlIHNv IHRoZXkgY2FuIGJlIGZvcndhcmQgZGVjbGFyZWQuIiAlIHR5cGVfbmFtZSkKKyAgICAgICAgICAg IGlmIF90eXBlLmlzX2VudW0oKSBhbmQgZW5jbG9zaW5nX2NsYXNzIGlzIE5vbmUgYW5kIHR5cGVf c3RvcmFnZSBpcyBOb25lOgorICAgICAgICAgICAgICAgIHJhaXNlIFBhcnNlRXhjZXB0aW9uKCJD b3VsZCBub3QgcGFyc2UgZW51bSAlczogQy1zdHlsZSBlbnVtcyBub3QgZW5jbG9zZWQgYnkgYSBj bGFzcyBtdXN0IHNwZWNpZnkgdGhlaXIgc3RvcmFnZSB0eXBlIHNvIHRoZXkgY2FuIGJlIGZvcndh cmQgZGVjbGFyZWQuIiAlIHR5cGVfbmFtZSkKIAogICAgICAgICBzZWxmLnR5cGVzLmFwcGVuZChf dHlwZSkKIApAQCAtODQ0LDggKzg0NCwxMCBAQCBjbGFzcyBHZW5lcmF0b3I6CiAKICAgICAgICAg IyBHZW5lcmF0ZSBib2R5IGZvciBkZWNvZGUuCiAgICAgICAgIGRlY29kZUxpbmVzID0gW10KLSAg ICAgICAgZm9yIF92YWx1ZSBpbiBfdHlwZS52YWx1ZXM6CisgICAgICAgIGZvciBpLCBfdmFsdWUg aW4gZW51bWVyYXRlKF90eXBlLnZhbHVlcyk6CisKICAgICAgICAgICAgIHRlbXBsYXRlX2FyZ3Vt ZW50cyA9IHsKKyAgICAgICAgICAgICAgICAnYnJhbmNoS2V5d29yZCc6ICJlbHNlIGlmIiBpZiBp ID4gMCBlbHNlICJpZiIsCiAgICAgICAgICAgICAgICAgJ2VudW1TdHJpbmdWYWx1ZSc6IF92YWx1 ZSwKICAgICAgICAgICAgICAgICAncXVhbGlmaWVkRW51bVZhbHVlJzogIiVzJXMiICUgKGVudW1f cHJlZml4LCBfdmFsdWUpLAogICAgICAgICAgICAgICAgICdxdWFsaWZpZWRFbnVtTmFtZSc6IF90 eXBlLnR5cGVfbmFtZShxdWFsaWZpZWQ9c2hvdWxkX3F1YWxpZnlfdHlwZSkKQEAgLTg1NCw4ICs4 NTYsOSBAQCBjbGFzcyBHZW5lcmF0b3I6CiAKICAgICAgICAgZm9yIGd1YXJkLCBndWFyZF92YWx1 ZXMgaW4gX3R5cGUuZ3VhcmRfdmFsdWVzX21hcC5pdGVyaXRlbXMoKToKICAgICAgICAgICAgIGd1 YXJkZWRMaW5lcyA9IFtdCi0gICAgICAgICAgICBmb3IgZ3VhcmRfdmFsdWUgaW4gZ3VhcmRfdmFs dWVzOgorICAgICAgICAgICAgZm9yIGksIGd1YXJkX3ZhbHVlIGluIGVudW1lcmF0ZShndWFyZF92 YWx1ZXMpOgogICAgICAgICAgICAgICAgIHRlbXBsYXRlX2FyZ3VtZW50cyA9IHsKKyAgICAgICAg ICAgICAgICAgICAgJ2JyYW5jaEtleXdvcmQnOiAiZWxzZSBpZiIgaWYgaSA+IDAgZWxzZSAiaWYi LAogICAgICAgICAgICAgICAgICAgICAnZW51bVN0cmluZ1ZhbHVlJzogZ3VhcmRfdmFsdWUsCiAg ICAgICAgICAgICAgICAgICAgICdxdWFsaWZpZWRFbnVtVmFsdWUnOiAiJXMlcyIgJSAoZW51bV9w cmVmaXgsIGd1YXJkX3ZhbHVlKSwKICAgICAgICAgICAgICAgICAgICAgJ3F1YWxpZmllZEVudW1O YW1lJzogX3R5cGUudHlwZV9uYW1lKHF1YWxpZmllZD1zaG91bGRfcXVhbGlmeV90eXBlKQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JSZXBsYXlJbnB1dHNUZW1wbGF0ZXMucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5 L3NjcmlwdHMvQ29kZUdlbmVyYXRvclJlcGxheUlucHV0c1RlbXBsYXRlcy5weQppbmRleCAxMDk1 ZGZkODFmYTEwMmY5M2MyN2ZiZmQzZjBiODFjMGI1Yjg5MTVhLi42YTdhMTU2MDg4MzA0MDZlMDFk MzEzZWE0NjNlMDgyN2VmZjFiYjUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cmVwbGF5L3NjcmlwdHMvQ29kZUdlbmVyYXRvclJlcGxheUlucHV0c1RlbXBsYXRlcy5weQorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvQ29kZUdlbmVyYXRvclJlcGxh eUlucHV0c1RlbXBsYXRlcy5weQpAQCAtMjIzLDcgKzIyMyw3IEBAICR7ZGVjb2RlQ2FzZXN9CiAg ICAgfSIiIikKIAogICAgIEVudW1EZWNvZGVDYXNlID0gKAotICAgICIiIiAgICAgICAgaWYgKGVu dW1TdHJpbmcgPT0gIiR7ZW51bVN0cmluZ1ZhbHVlfSIpCisgICAgIiIiICAgICAgICAke2JyYW5j aEtleXdvcmR9IChlbnVtU3RyaW5nID09ICIke2VudW1TdHJpbmdWYWx1ZX0iKQogICAgICAgICAg ICAgZW51bVZhbHVlID0gc3RhdGljX2Nhc3Q8JHtxdWFsaWZpZWRFbnVtTmFtZX0+KGVudW1WYWx1 ZSB8ICR7cXVhbGlmaWVkRW51bVZhbHVlfSk7IiIiKQogCiAgICAgSW5wdXRUeXBlRnJvbVN0YXRp Y0xvY2FsID0gKApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3Jp cHRzL3Rlc3RzL2V4cGVjdGVkL2ZhaWwtb24tYy1zdHlsZS1lbnVtLW5vLXN0b3JhZ2UuanNvbi1l cnJvciBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3Rl ZC9mYWlsLW9uLWMtc3R5bGUtZW51bS1uby1zdG9yYWdlLmpzb24tZXJyb3IKaW5kZXggMmU4YmVl NjdjZmUxOGY4YzljNWJjYWJmNDE0NjU3NmVkZmE4MjA1Ny4uMzgyZmIwNDA3ZTkyY2ZiY2JkZTAy MTM5NDE0YTM5ZjAxNjAwNDVjNiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Jl cGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2ZhaWwtb24tYy1zdHlsZS1lbnVtLW5vLXN0b3Jh Z2UuanNvbi1lcnJvcgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMv dGVzdHMvZXhwZWN0ZWQvZmFpbC1vbi1jLXN0eWxlLWVudW0tbm8tc3RvcmFnZS5qc29uLWVycm9y CkBAIC0xICsxIEBACi1FUlJPUjogQ291bGQgbm90IHBhcnNlIGVudW0gTW91c2VCdXR0b246IEMt c3R5bGUgZW51bXMgbXVzdCBhbHNvIHNwZWNpZnkgdGhlaXIgc3RvcmFnZSB0eXBlIHNvIHRoZXkg Y2FuIGJlIGZvcndhcmQgZGVjbGFyZWQuCitFUlJPUjogQ291bGQgbm90IHBhcnNlIGVudW0gTW91 c2VCdXR0b246IEMtc3R5bGUgZW51bXMgbm90IGVuY2xvc2VkIGJ5IGEgY2xhc3MgbXVzdCBzcGVj aWZ5IHRoZWlyIHN0b3JhZ2UgdHlwZSBzbyB0aGV5IGNhbiBiZSBmb3J3YXJkIGRlY2xhcmVkLgpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4 cGVjdGVkL2dlbmVyYXRlLWVudW0tZW5jb2RpbmctaGVscGVycy13aXRoLWd1YXJkZWQtdmFsdWVz Lmpzb24tVGVzdFJlcGxheUlucHV0cy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5 L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxwZXJzLXdp dGgtZ3VhcmRlZC12YWx1ZXMuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmNwcAppbmRleCA0OGYxM2Zl NTE0MzdjZDUwYjI2NDQzYmUxMjE5MzNhZWUzY2M4NmFhLi5kNTA3MTc3NWY0YTA2N2MzMGIyMjEz MDMyMGQ3NzU0MzA1MDY4OTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVw bGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxwZXJz LXdpdGgtZ3VhcmRlZC12YWx1ZXMuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUt ZW51bS1lbmNvZGluZy1oZWxwZXJzLXdpdGgtZ3VhcmRlZC12YWx1ZXMuanNvbi1UZXN0UmVwbGF5 SW5wdXRzLmNwcApAQCAtMTIyLDE2ICsxMjIsMTYgQEAgYm9vbCBFbmNvZGluZ1RyYWl0czxXZWJD b3JlOjpNb3VzZUJ1dHRvbj46OmRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYgZW5jb2RlZFZhbHUK ICAgICBmb3IgKFN0cmluZyBlbnVtU3RyaW5nIDogZW51bVN0cmluZ3MpIHsKICAgICAgICAgaWYg KGVudW1TdHJpbmcgPT0gIk5vQnV0dG9uIikKICAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRp Y19jYXN0PFdlYkNvcmU6Ok1vdXNlQnV0dG9uPihlbnVtVmFsdWUgfCBXZWJDb3JlOjpOb0J1dHRv bik7Ci0gICAgICAgIGlmIChlbnVtU3RyaW5nID09ICJMZWZ0QnV0dG9uIikKKyAgICAgICAgZWxz ZSBpZiAoZW51bVN0cmluZyA9PSAiTGVmdEJ1dHRvbiIpCiAgICAgICAgICAgICBlbnVtVmFsdWUg PSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpNb3VzZUJ1dHRvbj4oZW51bVZhbHVlIHwgV2ViQ29yZTo6 TGVmdEJ1dHRvbik7Ci0gICAgICAgIGlmIChlbnVtU3RyaW5nID09ICJNaWRkbGVCdXR0b24iKQor ICAgICAgICBlbHNlIGlmIChlbnVtU3RyaW5nID09ICJNaWRkbGVCdXR0b24iKQogICAgICAgICAg ICAgZW51bVZhbHVlID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6TW91c2VCdXR0b24+KGVudW1WYWx1 ZSB8IFdlYkNvcmU6Ok1pZGRsZUJ1dHRvbik7Ci0gICAgICAgIGlmIChlbnVtU3RyaW5nID09ICJS aWdodEJ1dHRvbiIpCisgICAgICAgIGVsc2UgaWYgKGVudW1TdHJpbmcgPT0gIlJpZ2h0QnV0dG9u IikKICAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRpY19jYXN0PFdlYkNvcmU6Ok1vdXNlQnV0 dG9uPihlbnVtVmFsdWUgfCBXZWJDb3JlOjpSaWdodEJ1dHRvbik7CiAjaWYgRU5BQkxFKFNJREVf QlVUVE9OUykKICAgICAgICAgaWYgKGVudW1TdHJpbmcgPT0gIkxlZnRTaWRlQnV0dG9uIikKICAg ICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRpY19jYXN0PFdlYkNvcmU6Ok1vdXNlQnV0dG9uPihl bnVtVmFsdWUgfCBXZWJDb3JlOjpMZWZ0U2lkZUJ1dHRvbik7Ci0gICAgICAgIGlmIChlbnVtU3Ry aW5nID09ICJSaWdodFNpZGVCdXR0b24iKQorICAgICAgICBlbHNlIGlmIChlbnVtU3RyaW5nID09 ICJSaWdodFNpZGVCdXR0b24iKQogICAgICAgICAgICAgZW51bVZhbHVlID0gc3RhdGljX2Nhc3Q8 V2ViQ29yZTo6TW91c2VCdXR0b24+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OlJpZ2h0U2lkZUJ1dHRv bik7CiAjZW5kaWYgLy8gRU5BQkxFKFNJREVfQlVUVE9OUykKICNpZiBQTEFURk9STShXSU5ET1dT KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3Rz L2V4cGVjdGVkL2dlbmVyYXRlLWVudW0tZW5jb2RpbmctaGVscGVycy5qc29uLVRlc3RSZXBsYXlJ bnB1dHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4 cGVjdGVkL2dlbmVyYXRlLWVudW0tZW5jb2RpbmctaGVscGVycy5qc29uLVRlc3RSZXBsYXlJbnB1 dHMuY3BwCmluZGV4IDY0MDY5OTRhMTM4ZmUzMzE2ZDI2MjA5ZDkwNjNiMmU2NzQwOTQ3N2IuLjRl ZDZkYzc3MDNjZjM5OGVhN2QyZWQ2NThiZmY3MzYwMTJmNjA4MWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1l bnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUt ZW51bS1lbmNvZGluZy1oZWxwZXJzLmpzb24tVGVzdFJlcGxheUlucHV0cy5jcHAKQEAgLTEzMiwx NiArMTMyLDYyIEBAIGJvb2wgRW5jb2RpbmdUcmFpdHM8V2ViQ29yZTo6TW91c2VCdXR0b24+Ojpk ZWNvZGVWYWx1ZShFbmNvZGVkVmFsdWUmIGVuY29kZWRWYWx1CiAgICAgZm9yIChTdHJpbmcgZW51 bVN0cmluZyA6IGVudW1TdHJpbmdzKSB7CiAgICAgICAgIGlmIChlbnVtU3RyaW5nID09ICJOb0J1 dHRvbiIpCiAgICAgICAgICAgICBlbnVtVmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpNb3Vz ZUJ1dHRvbj4oZW51bVZhbHVlIHwgV2ViQ29yZTo6Tm9CdXR0b24pOwotICAgICAgICBpZiAoZW51 bVN0cmluZyA9PSAiTGVmdEJ1dHRvbiIpCisgICAgICAgIGVsc2UgaWYgKGVudW1TdHJpbmcgPT0g IkxlZnRCdXR0b24iKQogICAgICAgICAgICAgZW51bVZhbHVlID0gc3RhdGljX2Nhc3Q8V2ViQ29y ZTo6TW91c2VCdXR0b24+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OkxlZnRCdXR0b24pOwotICAgICAg ICBpZiAoZW51bVN0cmluZyA9PSAiTWlkZGxlQnV0dG9uIikKKyAgICAgICAgZWxzZSBpZiAoZW51 bVN0cmluZyA9PSAiTWlkZGxlQnV0dG9uIikKICAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRp Y19jYXN0PFdlYkNvcmU6Ok1vdXNlQnV0dG9uPihlbnVtVmFsdWUgfCBXZWJDb3JlOjpNaWRkbGVC dXR0b24pOwotICAgICAgICBpZiAoZW51bVN0cmluZyA9PSAiUmlnaHRCdXR0b24iKQorICAgICAg ICBlbHNlIGlmIChlbnVtU3RyaW5nID09ICJSaWdodEJ1dHRvbiIpCiAgICAgICAgICAgICBlbnVt VmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpNb3VzZUJ1dHRvbj4oZW51bVZhbHVlIHwgV2Vi Q29yZTo6UmlnaHRCdXR0b24pOwogICAgIH0KIAogICAgIHJldHVybiB0cnVlOwogfQorCitFbmNv ZGVkVmFsdWUgRW5jb2RpbmdUcmFpdHM8V2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6VHlwZT46OmVu Y29kZVZhbHVlKGNvbnN0IFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OlR5cGUmIGVudW1WYWx1ZSkK K3sKKyAgICBFbmNvZGVkVmFsdWUgZW5jb2RlZFZhbHVlID0gRW5jb2RlZFZhbHVlOjpjcmVhdGVB cnJheSgpOworICAgIGlmIChlbnVtVmFsdWUgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpNb3Vz ZSkgeworICAgICAgICBlbmNvZGVkVmFsdWUuYXBwZW5kPFN0cmluZz4oQVNDSUlMaXRlcmFsKCJN b3VzZSIpKTsKKyAgICAgICAgaWYgKGVudW1WYWx1ZSA9PSBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpNb3VzZSkKKyAgICAgICAgICAgIHJldHVybiBlbmNvZGVkVmFsdWU7CisgICAgfQorICAgIGlm IChlbnVtVmFsdWUgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpLZXkpIHsKKyAgICAgICAgZW5j b2RlZFZhbHVlLmFwcGVuZDxTdHJpbmc+KEFTQ0lJTGl0ZXJhbCgiS2V5IikpOworICAgICAgICBp ZiAoZW51bVZhbHVlID09IFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OktleSkKKyAgICAgICAgICAg IHJldHVybiBlbmNvZGVkVmFsdWU7CisgICAgfQorICAgIGlmIChlbnVtVmFsdWUgJiBXZWJDb3Jl OjpQbGF0Zm9ybUV2ZW50OjpUb3VjaCkgeworICAgICAgICBlbmNvZGVkVmFsdWUuYXBwZW5kPFN0 cmluZz4oQVNDSUlMaXRlcmFsKCJUb3VjaCIpKTsKKyAgICAgICAgaWYgKGVudW1WYWx1ZSA9PSBX ZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpUb3VjaCkKKyAgICAgICAgICAgIHJldHVybiBlbmNvZGVk VmFsdWU7CisgICAgfQorICAgIGlmIChlbnVtVmFsdWUgJiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpXaGVlbCkgeworICAgICAgICBlbmNvZGVkVmFsdWUuYXBwZW5kPFN0cmluZz4oQVNDSUlMaXRl cmFsKCJXaGVlbCIpKTsKKyAgICAgICAgaWYgKGVudW1WYWx1ZSA9PSBXZWJDb3JlOjpQbGF0Zm9y bUV2ZW50OjpXaGVlbCkKKyAgICAgICAgICAgIHJldHVybiBlbmNvZGVkVmFsdWU7CisgICAgfQor ICAgIHJldHVybiBlbmNvZGVkVmFsdWU7Cit9CisKK2Jvb2wgRW5jb2RpbmdUcmFpdHM8V2ViQ29y ZTo6UGxhdGZvcm1FdmVudDo6VHlwZT46OmRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYgZW5jb2Rl ZFZhbHVlLCBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpUeXBlJiBlbnVtVmFsdWUpCit7CisgICAg VmVjdG9yPFN0cmluZz4gZW51bVN0cmluZ3M7CisgICAgaWYgKCFFbmNvZGluZ1RyYWl0czxWZWN0 b3I8U3RyaW5nPj46OmRlY29kZVZhbHVlKGVuY29kZWRWYWx1ZSwgZW51bVN0cmluZ3MpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBmb3IgKFN0cmluZyBlbnVtU3RyaW5nIDogZW51bVN0 cmluZ3MpIHsKKyAgICAgICAgaWYgKGVudW1TdHJpbmcgPT0gIk1vdXNlIikKKyAgICAgICAgICAg IGVudW1WYWx1ZSA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OlR5cGU+KGVu dW1WYWx1ZSB8IFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6Ok1vdXNlKTsKKyAgICAgICAgZWxzZSBp ZiAoZW51bVN0cmluZyA9PSAiS2V5IikKKyAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRpY19j YXN0PFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OlR5cGU+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OlBs YXRmb3JtRXZlbnQ6OktleSk7CisgICAgICAgIGVsc2UgaWYgKGVudW1TdHJpbmcgPT0gIlRvdWNo IikKKyAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OlBsYXRmb3Jt RXZlbnQ6OlR5cGU+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OlBsYXRmb3JtRXZlbnQ6OlRvdWNoKTsK KyAgICAgICAgZWxzZSBpZiAoZW51bVN0cmluZyA9PSAiV2hlZWwiKQorICAgICAgICAgICAgZW51 bVZhbHVlID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6VHlwZT4oZW51bVZh bHVlIHwgV2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6V2hlZWwpOworICAgIH0KKworICAgIHJldHVy biB0cnVlOworfQogfSAvLyBuYW1lc3BhY2UgSlNDCiAKICNlbmRpZiAvLyBFTkFCTEUoV0VCX1JF UExBWSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90 ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbi1UZXN0UmVw bGF5SW5wdXRzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMv ZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bS1lbmNvZGluZy1oZWxwZXJzLmpzb24tVGVzdFJlcGxheUlu cHV0cy5oCmluZGV4IDgyNGJiOTM1MzRiNDQyYTc0MGRjMGVlZjA5OWFiMzMyNTlkZmRmNjkuLmEy MjAxNWM1MzUwYmYxOGFjY2EyMTY1MDljMTViZWQ2MzFmYzZiYzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1l bnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dlbmVyYXRlLWVu dW0tZW5jb2RpbmctaGVscGVycy5qc29uLVRlc3RSZXBsYXlJbnB1dHMuaApAQCAtMzMsNiArMzMs NyBAQAogI2lmIEVOQUJMRShXRUJfUkVQTEFZKQogI2luY2x1ZGUgIkludGVybmFsTmFtZXNwYWNl SGVhZGVySW5jbHVkZUR1bW15LmgiCiAjaW5jbHVkZSA8cGxhdGZvcm0vRXh0ZXJuYWxOYW1lc3Bh Y2VIZWFkZXJJbmNsdWRlRHVtbXkuaD4KKyNpbmNsdWRlIDxwbGF0Zm9ybS9QbGF0Zm9ybUV2ZW50 Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGVudW0gTW91c2VCdXR0b24gOiB1bnNpZ25lZDsK QEAgLTY4LDYgKzY5LDEzIEBAIHRlbXBsYXRlPD4gc3RydWN0IEVuY29kaW5nVHJhaXRzPFdlYkNv cmU6Ok1vdXNlQnV0dG9uPiB7CiAgICAgc3RhdGljIEVuY29kZWRWYWx1ZSBlbmNvZGVWYWx1ZShj b25zdCBXZWJDb3JlOjpNb3VzZUJ1dHRvbiYgdmFsdWUpOwogICAgIHN0YXRpYyBib29sIGRlY29k ZVZhbHVlKEVuY29kZWRWYWx1ZSYsIFdlYkNvcmU6Ok1vdXNlQnV0dG9uJiB2YWx1ZSk7CiB9Owor Cit0ZW1wbGF0ZTw+IHN0cnVjdCBFbmNvZGluZ1RyYWl0czxXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50 OjpUeXBlPiB7CisgICAgdHlwZWRlZiBXZWJDb3JlOjpQbGF0Zm9ybUV2ZW50OjpUeXBlIERlY29k ZWRUeXBlOworCisgICAgc3RhdGljIEVuY29kZWRWYWx1ZSBlbmNvZGVWYWx1ZShjb25zdCBXZWJD b3JlOjpQbGF0Zm9ybUV2ZW50OjpUeXBlJiB2YWx1ZSk7CisgICAgc3RhdGljIGJvb2wgZGVjb2Rl VmFsdWUoRW5jb2RlZFZhbHVlJiwgV2ViQ29yZTo6UGxhdGZvcm1FdmVudDo6VHlwZSYgdmFsdWUp OworfTsKIH0gLy8gbmFtZXNwYWNlIEpTQwogCiBuYW1lc3BhY2UgVGVzdCB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2Vu ZXJhdGUtZW51bXMtd2l0aC1zYW1lLWJhc2UtbmFtZS5qc29uLVRlc3RSZXBsYXlJbnB1dHMuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dl bmVyYXRlLWVudW1zLXdpdGgtc2FtZS1iYXNlLW5hbWUuanNvbi1UZXN0UmVwbGF5SW5wdXRzLmNw cAppbmRleCA0MzUwM2I0OWY1YTVmMzhiYzlhMWYxODE4ZmZhZTIyODgzYzA0M2U3Li4yNjk3MDA5 NjIzMTg3NmYyNmY4ZjM5ODA0MGI2NTQ4ZmI4YzZmMGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZW51bXMt d2l0aC1zYW1lLWJhc2UtbmFtZS5qc29uLVRlc3RSZXBsYXlJbnB1dHMuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1l bnVtcy13aXRoLXNhbWUtYmFzZS1uYW1lLmpzb24tVGVzdFJlcGxheUlucHV0cy5jcHAKQEAgLTEx MCw3ICsxMTAsNyBAQCBib29sIEVuY29kaW5nVHJhaXRzPFdlYkNvcmU6OkZvcm1EYXRhMTo6VHlw ZT46OmRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYgZW5jb2RlZAogICAgIGZvciAoU3RyaW5nIGVu dW1TdHJpbmcgOiBlbnVtU3RyaW5ncykgewogICAgICAgICBpZiAoZW51bVN0cmluZyA9PSAiVGV4 dCIpCiAgICAgICAgICAgICBlbnVtVmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpGb3JtRGF0 YTE6OlR5cGU+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OkZvcm1EYXRhMTo6VGV4dCk7Ci0gICAgICAg IGlmIChlbnVtU3RyaW5nID09ICJCbG9iIikKKyAgICAgICAgZWxzZSBpZiAoZW51bVN0cmluZyA9 PSAiQmxvYiIpCiAgICAgICAgICAgICBlbnVtVmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpG b3JtRGF0YTE6OlR5cGU+KGVudW1WYWx1ZSB8IFdlYkNvcmU6OkZvcm1EYXRhMTo6QmxvYik7CiAg ICAgfQogCkBAIC0xNjUsNyArMTY1LDcgQEAgYm9vbCBFbmNvZGluZ1RyYWl0czxQbGF0Zm9ybUV2 ZW50MTo6VHlwZT46OmRlY29kZVZhbHVlKEVuY29kZWRWYWx1ZSYgZW5jb2RlZFZhbHUKICAgICBm b3IgKFN0cmluZyBlbnVtU3RyaW5nIDogZW51bVN0cmluZ3MpIHsKICAgICAgICAgaWYgKGVudW1T dHJpbmcgPT0gIk1vdXNlIikKICAgICAgICAgICAgIGVudW1WYWx1ZSA9IHN0YXRpY19jYXN0PFBs YXRmb3JtRXZlbnQxOjpUeXBlPihlbnVtVmFsdWUgfCBQbGF0Zm9ybUV2ZW50MTo6TW91c2UpOwot ICAgICAgICBpZiAoZW51bVN0cmluZyA9PSAiS2V5Ym9hcmQiKQorICAgICAgICBlbHNlIGlmIChl bnVtU3RyaW5nID09ICJLZXlib2FyZCIpCiAgICAgICAgICAgICBlbnVtVmFsdWUgPSBzdGF0aWNf Y2FzdDxQbGF0Zm9ybUV2ZW50MTo6VHlwZT4oZW51bVZhbHVlIHwgUGxhdGZvcm1FdmVudDE6Oktl eWJvYXJkKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBs YXkvc2NyaXB0cy90ZXN0cy9nZW5lcmF0ZS1lbnVtLWVuY29kaW5nLWhlbHBlcnMuanNvbiBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvc2NyaXB0cy90ZXN0cy9nZW5lcmF0ZS1lbnVtLWVu Y29kaW5nLWhlbHBlcnMuanNvbgppbmRleCA2NWQ3MWEzMTdmOGZkM2Q0MTE1ZmE0NmRmMjIzNmJl ZDg2MTZlZmM4Li44ZGYxNzcyMDE0MWIzM2ViZDg4OGNlMTAwMTY4NmQ5N2Y1MTkwMjE4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L3NjcmlwdHMvdGVzdHMvZ2VuZXJh dGUtZW51bS1lbmNvZGluZy1oZWxwZXJzLmpzb24KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3JlcGxheS9zY3JpcHRzL3Rlc3RzL2dlbmVyYXRlLWVudW0tZW5jb2RpbmctaGVscGVycy5qc29u CkBAIC0xNCw2ICsxNCwxMyBAQAogICAgICAgICAgICAgICAgICJmbGFncyI6IFsiRU5VTSJdLAog ICAgICAgICAgICAgICAgICJ2YWx1ZXMiOiBbIk5vQnV0dG9uIiwgIkxlZnRCdXR0b24iLCAiTWlk ZGxlQnV0dG9uIiwgIlJpZ2h0QnV0dG9uIl0sCiAgICAgICAgICAgICAgICAgImhlYWRlciI6ICJw bGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaCIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAiVHlwZSIsICJtb2RlIjogIlNDQUxBUiIsCisg ICAgICAgICAgICAgICAgImZsYWdzIjogWyJFTlVNIl0sCisgICAgICAgICAgICAgICAgImVuY2xv c2luZ19jbGFzcyI6ICJQbGF0Zm9ybUV2ZW50IiwKKyAgICAgICAgICAgICAgICAidmFsdWVzIjog WyJNb3VzZSIsICJLZXkiLCAiVG91Y2giLCAiV2hlZWwiXSwKKyAgICAgICAgICAgICAgICAiaGVh ZGVyIjogInBsYXRmb3JtL1BsYXRmb3JtRXZlbnQuaCIKICAgICAgICAgICAgIH0KICAgICAgICAg XQogICAgIH0sCg==