186162 2018-05-31 14:33:40 -0700 DFGArrayModes needs to know more about CoW arrays 2018-06-08 11:16:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=186425 InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist fpizlo mark.lam msaboff realdawei ryanhaddad saam webkit-bug-importer oldest_to_newest 1429008 0 keith_miller 2018-05-31 14:33:40 -0700 DFGArrayModes needs to know more about CoW arrays 1429011 1 341694 keith_miller 2018-05-31 14:58:53 -0700 Created attachment 341694 Patch 1429012 2 keith_miller 2018-05-31 14:59:27 -0700 This fixes the base64 regression from the first CoW patch. 1429057 3 keith_miller 2018-05-31 16:50:22 -0700 Committed r232376: <https://trac.webkit.org/changeset/232376> 1429061 4 webkit-bug-importer 2018-05-31 16:53:21 -0700 <rdar://problem/40704880> 1431264 5 realdawei 2018-06-08 09:47:12 -0700 After https://trac.webkit.org/changeset/232376 the following test has been failing quite frequently on macOS Wk2 Debug: Test Name: inspector/console/webcore-logging.html Flakiness Dashboard: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=inspector%2Fconsole%2Fwebcore-logging.html Sample stdio: https://build.webkit.org/builders/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/builds/3602/steps/layout-test/logs/stdio Sample Diff: --- /Volumes/Data/slave/highsierra-debug-tests-wk2/build/layout-test-results/inspector/console/webcore-logging-expected.txt +++ /Volumes/Data/slave/highsierra-debug-tests-wk2/build/layout-test-results/inspector/console/webcore-logging-actual.txt @@ -33,6 +33,7 @@ -- Running test case: Console.Logging.LogAsJSONWithoutRepeat PASS: Media logging disabled. PASS: Verbose media logging has been enabled. +ERROR: TypeError: undefined is not an object (evaluating 'listener.call') PASS: Message logged as JSON. PASS: ConsoleMessage repeatCount is 1. PASS: Message logged as JSON. 1431317 6 realdawei 2018-06-08 11:16:25 -0700 I've been able to reproduce the failure on a local build of r232376 using the following command: run-webkit-tests inspector/console/webcore-logging.html --debug --iter 50 -f -g --no-retry The test passes reliably on the previous build (r232375) 341694 2018-05-31 14:58:53 -0700 2018-05-31 15:43:21 -0700 Patch bug-186162-20180531145852.patch text/plain 18855 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy MDQ4NGFhZWM3YzljMzE2MjNiOTJkYzU5NTIxZTEwOGZkZTViYzU1Li40Y2U1OGZjMzVjOWNkNDhj ZjAwOTBiNTQ2YjE5NzBjMmUzYmNlYTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NCBAQAorMjAxOC0wNS0zMSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBERkdBcnJheU1vZGVzIG5lZWRzIHRvIGtub3cgbW9yZSBhYm91dCBD b1cgYXJyYXlzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODYxNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGZpeGVzIHR3byBpc3N1ZXMgaW4gREZHQXJyYXlNb2RlLgorCisgICAgICAg IDEpIGZyb21PYnNlcnZlZCB3YXMgbWlzc2luZyBzd2l0Y2ggY2FzZXMgZm9yIHdoZW4gdGhlIG9u bHkgb2JzZXJ2ZWQgQXJyYXlNb2RlcyBhcmUgQ29weU9uV3JpdGUuCisgICAgICAgIDIpIERGR0Fy cmF5TW9kZXMgbmVlZHMgdG8gdHJhY2sgaWYgdGhlIEFycmF5Q2xhc3MgaXMgYW4gT3JpZ2luYWxD b3B5T25Xcml0ZUFycmF5IGluIG9yZGVyCisgICAgICAgIHRvIHZlbmQgYW4gYWNjdXJhdGUgb3Jp Z2luYWwgc3RydWN0dXJlLgorCisgICAgICAgIEFkZGl0aW9uYWxseSwgdGhpcyBwYXRjaCBmaXhl cyBzb21lIHBsYWNlcyBpbiBCeXRlY29kZSBwYXJzaW5nIHdoZXJlIHdlIHRvbGQgdGhlIGFycmF5 IG1vZGUKKyAgICAgICAgd2Ugd2VyZSBkb2luZyBhIHJlYWQgYnV0IGFjdHVhbGx5IGRvaW5nIGEg d3JpdGUuIEFsc28sIERGR0FycmF5TW9kZSB3aWxsIG5vdyBwcmludCB0aGUKKyAgICAgICAgYWN0 aW9uIGl0IGlzIGV4cGVjdGluZyB3aGVuIGJlaW5nIGR1bXBlZC4KKworICAgICAgICAqIGJ5dGVj b2RlL0FycmF5UHJvZmlsZS5oOgorICAgICAgICAoSlNDOjpoYXNTZWVuV3JpdGFibGVBcnJheSk6 CisgICAgICAgICogZGZnL0RGR0FycmF5TW9kZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6QXJy YXlNb2RlOjpmcm9tT2JzZXJ2ZWQpOgorICAgICAgICAoSlNDOjpERkc6OkFycmF5TW9kZTo6cmVm aW5lIGNvbnN0KToKKyAgICAgICAgKEpTQzo6REZHOjpBcnJheU1vZGU6Om9yaWdpbmFsQXJyYXlT dHJ1Y3R1cmUgY29uc3QpOgorICAgICAgICAoSlNDOjpERkc6OmFycmF5QWN0aW9uVG9TdHJpbmcp OgorICAgICAgICAoSlNDOjpERkc6OkFycmF5TW9kZTo6ZHVtcCBjb25zdCk6CisgICAgICAgIChX VEY6OnByaW50SW50ZXJuYWwpOgorICAgICAgICAqIGRmZy9ERkdBcnJheU1vZGUuaDoKKyAgICAg ICAgKEpTQzo6REZHOjpBcnJheU1vZGU6OndpdGhQcm9maWxlIGNvbnN0KToKKyAgICAgICAgKEpT Qzo6REZHOjpBcnJheU1vZGU6OmlzSlNBcnJheSBjb25zdCk6CisgICAgICAgIChKU0M6OkRGRzo6 QXJyYXlNb2RlOjppc0pTQXJyYXlXaXRoT3JpZ2luYWxTdHJ1Y3R1cmUgY29uc3QpOgorICAgICAg ICAoSlNDOjpERkc6OkFycmF5TW9kZTo6YXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlIGNvbnN0 KToKKyAgICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OkJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5zaWNDYWxsKToKKyAgICAgICAgKEpTQzo6 REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisgICAgICAgICogZGZnL0RGR0ZpeHVw UGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6OmZpeHVwTm9kZSk6Cisg ICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpT cGVjdWxhdGl2ZUpJVDo6anVtcFNsb3dGb3JVbndhbnRlZEFycmF5TW9kZSk6CisgICAgICAgICog ZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRG R1RvQjM6OmlzQXJyYXlUeXBlRm9yQXJyYXlpZnkpOgorCiAyMDE4LTA1LTIyICBLZWl0aCBNaWxs ZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlIHNob3VsZCBoYXZlIGEg Q29XIHN0b3JhZ2UgZm9yIE5ld0FycmF5QnVmZmVyIGFycmF5cy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BcnJheVByb2ZpbGUuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9BcnJheVByb2ZpbGUuaAppbmRleCA0MDg5NjBmZGU2MjE5NTNlODM4 ODgzN2FiYzNkYzNhNzg0ZmU4NjFlLi4yMjBiNjdlNzk5OWU1NGFmM2M1MDhhOTQ2MjRiMmM1ZTgy OTRlNWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQXJyYXlQ cm9maWxlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0FycmF5UHJvZmls ZS5oCkBAIC05OCwxNCArOTgsMTcgQEAgaW5saW5lIGNvbnN0ZXhwciBBcnJheU1vZGVzIGFzQXJy YXlNb2RlcyhJbmRleGluZ1R5cGUgaW5kZXhpbmdNb2RlKQogICAgIHwgQ29weU9uV3JpdGVBcnJh eVdpdGhEb3VibGVBcnJheU1vZGUgICAgICAgICAgICAgICBcCiAgICAgfCBDb3B5T25Xcml0ZUFy cmF5V2l0aENvbnRpZ3VvdXNBcnJheU1vZGUpCiAKLSNkZWZpbmUgQUxMX0FSUkFZX0FSUkFZX01P REVTICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorI2RlZmluZSBBTExfV1JJVEFCTEVfQVJS QVlfQVJSQVlfTU9ERVMgICAgICAgICAgICAgICAgICBcCiAgICAgKGFzQXJyYXlNb2RlcyhBcnJh eUNsYXNzKSAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICB8IGFzQXJyYXlNb2RlcyhB cnJheVdpdGhVbmRlY2lkZWQpICAgICAgICAgICAgICAgICAgXAogICAgIHwgYXNBcnJheU1vZGVz KEFycmF5V2l0aEludDMyKSAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfCBhc0FycmF5TW9k ZXMoQXJyYXlXaXRoRG91YmxlKSAgICAgICAgICAgICAgICAgICAgIFwKICAgICB8IGFzQXJyYXlN b2RlcyhBcnJheVdpdGhDb250aWd1b3VzKSAgICAgICAgICAgICAgICAgXAogICAgIHwgYXNBcnJh eU1vZGVzKEFycmF5V2l0aEFycmF5U3RvcmFnZSkgICAgICAgICAgICAgICBcCi0gICAgfCBhc0Fy cmF5TW9kZXMoQXJyYXlXaXRoU2xvd1B1dEFycmF5U3RvcmFnZSkgICAgICAgIFwKKyAgICB8IGFz QXJyYXlNb2RlcyhBcnJheVdpdGhTbG93UHV0QXJyYXlTdG9yYWdlKSkKKworI2RlZmluZSBBTExf QVJSQVlfQVJSQVlfTU9ERVMgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgKEFMTF9X UklUQUJMRV9BUlJBWV9BUlJBWV9NT0RFUyAgICAgICAgICAgICAgICAgICAgIFwKICAgICB8IEFM TF9DT1BZX09OX1dSSVRFX0FSUkFZX01PREVTKQogCiAjZGVmaW5lIEFMTF9BUlJBWV9NT0RFUyAo QUxMX05PTl9BUlJBWV9BUlJBWV9NT0RFUyB8IEFMTF9BUlJBWV9BUlJBWV9NT0RFUykKQEAgLTIw NSw2ICsyMDgsMTEgQEAgaW5saW5lIGJvb2wgaGFzU2Vlbk5vbkFycmF5KEFycmF5TW9kZXMgYXJy YXlNb2RlcykKICAgICByZXR1cm4gYXJyYXlNb2RlcyAmIEFMTF9OT05fQVJSQVlfQVJSQVlfTU9E RVM7CiB9CiAKK2lubGluZSBib29sIGhhc1NlZW5Xcml0YWJsZUFycmF5KEFycmF5TW9kZXMgYXJy YXlNb2RlcykKK3sKKyAgICByZXR1cm4gYXJyYXlNb2RlcyAmIEFMTF9XUklUQUJMRV9BUlJBWV9B UlJBWV9NT0RFUzsKK30KKwogaW5saW5lIGJvb2wgaGFzU2VlbkNvcHlPbldyaXRlQXJyYXkoQXJy YXlNb2RlcyBhcnJheU1vZGVzKQogewogICAgIHJldHVybiBhcnJheU1vZGVzICYgQUxMX0NPUFlf T05fV1JJVEVfQVJSQVlfTU9ERVM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0FycmF5TW9kZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0FycmF5 TW9kZS5jcHAKaW5kZXggMGU4OGQyYTM2ZmI0N2Q4MzA2MjIyYmNjOTA0NDFiNmIzMDVlMTU3Yi4u MDM0YWJlNjg4MDU0ZTc0N2IyOWVhMWRjOTQ3OTdjZTExZjY0ZmM3MiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBcnJheU1vZGUuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQXJyYXlNb2RlLmNwcApAQCAtODYsNiArODYsNyBAQCBBcnJheU1v ZGUgQXJyYXlNb2RlOjpmcm9tT2JzZXJ2ZWQoY29uc3QgQ29uY3VycmVudEpTTG9ja2VyJiBsb2Nr ZXIsIEFycmF5UHJvZmlsZQogCiAgICAgY2FzZSBhc0FycmF5TW9kZXMoTm9uQXJyYXlXaXRoSW50 MzIpOgogICAgIGNhc2UgYXNBcnJheU1vZGVzKEFycmF5V2l0aEludDMyKToKKyAgICBjYXNlIGFz QXJyYXlNb2RlcyhDb3B5T25Xcml0ZUFycmF5V2l0aEludDMyKToKICAgICBjYXNlIGFzQXJyYXlN b2RlcyhOb25BcnJheVdpdGhJbnQzMikgfCBhc0FycmF5TW9kZXMoQXJyYXlXaXRoSW50MzIpOgog ICAgIGNhc2UgYXNBcnJheU1vZGVzKE5vbkFycmF5V2l0aEludDMyKSB8IGFzQXJyYXlNb2RlcyhD b3B5T25Xcml0ZUFycmF5V2l0aEludDMyKToKICAgICBjYXNlIGFzQXJyYXlNb2RlcyhBcnJheVdp dGhJbnQzMikgfCBhc0FycmF5TW9kZXMoQ29weU9uV3JpdGVBcnJheVdpdGhJbnQzMik6CkBAIC05 NCw2ICs5NSw3IEBAIEFycmF5TW9kZSBBcnJheU1vZGU6OmZyb21PYnNlcnZlZChjb25zdCBDb25j dXJyZW50SlNMb2NrZXImIGxvY2tlciwgQXJyYXlQcm9maWxlCiAKICAgICBjYXNlIGFzQXJyYXlN b2RlcyhOb25BcnJheVdpdGhEb3VibGUpOgogICAgIGNhc2UgYXNBcnJheU1vZGVzKEFycmF5V2l0 aERvdWJsZSk6CisgICAgY2FzZSBhc0FycmF5TW9kZXMoQ29weU9uV3JpdGVBcnJheVdpdGhEb3Vi bGUpOgogICAgIGNhc2UgYXNBcnJheU1vZGVzKE5vbkFycmF5V2l0aERvdWJsZSkgfCBhc0FycmF5 TW9kZXMoQXJyYXlXaXRoRG91YmxlKToKICAgICBjYXNlIGFzQXJyYXlNb2RlcyhOb25BcnJheVdp dGhEb3VibGUpIHwgYXNBcnJheU1vZGVzKENvcHlPbldyaXRlQXJyYXlXaXRoRG91YmxlKToKICAg ICBjYXNlIGFzQXJyYXlNb2RlcyhBcnJheVdpdGhEb3VibGUpIHwgYXNBcnJheU1vZGVzKENvcHlP bldyaXRlQXJyYXlXaXRoRG91YmxlKToKQEAgLTEwMiw2ICsxMDQsNyBAQCBBcnJheU1vZGUgQXJy YXlNb2RlOjpmcm9tT2JzZXJ2ZWQoY29uc3QgQ29uY3VycmVudEpTTG9ja2VyJiBsb2NrZXIsIEFy cmF5UHJvZmlsZQogCiAgICAgY2FzZSBhc0FycmF5TW9kZXMoTm9uQXJyYXlXaXRoQ29udGlndW91 cyk6CiAgICAgY2FzZSBhc0FycmF5TW9kZXMoQXJyYXlXaXRoQ29udGlndW91cyk6CisgICAgY2Fz ZSBhc0FycmF5TW9kZXMoQ29weU9uV3JpdGVBcnJheVdpdGhDb250aWd1b3VzKToKICAgICBjYXNl IGFzQXJyYXlNb2RlcyhOb25BcnJheVdpdGhDb250aWd1b3VzKSB8IGFzQXJyYXlNb2RlcyhBcnJh eVdpdGhDb250aWd1b3VzKToKICAgICBjYXNlIGFzQXJyYXlNb2RlcyhOb25BcnJheVdpdGhDb250 aWd1b3VzKSB8IGFzQXJyYXlNb2RlcyhDb3B5T25Xcml0ZUFycmF5V2l0aENvbnRpZ3VvdXMpOgog ICAgIGNhc2UgYXNBcnJheU1vZGVzKEFycmF5V2l0aENvbnRpZ3VvdXMpIHwgYXNBcnJheU1vZGVz KENvcHlPbldyaXRlQXJyYXlXaXRoQ29udGlndW91cyk6CkBAIC0yNDIsNyArMjQ1LDcgQEAgQXJy YXlNb2RlIEFycmF5TW9kZTo6cmVmaW5lKAogICAgICAgICBTdHJ1Y3R1cmUqIGFycmF5UHJvdG90 eXBlU3RydWN0dXJlID0gZ2xvYmFsT2JqZWN0LT5hcnJheVByb3RvdHlwZSgpLT5zdHJ1Y3R1cmUo KTsKICAgICAgICAgU3RydWN0dXJlKiBvYmplY3RQcm90b3R5cGVTdHJ1Y3R1cmUgPSBnbG9iYWxP YmplY3QtPm9iamVjdFByb3RvdHlwZSgpLT5zdHJ1Y3R1cmUoKTsKICAgICAgICAgaWYgKChub2Rl LT5vcCgpID09IEdldEJ5VmFsIHx8IGNhbkJlY29tZUdldEFycmF5TGVuZ3RoKGdyYXBoLCBub2Rl KSkKLSAgICAgICAgICAgICYmIGFycmF5Q2xhc3MoKSA9PSBBcnJheTo6T3JpZ2luYWxBcnJheQor ICAgICAgICAgICAgJiYgaXNKU0FycmF5V2l0aE9yaWdpbmFsU3RydWN0dXJlKCkKICAgICAgICAg ICAgICYmICFncmFwaC5oYXNFeGl0U2l0ZShub2RlLT5vcmlnaW4uc2VtYW50aWMsIE91dE9mQm91 bmRzKQogICAgICAgICAgICAgJiYgYXJyYXlQcm90b3R5cGVTdHJ1Y3R1cmUtPnRyYW5zaXRpb25X YXRjaHBvaW50U2V0SXNTdGlsbFZhbGlkKCkKICAgICAgICAgICAgICYmIG9iamVjdFByb3RvdHlw ZVN0cnVjdHVyZS0+dHJhbnNpdGlvbldhdGNocG9pbnRTZXRJc1N0aWxsVmFsaWQoKQpAQCAtMzYx LDYgKzM2NCwyMyBAQCBTdHJ1Y3R1cmUqIEFycmF5TW9kZTo6b3JpZ2luYWxBcnJheVN0cnVjdHVy ZShHcmFwaCYgZ3JhcGgsIGNvbnN0IENvZGVPcmlnaW4mIGNvZAogICAgIEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QgPSBncmFwaC5nbG9iYWxPYmplY3RGb3IoY29kZU9yaWdpbik7CiAgICAg CiAgICAgc3dpdGNoIChhcnJheUNsYXNzKCkpIHsKKyAgICBjYXNlIEFycmF5OjpPcmlnaW5hbENv cHlPbldyaXRlQXJyYXk6IHsKKyAgICAgICAgaWYgKGNvbnZlcnNpb24oKSA9PSBBcnJheTo6QXNJ cykgeworICAgICAgICAgICAgc3dpdGNoICh0eXBlKCkpIHsKKyAgICAgICAgICAgIGNhc2UgQXJy YXk6OkludDMyOgorICAgICAgICAgICAgICAgIHJldHVybiBnbG9iYWxPYmplY3QtPm9yaWdpbmFs QXJyYXlTdHJ1Y3R1cmVGb3JJbmRleGluZ1R5cGUoQ29weU9uV3JpdGVBcnJheVdpdGhJbnQzMik7 CisgICAgICAgICAgICBjYXNlIEFycmF5OjpEb3VibGU6CisgICAgICAgICAgICAgICAgcmV0dXJu IGdsb2JhbE9iamVjdC0+b3JpZ2luYWxBcnJheVN0cnVjdHVyZUZvckluZGV4aW5nVHlwZShDb3B5 T25Xcml0ZUFycmF5V2l0aERvdWJsZSk7CisgICAgICAgICAgICBjYXNlIEFycmF5OjpDb250aWd1 b3VzOgorICAgICAgICAgICAgICAgIHJldHVybiBnbG9iYWxPYmplY3QtPm9yaWdpbmFsQXJyYXlT dHJ1Y3R1cmVGb3JJbmRleGluZ1R5cGUoQ29weU9uV3JpdGVBcnJheVdpdGhDb250aWd1b3VzKTsK KyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgQ1JBU0goKTsKKyAgICAgICAg ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAg ICBGQUxMVEhST1VHSDsKKyAgICB9CisKICAgICBjYXNlIEFycmF5OjpPcmlnaW5hbEFycmF5OiB7 CiAgICAgICAgIHN3aXRjaCAodHlwZSgpKSB7CiAgICAgICAgIGNhc2UgQXJyYXk6OkludDMyOgpA QCAtNTU4LDYgKzU3OCwxOCBAQCBib29sIEFycmF5TW9kZTo6YWxyZWFkeUNoZWNrZWQoR3JhcGgm IGdyYXBoLCBOb2RlKiBub2RlLCBjb25zdCBBYnN0cmFjdFZhbHVlJiB2YQogICAgIHJldHVybiBm YWxzZTsKIH0KIAorY29uc3QgY2hhciogYXJyYXlBY3Rpb25Ub1N0cmluZyhBcnJheTo6QWN0aW9u IGFjdGlvbikKK3sKKyAgICBzd2l0Y2ggKGFjdGlvbikgeworICAgIGNhc2UgQXJyYXk6OlJlYWQ6 CisgICAgICAgIHJldHVybiAiUmVhZCI7CisgICAgY2FzZSBBcnJheTo6V3JpdGU6CisgICAgICAg IHJldHVybiAiV3JpdGUiOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiAiVW5rbm93biEi OworICAgIH0KK30KKwogY29uc3QgY2hhciogYXJyYXlUeXBlVG9TdHJpbmcoQXJyYXk6OlR5cGUg dHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKQEAgLTc4NSwxMyArODE3LDE4IEBAIGJvb2wg QXJyYXlNb2RlOjpwZXJtaXRzQm91bmRzQ2hlY2tMb3dlcmluZygpIGNvbnN0CiAKIHZvaWQgQXJy YXlNb2RlOjpkdW1wKFByaW50U3RyZWFtJiBvdXQpIGNvbnN0CiB7Ci0gICAgb3V0LnByaW50KHR5 cGUoKSwgIisiLCBhcnJheUNsYXNzKCksICIrIiwgc3BlY3VsYXRpb24oKSwgIisiLCBjb252ZXJz aW9uKCkpOworICAgIG91dC5wcmludCh0eXBlKCksICIrIiwgYXJyYXlDbGFzcygpLCAiKyIsIHNw ZWN1bGF0aW9uKCksICIrIiwgY29udmVyc2lvbigpLCAiKyIsIGFjdGlvbigpKTsKIH0KIAogfSB9 IC8vIG5hbWVzcGFjZSBKU0M6OkRGRwogCiBuYW1lc3BhY2UgV1RGIHsKIAordm9pZCBwcmludElu dGVybmFsKFByaW50U3RyZWFtJiBvdXQsIEpTQzo6REZHOjpBcnJheTo6QWN0aW9uIGFjdGlvbikK K3sKKyAgICBvdXQucHJpbnQoSlNDOjpERkc6OmFycmF5QWN0aW9uVG9TdHJpbmcoYWN0aW9uKSk7 Cit9CisKIHZvaWQgcHJpbnRJbnRlcm5hbChQcmludFN0cmVhbSYgb3V0LCBKU0M6OkRGRzo6QXJy YXk6OlR5cGUgdHlwZSkKIHsKICAgICBvdXQucHJpbnQoSlNDOjpERkc6OmFycmF5VHlwZVRvU3Ry aW5nKHR5cGUpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQXJy YXlNb2RlLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0FycmF5TW9kZS5oCmluZGV4 IDFhMTVmZWMyMGM1ZTUxZWUwYmRlNDdmMTIxZjkyZTk1MGZkNTExNjkuLjY4NzhmMWU0NjJhMTEy NGNkMWYwZjgyMzQyZjg1NTc0MjY3YTdmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQXJyYXlNb2RlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdBcnJheU1vZGUuaApAQCAtODQsNiArODQsNyBAQCBlbnVtIENsYXNzIDogdWludDhfdCB7CiAg ICAgT3JpZ2luYWxOb25BcnJheSwgLy8gRGVmaW5pdGVseSBzb21lIG9iamVjdCB0aGF0IGlzIG5v dCBhIEpTQXJyYXksIGJ1dCB0aGF0IG9iamVjdCBoYXMgdGhlIG9yaWdpbmFsIHN0cnVjdHVyZS4K ICAgICBBcnJheSwgLy8gRGVmaW5pdGVseSBhIEpTQXJyYXksIGFuZCBtYXkgb3IgbWF5IG5vdCBo YXZlIGN1c3RvbSBwcm9wZXJ0aWVzIG9yIGhhdmUgdW5kZXJnb25lIHNvbWUgb3RoZXIgYml6YXJy ZSB0cmFuc2l0aW9ucy4KICAgICBPcmlnaW5hbEFycmF5LCAvLyBEZWZpbml0ZWx5IGEgSlNBcnJh eSwgYW5kIHN0aWxsIGhhcyBvbmUgb2YgdGhlIHByaW1vcmRpYWwgSlNBcnJheSBzdHJ1Y3R1cmVz IGZvciB0aGUgZ2xvYmFsIG9iamVjdCB0aGF0IHRoaXMgY29kZSBibG9jayAocG9zc2libHkgaW5s aW5lZCBjb2RlIGJsb2NrKSBiZWxvbmdzIHRvLgorICAgIE9yaWdpbmFsQ29weU9uV3JpdGVBcnJh eSwgLy8gRGVmaW5pdGVseSBhIGNvcHkgb24gd3JpdGUgSlNBcnJheSwgYW5kIHN0aWxsIGhhcyBv bmUgb2YgdGhlIHByaW1vcmRpYWwgSlNBcnJheSBjb3B5IG9uIHdyaXRlIHN0cnVjdHVyZXMgZm9y IHRoZSBnbG9iYWwgb2JqZWN0IHRoYXQgdGhpcyBjb2RlIGJsb2NrIChwb3NzaWJseSBpbmxpbmVk IGNvZGUgYmxvY2spIGJlbG9uZ3MgdG8uCiAgICAgUG9zc2libHlBcnJheSAvLyBTb21lIG9iamVj dCB0aGF0IG1heSBvciBtYXkgbm90IGJlIGEgSlNBcnJheS4KIH07CiAKQEAgLTIwNSw5ICsyMDYs MTUgQEAgcHVibGljOgogICAgICAgICBBcnJheTo6Q2xhc3MgbXlBcnJheUNsYXNzOwogCiAgICAg ICAgIGlmIChpc0pTQXJyYXkoKSkgewotICAgICAgICAgICAgaWYgKHByb2ZpbGUtPnVzZXNPcmln aW5hbEFycmF5U3RydWN0dXJlcyhsb2NrZXIpICYmIGJlbmVmaXRzRnJvbU9yaWdpbmFsQXJyYXko KSkKLSAgICAgICAgICAgICAgICBteUFycmF5Q2xhc3MgPSBBcnJheTo6T3JpZ2luYWxBcnJheTsK LSAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGlmIChwcm9maWxlLT51c2VzT3JpZ2luYWxB cnJheVN0cnVjdHVyZXMobG9ja2VyKSAmJiBiZW5lZml0c0Zyb21PcmlnaW5hbEFycmF5KCkpIHsK KyAgICAgICAgICAgICAgICBBcnJheU1vZGVzIGFycmF5TW9kZXMgPSBwcm9maWxlLT5vYnNlcnZl ZEFycmF5TW9kZXMobG9ja2VyKTsKKyAgICAgICAgICAgICAgICBpZiAoaGFzU2VlbkNvcHlPbldy aXRlQXJyYXkoYXJyYXlNb2RlcykgJiYgIWhhc1NlZW5Xcml0YWJsZUFycmF5KGFycmF5TW9kZXMp KQorICAgICAgICAgICAgICAgICAgICBteUFycmF5Q2xhc3MgPSBBcnJheTo6T3JpZ2luYWxDb3B5 T25Xcml0ZUFycmF5OworICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFoYXNTZWVuQ29weU9uV3Jp dGVBcnJheShhcnJheU1vZGVzKSAmJiBoYXNTZWVuV3JpdGFibGVBcnJheShhcnJheU1vZGVzKSkK KyAgICAgICAgICAgICAgICAgICAgbXlBcnJheUNsYXNzID0gQXJyYXk6Ok9yaWdpbmFsQXJyYXk7 CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBteUFycmF5Q2xhc3Mg PSBBcnJheTo6QXJyYXk7CisgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBteUFy cmF5Q2xhc3MgPSBBcnJheTo6QXJyYXk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgbXlB cnJheUNsYXNzID0gYXJyYXlDbGFzcygpOwpAQCAtMjU2LDYgKzI2Myw3IEBAIHB1YmxpYzoKICAg ICAgICAgc3dpdGNoIChhcnJheUNsYXNzKCkpIHsKICAgICAgICAgY2FzZSBBcnJheTo6QXJyYXk6 CiAgICAgICAgIGNhc2UgQXJyYXk6Ok9yaWdpbmFsQXJyYXk6CisgICAgICAgIGNhc2UgQXJyYXk6 Ok9yaWdpbmFsQ29weU9uV3JpdGVBcnJheToKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjY0LDcgKzI3Miw3 IEBAIHB1YmxpYzoKICAgICAKICAgICBib29sIGlzSlNBcnJheVdpdGhPcmlnaW5hbFN0cnVjdHVy ZSgpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gYXJyYXlDbGFzcygpID09IEFycmF5OjpP cmlnaW5hbEFycmF5OworICAgICAgICByZXR1cm4gYXJyYXlDbGFzcygpID09IEFycmF5OjpPcmln aW5hbEFycmF5IHx8IGFycmF5Q2xhc3MoKSA9PSBBcnJheTo6T3JpZ2luYWxDb3B5T25Xcml0ZUFy cmF5OwogICAgIH0KICAgICAKICAgICBib29sIGlzU2FuZUNoYWluKCkgY29uc3QKQEAgLTQ4Nywx MCArNDk1LDE0IEBAIHByaXZhdGU6CiAgICAgICAgIGNhc2UgQXJyYXk6Ok5vbkFycmF5OgogICAg ICAgICBjYXNlIEFycmF5OjpPcmlnaW5hbE5vbkFycmF5OgogICAgICAgICAgICAgcmV0dXJuIGFz QXJyYXlNb2RlcyhzaGFwZSk7CisgICAgICAgIGNhc2UgQXJyYXk6Ok9yaWdpbmFsQ29weU9uV3Jp dGVBcnJheToKKyAgICAgICAgICAgIEFTU0VSVChoYXNJbnQzMihzaGFwZSkgfHwgaGFzRG91Ymxl KHNoYXBlKSB8fCBoYXNDb250aWd1b3VzKHNoYXBlKSk7CisgICAgICAgICAgICByZXR1cm4gYXNB cnJheU1vZGVzKHNoYXBlIHwgSXNBcnJheSkgfCBhc0FycmF5TW9kZXMoc2hhcGUgfCBJc0FycmF5 IHwgQ29weU9uV3JpdGUpOwogICAgICAgICBjYXNlIEFycmF5OjpBcnJheToKLSAgICAgICAgY2Fz ZSBBcnJheTo6T3JpZ2luYWxBcnJheToKICAgICAgICAgICAgIGlmIChoYXNJbnQzMihzaGFwZSkg fHwgaGFzRG91YmxlKHNoYXBlKSB8fCBoYXNDb250aWd1b3VzKHNoYXBlKSkKICAgICAgICAgICAg ICAgICByZXR1cm4gYXNBcnJheU1vZGVzKHNoYXBlIHwgSXNBcnJheSkgfCBhc0FycmF5TW9kZXMo c2hhcGUgfCBJc0FycmF5IHwgQ29weU9uV3JpdGUpOworICAgICAgICAgICAgRkFMTFRIUk9VR0g7 CisgICAgICAgIGNhc2UgQXJyYXk6Ok9yaWdpbmFsQXJyYXk6CiAgICAgICAgICAgICByZXR1cm4g YXNBcnJheU1vZGVzKHNoYXBlIHwgSXNBcnJheSk7CiAgICAgICAgIGNhc2UgQXJyYXk6OlBvc3Np Ymx5QXJyYXk6CiAgICAgICAgICAgICBpZiAoaGFzSW50MzIoc2hhcGUpIHx8IGhhc0RvdWJsZShz aGFwZSkgfHwgaGFzQ29udGlndW91cyhzaGFwZSkpCkBAIC01NDQsNiArNTU2LDcgQEAgc3RhdGlj IGlubGluZSBib29sIG5ldmVyTmVlZHNTdG9yYWdlKGNvbnN0IEFycmF5TW9kZSYpCiBuYW1lc3Bh Y2UgV1RGIHsKIAogY2xhc3MgUHJpbnRTdHJlYW07Cit2b2lkIHByaW50SW50ZXJuYWwoUHJpbnRT dHJlYW0mLCBKU0M6OkRGRzo6QXJyYXk6OkFjdGlvbik7CiB2b2lkIHByaW50SW50ZXJuYWwoUHJp bnRTdHJlYW0mLCBKU0M6OkRGRzo6QXJyYXk6OlR5cGUpOwogdm9pZCBwcmludEludGVybmFsKFBy aW50U3RyZWFtJiwgSlNDOjpERkc6OkFycmF5OjpDbGFzcyk7CiB2b2lkIHByaW50SW50ZXJuYWwo UHJpbnRTdHJlYW0mLCBKU0M6OkRGRzo6QXJyYXk6OlNwZWN1bGF0aW9uKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKaW5kZXggMDc4NDQ0MTM4 NzUxYjZhOTk2MjEwNzZjOTg2MDM1YWM3YmE4MWRhNC4uNzNlMmJiODgzMGE2MTgzZmNjMWI2ZjVk YWJlZDA5OGU1NDBlY2YxYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdCeXRlQ29kZVBhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdC eXRlQ29kZVBhcnNlci5jcHAKQEAgLTg5NSwxMiArODk1LDcgQEAgcHJpdmF0ZToKICAgICAgICAg Ym9vbCBtYWtlU2FmZSA9IHByb2ZpbGUtPm91dE9mQm91bmRzKGxvY2tlcik7CiAgICAgICAgIHJl dHVybiBBcnJheU1vZGU6OmZyb21PYnNlcnZlZChsb2NrZXIsIHByb2ZpbGUsIGFjdGlvbiwgbWFr ZVNhZmUpOwogICAgIH0KLSAgICAKLSAgICBBcnJheU1vZGUgZ2V0QXJyYXlNb2RlKEFycmF5UHJv ZmlsZSogcHJvZmlsZSkKLSAgICB7Ci0gICAgICAgIHJldHVybiBnZXRBcnJheU1vZGUocHJvZmls ZSwgQXJyYXk6OlJlYWQpOwotICAgIH0KLSAgICAKKwogICAgIE5vZGUqIG1ha2VTYWZlKE5vZGUq IG5vZGUpCiAgICAgewogICAgICAgICBpZiAobV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmls ZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgT3ZlcmZsb3cpKQpAQCAtMjIxMSw3ICsyMjA2 LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBjYWxs ZWUsIGludCByZXN1bHRPcGVyYW5kLCBJbnRyaW4KICAgICAgICAgaWYgKHN0YXRpY19jYXN0PHVu c2lnbmVkPihhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcykgPj0gTUlOX1NQQVJTRV9BUlJBWV9J TkRFWCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgCi0gICAgICAgIEFycmF5 TW9kZSBhcnJheU1vZGUgPSBnZXRBcnJheU1vZGUobV9jdXJyZW50SW5zdHJ1Y3Rpb25bT1BDT0RF X0xFTkdUSChvcF9jYWxsKSAtIDJdLnUuYXJyYXlQcm9maWxlKTsKKyAgICAgICAgQXJyYXlNb2Rl IGFycmF5TW9kZSA9IGdldEFycmF5TW9kZShtX2N1cnJlbnRJbnN0cnVjdGlvbltPUENPREVfTEVO R1RIKG9wX2NhbGwpIC0gMl0udS5hcnJheVByb2ZpbGUsIEFycmF5OjpXcml0ZSk7CiAgICAgICAg IGlmICghYXJyYXlNb2RlLmlzSlNBcnJheSgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICBzd2l0Y2ggKGFycmF5TW9kZS50eXBlKCkpIHsKQEAgLTIyNDksMTEgKzIyNDQsMTEg QEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUs IGludCByZXN1bHRPcGVyYW5kLCBJbnRyaW4KICAgICAgICAgICAgIHx8IG1faW5saW5lU3RhY2tU b3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENhY2hlKSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICBBcnJheU1vZGUgYXJyYXlNb2Rl ID0gZ2V0QXJyYXlNb2RlKG1fY3VycmVudEluc3RydWN0aW9uW09QQ09ERV9MRU5HVEgob3BfY2Fs bCkgLSAyXS51LmFycmF5UHJvZmlsZSk7CisgICAgICAgIEFycmF5TW9kZSBhcnJheU1vZGUgPSBn ZXRBcnJheU1vZGUobV9jdXJyZW50SW5zdHJ1Y3Rpb25bT1BDT0RFX0xFTkdUSChvcF9jYWxsKSAt IDJdLnUuYXJyYXlQcm9maWxlLCBBcnJheTo6UmVhZCk7CiAgICAgICAgIGlmICghYXJyYXlNb2Rl LmlzSlNBcnJheSgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIGlmIChh cnJheU1vZGUuYXJyYXlDbGFzcygpICE9IEFycmF5OjpPcmlnaW5hbEFycmF5KQorICAgICAgICBp ZiAoIWFycmF5TW9kZS5pc0pTQXJyYXlXaXRoT3JpZ2luYWxTdHJ1Y3R1cmUoKSkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBzd2l0Y2ggKGFycmF5TW9kZS50eXBlKCkpIHsK QEAgLTIzMzUsMTEgKzIzMzAsMTEgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmlu c2ljQ2FsbChOb2RlKiBjYWxsZWUsIGludCByZXN1bHRPcGVyYW5kLCBJbnRyaW4KICAgICAgICAg ICAgIHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJy ZW50SW5kZXgsIEJhZFR5cGUpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAg IEFycmF5TW9kZSBhcnJheU1vZGUgPSBnZXRBcnJheU1vZGUobV9jdXJyZW50SW5zdHJ1Y3Rpb25b T1BDT0RFX0xFTkdUSChvcF9jYWxsKSAtIDJdLnUuYXJyYXlQcm9maWxlKTsKKyAgICAgICAgQXJy YXlNb2RlIGFycmF5TW9kZSA9IGdldEFycmF5TW9kZShtX2N1cnJlbnRJbnN0cnVjdGlvbltPUENP REVfTEVOR1RIKG9wX2NhbGwpIC0gMl0udS5hcnJheVByb2ZpbGUsIEFycmF5OjpSZWFkKTsKICAg ICAgICAgaWYgKCFhcnJheU1vZGUuaXNKU0FycmF5KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICAgICAgaWYgKGFycmF5TW9kZS5hcnJheUNsYXNzKCkgIT0gQXJyYXk6Ok9yaWdp bmFsQXJyYXkpCisgICAgICAgIGlmICghYXJyYXlNb2RlLmlzSlNBcnJheVdpdGhPcmlnaW5hbFN0 cnVjdHVyZSgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIC8vIFdlIGRv IG5vdCB3YW50IHRvIGNvbnZlcnQgYXJyYXlzIGludG8gb25lIHR5cGUganVzdCB0byBwZXJmb3Jt IGluZGV4T2YuCkBAIC0yMzk1LDcgKzIzOTAsNyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5k bGVJbnRyaW5zaWNDYWxsKE5vZGUqIGNhbGxlZSwgaW50IHJlc3VsdE9wZXJhbmQsIEludHJpbgog ICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMSkKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICAgICAgCi0gICAgICAgIEFycmF5TW9kZSBhcnJheU1vZGUgPSBn ZXRBcnJheU1vZGUobV9jdXJyZW50SW5zdHJ1Y3Rpb25bT1BDT0RFX0xFTkdUSChvcF9jYWxsKSAt IDJdLnUuYXJyYXlQcm9maWxlKTsKKyAgICAgICAgQXJyYXlNb2RlIGFycmF5TW9kZSA9IGdldEFy cmF5TW9kZShtX2N1cnJlbnRJbnN0cnVjdGlvbltPUENPREVfTEVOR1RIKG9wX2NhbGwpIC0gMl0u dS5hcnJheVByb2ZpbGUsIEFycmF5OjpXcml0ZSk7CiAgICAgICAgIGlmICghYXJyYXlNb2RlLmlz SlNBcnJheSgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBzd2l0Y2ggKGFy cmF5TW9kZS50eXBlKCkpIHsKQEAgLTYzOTcsNyArNjM5Miw3IEBAIHZvaWQgQnl0ZUNvZGVQYXJz ZXI6OnBhcnNlQmxvY2sodW5zaWduZWQgbGltaXQpCiAgICAgICAgIH0KIAogICAgICAgICBjYXNl IG9wX2luX2J5X3ZhbDogewotICAgICAgICAgICAgQXJyYXlNb2RlIGFycmF5TW9kZSA9IGdldEFy cmF5TW9kZShjdXJyZW50SW5zdHJ1Y3Rpb25bT1BDT0RFX0xFTkdUSChvcF9pbl9ieV92YWwpIC0g MV0udS5hcnJheVByb2ZpbGUpOworICAgICAgICAgICAgQXJyYXlNb2RlIGFycmF5TW9kZSA9IGdl dEFycmF5TW9kZShjdXJyZW50SW5zdHJ1Y3Rpb25bT1BDT0RFX0xFTkdUSChvcF9pbl9ieV92YWwp IC0gMV0udS5hcnJheVByb2ZpbGUsIEFycmF5OjpSZWFkKTsKICAgICAgICAgICAgIHNldChWaXJ0 dWFsUmVnaXN0ZXIoY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZCksCiAgICAgICAgICAg ICAgICAgYWRkVG9HcmFwaChJbkJ5VmFsLCBPcEluZm8oYXJyYXlNb2RlLmFzV29yZCgpKSwgZ2V0 KFZpcnR1YWxSZWdpc3RlcihjdXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5kKSksIGdldChW aXJ0dWFsUmVnaXN0ZXIoY3VycmVudEluc3RydWN0aW9uWzNdLnUub3BlcmFuZCkpKSk7CiAgICAg ICAgICAgICBORVhUX09QQ09ERShvcF9pbl9ieV92YWwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKaW5kZXggYWU3NmE5NDc1MzU0YjcxMTVjYzUzOTRhNzVi YjFmZDU1ZDZiOGNhMS4uMzEzZDc0MDllMDJhYTJjYjNjMWI5N2Y2ZTdlYmZmZjQzNjE4YTI4ZCAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCkBAIC02MzIs OCArNjMyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHN3aXRjaCAoYXJyYXlNb2RlLnR5cGUo KSkgewogICAgICAgICAgICAgY2FzZSBBcnJheTo6Q29udGlndW91czoKICAgICAgICAgICAgIGNh c2UgQXJyYXk6OkRvdWJsZToKLSAgICAgICAgICAgICAgICBpZiAoYXJyYXlNb2RlLmFycmF5Q2xh c3MoKSA9PSBBcnJheTo6T3JpZ2luYWxBcnJheQotICAgICAgICAgICAgICAgICAgICAmJiBhcnJh eU1vZGUuc3BlY3VsYXRpb24oKSA9PSBBcnJheTo6SW5Cb3VuZHMpIHsKKyAgICAgICAgICAgICAg ICBpZiAoYXJyYXlNb2RlLmlzSlNBcnJheVdpdGhPcmlnaW5hbFN0cnVjdHVyZSgpICYmIGFycmF5 TW9kZS5zcGVjdWxhdGlvbigpID09IEFycmF5OjpJbkJvdW5kcykgewogICAgICAgICAgICAgICAg ICAgICAvLyBDaGVjayBpZiBTYW5lQ2hhaW4gd2lsbCB3b3JrIG9uIGEgcGVyLXR5cGUgYmFzaXMu IE5vdGUgdGhhdDoKICAgICAgICAgICAgICAgICAgICAgLy8KICAgICAgICAgICAgICAgICAgICAg Ly8gMSkgV2UgZG9uJ3Qgd2FudCBkb3VibGUgYXJyYXlzIHRvIHNvbWV0aW1lcyByZXR1cm4gdW5k ZWZpbmVkLCBzaW5jZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklULmNwcAppbmRleCBkMThiMTAyYTQwYjYyMzY0YTQwZDE0NjU1YjQwNzc3MWQyNDI1NGEw Li4wZjNmYjcyY2JjMzU2NjAwYWJjMzZkM2FjNGFiN2ZlMTQ2MjQyMjhjIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcApAQCAtNzQ1LDYgKzc0 NSw3IEBAIEpJVENvbXBpbGVyOjpKdW1wTGlzdCBTcGVjdWxhdGl2ZUpJVDo6anVtcFNsb3dGb3JV bndhbnRlZEFycmF5TW9kZShHUFJSZWcgdGVtcEdQCiAgICAgICAgIEluZGV4aW5nVHlwZSBzaGFw ZSA9IGFycmF5TW9kZS5zaGFwZU1hc2soKTsKICAgICAgICAgc3dpdGNoIChhcnJheU1vZGUuYXJy YXlDbGFzcygpKSB7CiAgICAgICAgIGNhc2UgQXJyYXk6Ok9yaWdpbmFsQXJyYXk6CisgICAgICAg IGNhc2UgQXJyYXk6Ok9yaWdpbmFsQ29weU9uV3JpdGVBcnJheToKICAgICAgICAgICAgIFJFTEVB U0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogCkBA IC03NzYsNiArNzc3LDcgQEAgSklUQ29tcGlsZXI6Okp1bXBMaXN0IFNwZWN1bGF0aXZlSklUOjpq dW1wU2xvd0ZvclVud2FudGVkQXJyYXlNb2RlKEdQUlJlZyB0ZW1wR1AKIAogICAgICAgICBzd2l0 Y2ggKGFycmF5TW9kZS5hcnJheUNsYXNzKCkpIHsKICAgICAgICAgY2FzZSBBcnJheTo6T3JpZ2lu YWxBcnJheToKKyAgICAgICAgY2FzZSBBcnJheTo6T3JpZ2luYWxDb3B5T25Xcml0ZUFycmF5Ogog ICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIHJl dHVybiByZXN1bHQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRM TG93ZXJERkdUb0IzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdU b0IzLmNwcAppbmRleCBkOThhOGQ4MGI2YzU5MWZjOGIzYzhhMTkyMmIzNWViOWQ3M2IxMDMwLi5h ZGY5Yzk5Njc3NzkzMDcxZGIzZWVmOTFjYWUzNGQ0ODVkZDU2MjU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCkBAIC0xNTAzNCw2ICsxNTAzNCw3 IEBAIHByaXZhdGU6CiAKICAgICAgICAgICAgIHN3aXRjaCAoYXJyYXlNb2RlLmFycmF5Q2xhc3Mo KSkgewogICAgICAgICAgICAgY2FzZSBBcnJheTo6T3JpZ2luYWxBcnJheToKKyAgICAgICAgICAg IGNhc2UgQXJyYXk6Ok9yaWdpbmFsQ29weU9uV3JpdGVBcnJheToKICAgICAgICAgICAgICAgICBE RkdfQ1JBU0gobV9ncmFwaCwgbV9ub2RlLCAiVW5leHBlY3RlZCBvcmlnaW5hbCBhcnJheSIpOwog ICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC0xNTA3NSw2ICsxNTA3Niw3IEBA IHByaXZhdGU6CiAgICAgICAgICAgICBMQmFzaWNCbG9jayBsYXN0TmV4dCA9IG1fb3V0LmFwcGVu ZFRvKGNoZWNrQ2FzZSwgdHJ1ZUNhc2UpOwogICAgICAgICAgICAgc3dpdGNoIChhcnJheU1vZGUu YXJyYXlDbGFzcygpKSB7CiAgICAgICAgICAgICBjYXNlIEFycmF5OjpPcmlnaW5hbEFycmF5Ogor ICAgICAgICAgICAgY2FzZSBBcnJheTo6T3JpZ2luYWxDb3B5T25Xcml0ZUFycmF5OgogICAgICAg ICAgICAgICAgIERGR19DUkFTSChtX2dyYXBoLCBtX25vZGUsICJVbmV4cGVjdGVkIG9yaWdpbmFs IGFycmF5Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAK