182404 2018-02-01 13:18:22 -0800 Fix crashes due to mishandling custom sections. 2018-05-01 08:22:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller commit-queue ews-watchlist jfbastien mark.lam msaboff natashenka saam webkit-bug-importer oldest_to_newest 1395608 0 keith_miller 2018-02-01 13:18:22 -0800 Fix crashes due to mishandling custom sections. 1395614 1 332906 keith_miller 2018-02-01 13:43:30 -0800 Created attachment 332906 Patch 1395615 2 keith_miller 2018-02-01 13:44:18 -0800 rdar://problem/36935863 1395629 3 332906 saam 2018-02-01 14:12:29 -0800 Comment on attachment 332906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332906&action=review r=me > Source/JavaScriptCore/wasm/WasmModuleParser.cpp:58 > + // This is not really a known section extra space > Source/JavaScriptCore/wasm/WasmSections.h:55 > + // It's important that Begin is less than every other section number and that Custom is greater. > + // This only works because section numbers are currently monotonically increasing and we don't support > + // any custom sections. Also, Begin is not a real section but is used as a marker for validating the ordering > + // of sections. > + Begin = 0, static_assert please 1395630 4 332906 jfbastien 2018-02-01 14:14:00 -0800 Comment on attachment 332906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332906&action=review r=me > Source/JavaScriptCore/wasm/WasmSections.h:53 > + // any custom sections. Also, Begin is not a real section but is used as a marker for validating the ordering We support the "name" custom section. > Source/JavaScriptCore/wasm/WasmSections.h:77 > + if (!sectionByte) Compare to static_cast<uint8_t>(Section::Custom) instead? 1395633 5 332906 keith_miller 2018-02-01 14:18:42 -0800 Comment on attachment 332906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332906&action=review >> Source/JavaScriptCore/wasm/WasmSections.h:53 >> + // any custom sections. Also, Begin is not a real section but is used as a marker for validating the ordering > > We support the "name" custom section. Oh right, I'll change the comment. >> Source/JavaScriptCore/wasm/WasmSections.h:55 >> + Begin = 0, > > static_assert please What static assert are you looking for? Begin < Type? >> Source/JavaScriptCore/wasm/WasmSections.h:77 >> + if (!sectionByte) > > Compare to static_cast<uint8_t>(Section::Custom) instead? That would be incorrect... 1395659 6 332914 keith_miller 2018-02-01 15:22:45 -0800 Created attachment 332914 Patch for landing 1395735 7 keith_miller 2018-02-01 20:30:42 -0800 Committed r227994: <https://trac.webkit.org/changeset/227994> 1419300 8 bfulgham 2018-05-01 08:22:59 -0700 *** Bug 182208 has been marked as a duplicate of this bug. *** 332906 2018-02-01 13:43:30 -0800 2018-02-01 15:22:42 -0800 Patch bug-182404-20180201134329.patch text/plain 9849 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy OGMxNzQzZTkzN2M1MzgxZTMzOGRmNWQ1NjJkOTRiNzVmNDI5OGUyLi5jZDc5OTRiZjg3ODc1MzU5 OTdjZmIwYWNhN2MyNmI3ZDY3MzVhNzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wMi0wMSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggY3Jhc2hlcyBkdWUgdG8gbWlzaGFuZGxpbmcgY3VzdG9tIHNl Y3Rpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTgyNDA0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjkzNTg2Mz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFsc28gY2xlYW5zIHVwIHNv bWUgb2Ygb3VyIHZhbGlkYXRpb24gY29kZS4gV2UgYWxzbworICAgICAgICBtaXN0YWtlbmx5LCBh bGxvd2VkIHVua25vd24gKGRpZmZlcmVudCBmcm9tIGN1c3RvbSBzZWN0aW9ucyB3aXRoCisgICAg ICAgIGlkOiAwKSBzZWN0aW9uIGlkcy4KKworICAgICAgICAqIHdhc20vV2FzbU1vZHVsZVBhcnNl ci5jcHA6CisgICAgICAgIChKU0M6Oldhc206Ok1vZHVsZVBhcnNlcjo6cGFyc2UpOgorICAgICAg ICAqIHdhc20vV2FzbU1vZHVsZVBhcnNlci5oOgorICAgICAgICAqIHdhc20vV2FzbVNlY3Rpb25z Lmg6CisgICAgICAgIChKU0M6Oldhc206OmlzS25vd25TZWN0aW9uKToKKyAgICAgICAgKEpTQzo6 V2FzbTo6ZGVjb2RlU2VjdGlvbik6CisgICAgICAgIChKU0M6Oldhc206OnZhbGlkYXRlT3JkZXIp OgorICAgICAgICAoSlNDOjpXYXNtOjptYWtlU3RyaW5nKToKKyAgICAgICAgKEpTQzo6V2FzbTo6 aXNWYWxpZFNlY3Rpb24pOiBEZWxldGVkLgorCiAyMDE4LTAxLTMxICBTYWFtIEJhcmF0aSAgPHNi YXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIEpTQyBpbmNvcnJlY3RseSBpbnRlcnByZXRpbmcg c2NyaXB0LCBzZXRzIEdsb2JhbCBQcm9wZXJ0eSBpbnN0ZWFkIG9mIEdsb2JhbCBMZXhpY2FsIHZh cmlhYmxlIChMaXRlcmFsUGFyc2VyIC8gSlNPTlAgcGF0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL1dhc21Nb2R1bGVQYXJzZXIuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3dhc20vV2FzbU1vZHVsZVBhcnNlci5jcHAKaW5kZXggYTA5ODc4OWZhMDBlYTg4ZTkz MjJmZmFhOTgwOGNkNTdlZjJiNjY1NS4uYzIyODAyMzFkNGQxNzc1Y2U4NmJkY2EyZTY3ZGY5Mjll NTYzNDU4MyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVs ZVBhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBh cnNlci5jcHAKQEAgLTU1LDIwICs1NSwxOSBAQCBhdXRvIE1vZHVsZVBhcnNlcjo6cGFyc2UoKSAt PiBSZXN1bHQKICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFwYXJzZVVJbnQzMih2ZXJzaW9uTnVt YmVyKSwgImNhbid0IHBhcnNlIHZlcnNpb24gbnVtYmVyIik7CiAgICAgV0FTTV9QQVJTRVJfRkFJ TF9JRih2ZXJzaW9uTnVtYmVyICE9IGV4cGVjdGVkVmVyc2lvbk51bWJlciwgInVuZXhwZWN0ZWQg dmVyc2lvbiBudW1iZXIgIiwgdmVyc2lvbk51bWJlciwgIiBleHBlY3RlZCAiLCBleHBlY3RlZFZl cnNpb25OdW1iZXIpOwogCi0gICAgU2VjdGlvbiBwcmV2aW91c1NlY3Rpb24gPSBTZWN0aW9uOjpD dXN0b207CisgICAgLy8gVGhpcyBpcyAgbm90IHJlYWxseSBhIGtub3duIHNlY3Rpb24KKyAgICBT ZWN0aW9uIHByZXZpb3VzS25vd25TZWN0aW9uID0gU2VjdGlvbjo6QmVnaW47CiAgICAgd2hpbGUg KG1fb2Zmc2V0IDwgbGVuZ3RoKCkpIHsKICAgICAgICAgdWludDhfdCBzZWN0aW9uQnl0ZTsKIAog ICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFwYXJzZVVJbnQ3KHNlY3Rpb25CeXRlKSwgImNh bid0IGdldCBzZWN0aW9uIGJ5dGUiKTsKIAogICAgICAgICBTZWN0aW9uIHNlY3Rpb24gPSBTZWN0 aW9uOjpDdXN0b207Ci0gICAgICAgIGlmIChzZWN0aW9uQnl0ZSkgewotICAgICAgICAgICAgaWYg KGlzVmFsaWRTZWN0aW9uKHNlY3Rpb25CeXRlKSkKLSAgICAgICAgICAgICAgICBzZWN0aW9uID0g c3RhdGljX2Nhc3Q8U2VjdGlvbj4oc2VjdGlvbkJ5dGUpOwotICAgICAgICB9CisgICAgICAgIFdB U01fUEFSU0VSX0ZBSUxfSUYoIWRlY29kZVNlY3Rpb24oc2VjdGlvbkJ5dGUsIHNlY3Rpb24pKTsK KyAgICAgICAgQVNTRVJUKHNlY3Rpb24gIT0gU2VjdGlvbjo6QmVnaW4pOwogCiAgICAgICAgIHVp bnQzMl90IHNlY3Rpb25MZW5ndGg7Ci0gICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYoIXZhbGlk YXRlT3JkZXIocHJldmlvdXNTZWN0aW9uLCBzZWN0aW9uKSwgImludmFsaWQgc2VjdGlvbiBvcmRl ciwgIiwgcHJldmlvdXNTZWN0aW9uLCAiIGZvbGxvd2VkIGJ5ICIsIHNlY3Rpb24pOworICAgICAg ICBXQVNNX1BBUlNFUl9GQUlMX0lGKCF2YWxpZGF0ZU9yZGVyKHByZXZpb3VzS25vd25TZWN0aW9u LCBzZWN0aW9uKSwgImludmFsaWQgc2VjdGlvbiBvcmRlciwgIiwgcHJldmlvdXNLbm93blNlY3Rp b24sICIgZm9sbG93ZWQgYnkgIiwgc2VjdGlvbik7CiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxf SUYoIXBhcnNlVmFyVUludDMyKHNlY3Rpb25MZW5ndGgpLCAiY2FuJ3QgZ2V0ICIsIHNlY3Rpb24s ICIgc2VjdGlvbidzIGxlbmd0aCIpOwogICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKHNlY3Rp b25MZW5ndGggPiBsZW5ndGgoKSAtIG1fb2Zmc2V0LCBzZWN0aW9uLCAic2VjdGlvbiBvZiBzaXpl ICIsIHNlY3Rpb25MZW5ndGgsICIgd291bGQgb3ZlcmZsb3cgTW9kdWxlJ3Mgc2l6ZSIpOwogCkBA IC04MCwxOCArNzksMjUgQEAgYXV0byBNb2R1bGVQYXJzZXI6OnBhcnNlKCkgLT4gUmVzdWx0CiAg ICAgICAgICAgICBXQVNNX0ZBSUxfSUZfSEVMUEVSX0ZBSUxTKHBhcnNlICMjIE5BTUUoKSk7ICAg ICAgICAgICAgIFwKICAgICAgICAgICAgIGJyZWFrOyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICB9Ci0gICAgICAgIEZPUl9FQUNIX1dB U01fU0VDVElPTihXQVNNX1NFQ1RJT05fUEFSU0UpCisgICAgICAgIEZPUl9FQUNIX0tOT1dOX1dB U01fU0VDVElPTihXQVNNX1NFQ1RJT05fUEFSU0UpCiAjdW5kZWYgV0FTTV9TRUNUSU9OX1BBUlNF CiAKICAgICAgICAgY2FzZSBTZWN0aW9uOjpDdXN0b206IHsKICAgICAgICAgICAgIFdBU01fRkFJ TF9JRl9IRUxQRVJfRkFJTFMocGFyc2VDdXN0b20oc2VjdGlvbkxlbmd0aCkpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KKworICAgICAgICBjYXNlIFNlY3Rpb246OkJlZ2luOiB7Cisg ICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYo ZW5kICE9IG1fb2Zmc2V0LCAicGFyc2luZyBlbmRlZCBiZWZvcmUgdGhlIGVuZCBvZiAiLCBzZWN0 aW9uLCAiIHNlY3Rpb24iKTsKIAotICAgICAgICBwcmV2aW91c1NlY3Rpb24gPSBzZWN0aW9uOwor CisgICAgICAgIGlmIChpc0tub3duU2VjdGlvbihzZWN0aW9uKSkKKyAgICAgICAgICAgIHByZXZp b3VzS25vd25TZWN0aW9uID0gc2VjdGlvbjsKICAgICB9CiAKICAgICByZXR1cm4geyB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBhcnNlci5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBhcnNlci5oCmluZGV4IDVhZDIx MDA4M2U1ZmQ1NWEyMjUzMjlkYThmMjJjYTFiMGU0ZjM1MjEuLmE2NTFiZTE3Y2UyM2I4NWZiYjk3 YmJiNjg1NzAzYjM5YjY0YjcyYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL1dhc21Nb2R1bGVQYXJzZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X YXNtTW9kdWxlUGFyc2VyLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogcHJpdmF0ZToKIAog I2RlZmluZSBXQVNNX1NFQ1RJT05fREVDTEFSRV9QQVJTRVIoTkFNRSwgSUQsIERFU0NSSVBUSU9O KSBQYXJ0aWFsUmVzdWx0IFdBUk5fVU5VU0VEX1JFVFVSTiBwYXJzZSAjIyBOQU1FKCk7Ci0gICAg Rk9SX0VBQ0hfV0FTTV9TRUNUSU9OKFdBU01fU0VDVElPTl9ERUNMQVJFX1BBUlNFUikKKyAgICBG T1JfRUFDSF9LTk9XTl9XQVNNX1NFQ1RJT04oV0FTTV9TRUNUSU9OX0RFQ0xBUkVfUEFSU0VSKQog I3VuZGVmIFdBU01fU0VDVElPTl9ERUNMQVJFX1BBUlNFUgogCiAgICAgUGFydGlhbFJlc3VsdCBX QVJOX1VOVVNFRF9SRVRVUk4gcGFyc2VDdXN0b20odWludDMyX3QpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbVNlY3Rpb25zLmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvd2FzbS9XYXNtU2VjdGlvbnMuaAppbmRleCBmNjM1YzgxOWEzNTdiMTAzOGJlYTIzNTgy M2ZiM2FjOTUyYzdjNzE5Li45MmVhMzM0NGFhNzM4OTZjYjYzMWJlMzYyZTBhODRmODNmZmZjNGM3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtU2VjdGlvbnMuaAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtU2VjdGlvbnMuaApAQCAtMzQsNyAr MzQsNyBAQAogCiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIFdhc20gewogCi0jZGVmaW5lIEZP Ul9FQUNIX1dBU01fU0VDVElPTihtYWNybykgXAorI2RlZmluZSBGT1JfRUFDSF9LTk9XTl9XQVNN X1NFQ1RJT04obWFjcm8pIFwKICAgICBtYWNybyhUeXBlLCAgICAgMSwgIkZ1bmN0aW9uIHNpZ25h dHVyZSBkZWNsYXJhdGlvbnMiKSBcCiAgICAgbWFjcm8oSW1wb3J0LCAgIDIsICJJbXBvcnQgZGVj bGFyYXRpb25zIikgXAogICAgIG1hY3JvKEZ1bmN0aW9uLCAzLCAiRnVuY3Rpb24gZGVjbGFyYXRp b25zIikgXApAQCAtNDgsMzggKzQ4LDU3IEBAIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgV2Fz bSB7CiAgICAgbWFjcm8oRGF0YSwgICAgMTEsICJEYXRhIHNlZ21lbnRzIikKIAogZW51bSBjbGFz cyBTZWN0aW9uIDogdWludDhfdCB7CisgICAgLy8gSXQncyBpbXBvcnRhbnQgdGhhdCBCZWdpbiBp cyBsZXNzIHRoYW4gZXZlcnkgb3RoZXIgc2VjdGlvbiBudW1iZXIgYW5kIHRoYXQgQ3VzdG9tIGlz IGdyZWF0ZXIuCisgICAgLy8gVGhpcyBvbmx5IHdvcmtzIGJlY2F1c2Ugc2VjdGlvbiBudW1iZXJz IGFyZSBjdXJyZW50bHkgbW9ub3RvbmljYWxseSBpbmNyZWFzaW5nIGFuZCB3ZSBkb24ndCBzdXBw b3J0CisgICAgLy8gYW55IGN1c3RvbSBzZWN0aW9ucy4gQWxzbywgQmVnaW4gaXMgbm90IGEgcmVh bCBzZWN0aW9uIGJ1dCBpcyB1c2VkIGFzIGEgbWFya2VyIGZvciB2YWxpZGF0aW5nIHRoZSBvcmRl cmluZworICAgIC8vIG9mIHNlY3Rpb25zLgorICAgIEJlZ2luID0gMCwKICNkZWZpbmUgREVGSU5F X1dBU01fU0VDVElPTl9FTlVNKE5BTUUsIElELCBERVNDUklQVElPTikgTkFNRSA9IElELAotICAg IEZPUl9FQUNIX1dBU01fU0VDVElPTihERUZJTkVfV0FTTV9TRUNUSU9OX0VOVU0pCisgICAgRk9S X0VBQ0hfS05PV05fV0FTTV9TRUNUSU9OKERFRklORV9XQVNNX1NFQ1RJT05fRU5VTSkKICN1bmRl ZiBERUZJTkVfV0FTTV9TRUNUSU9OX0VOVU0KICAgICBDdXN0b20KIH07CiAKIHRlbXBsYXRlPHR5 cGVuYW1lIEludD4KLXN0YXRpYyBpbmxpbmUgYm9vbCBpc1ZhbGlkU2VjdGlvbihJbnQgc2VjdGlv bikKK2lubGluZSBib29sIGlzS25vd25TZWN0aW9uKEludCBzZWN0aW9uKQogewogICAgIHN3aXRj aCAoc2VjdGlvbikgewogI2RlZmluZSBWQUxJREFURV9TRUNUSU9OKE5BTUUsIElELCBERVNDUklQ VElPTikgY2FzZSBzdGF0aWNfY2FzdDxJbnQ+KFNlY3Rpb246Ok5BTUUpOiByZXR1cm4gdHJ1ZTsK LSAgICAgICAgRk9SX0VBQ0hfV0FTTV9TRUNUSU9OKFZBTElEQVRFX1NFQ1RJT04pCisgICAgICAg IEZPUl9FQUNIX0tOT1dOX1dBU01fU0VDVElPTihWQUxJREFURV9TRUNUSU9OKQogI3VuZGVmIFZB TElEQVRFX1NFQ1RJT04KICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fQogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgdmFsaWRhdGVPcmRlcihTZWN0aW9uIHByZXZpb3Vz LCBTZWN0aW9uIG5leHQpCitpbmxpbmUgYm9vbCBkZWNvZGVTZWN0aW9uKHVpbnQ4X3Qgc2VjdGlv bkJ5dGUsIFNlY3Rpb24mIHNlY3Rpb24pCiB7Ci0gICAgaWYgKHByZXZpb3VzID09IFNlY3Rpb246 OkN1c3RvbSkKKyAgICBzZWN0aW9uID0gU2VjdGlvbjo6Q3VzdG9tOworICAgIGlmICghc2VjdGlv bkJ5dGUpCiAgICAgICAgIHJldHVybiB0cnVlOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDx1aW50 OF90PihwcmV2aW91cykgPCBzdGF0aWNfY2FzdDx1aW50OF90PihuZXh0KTsKKworICAgIGlmICgh aXNLbm93blNlY3Rpb24oc2VjdGlvbkJ5dGUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBzZWN0aW9uID0gc3RhdGljX2Nhc3Q8U2VjdGlvbj4oc2VjdGlvbkJ5dGUpOworICAgIHJldHVy biB0cnVlOworfQorCitpbmxpbmUgYm9vbCB2YWxpZGF0ZU9yZGVyKFNlY3Rpb24gcHJldmlvdXNL bm93biwgU2VjdGlvbiBuZXh0KQoreworICAgIEFTU0VSVChpc0tub3duU2VjdGlvbihwcmV2aW91 c0tub3duKSB8fCBwcmV2aW91c0tub3duID09IFNlY3Rpb246OkJlZ2luKTsKKyAgICByZXR1cm4g c3RhdGljX2Nhc3Q8dWludDhfdD4ocHJldmlvdXNLbm93bikgPCBzdGF0aWNfY2FzdDx1aW50OF90 PihuZXh0KTsKIH0KIAotc3RhdGljIGlubGluZSBjb25zdCBjaGFyKiBtYWtlU3RyaW5nKFNlY3Rp b24gc2VjdGlvbikKK2lubGluZSBjb25zdCBjaGFyKiBtYWtlU3RyaW5nKFNlY3Rpb24gc2VjdGlv bikKIHsKICAgICBzd2l0Y2ggKHNlY3Rpb24pIHsKKyAgICBjYXNlIFNlY3Rpb246OkJlZ2luOgor ICAgICAgICByZXR1cm4gIkJlZ2luIjsKICAgICBjYXNlIFNlY3Rpb246OkN1c3RvbToKICAgICAg ICAgcmV0dXJuICJDdXN0b20iOwogI2RlZmluZSBTVFJJTkdJRllfU0VDVElPTl9OQU1FKE5BTUUs IElELCBERVNDUklQVElPTikgY2FzZSBTZWN0aW9uOjpOQU1FOiByZXR1cm4gI05BTUU7Ci0gICAg ICAgIEZPUl9FQUNIX1dBU01fU0VDVElPTihTVFJJTkdJRllfU0VDVElPTl9OQU1FKQorICAgICAg ICBGT1JfRUFDSF9LTk9XTl9XQVNNX1NFQ1RJT04oU1RSSU5HSUZZX1NFQ1RJT05fTkFNRSkKICN1 bmRlZiBTVFJJTkdJRllfU0VDVElPTl9OQU1FCiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwpp bmRleCA4YmVjNDgwOTg2NjMzMjVhZjM5ZDY3ZDY0ZWE4MmU2ZTA1NjY1ZmE5Li5lY2VjYTE2Yjg5 MTgwNjEyZDBhYzEyNzgxMWUzNDhkNzIwYjRhZGY2IDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5n ZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTAyLTAx ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBj cmFzaGVzIGR1ZSB0byBtaXNoYW5kbGluZyBjdXN0b20gc2VjdGlvbnMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI0MDQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzM2OTM1ODYzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogd2FzbS9CdWlsZGVyLmpzOgorICAgICAgICAoZXhwb3J0LmRlZmF1bHQu QnVpbGRlci5wcm90b3R5cGUuX3JlZ2lzdGVyU2VjdGlvbkJ1aWxkZXJzLmNvbnN0LnNlY3Rpb24u aW4uV0FTTS5kZXNjcmlwdGlvbi5zZWN0aW9uLnN3aXRjaC5zZWN0aW9uLmNhc2Uuc3RyaW5nX2Fw cGVhcmVkX2hlcmUudGhpcy5zZWN0aW9uKToKKyAgICAgICAgKiB3YXNtL2pzLWFwaS92YWxpZGF0 ZS5qczoKKyAgICAgICAgKGFzc2VydC50cnV0aHkpOgorCiAyMDE4LTAxLTMxICBTYWFtIEJhcmF0 aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIEpTQyBpbmNvcnJlY3RseSBpbnRlcnBy ZXRpbmcgc2NyaXB0LCBzZXRzIEdsb2JhbCBQcm9wZXJ0eSBpbnN0ZWFkIG9mIEdsb2JhbCBMZXhp Y2FsIHZhcmlhYmxlIChMaXRlcmFsUGFyc2VyIC8gSlNPTlAgcGF0aCkKZGlmZiAtLWdpdCBhL0pT VGVzdHMvd2FzbS9CdWlsZGVyLmpzIGIvSlNUZXN0cy93YXNtL0J1aWxkZXIuanMKaW5kZXggMDRh ZGY4YTc0NDllODI2MGI1YTFiNWFhNTMxYjJhNDMwNWY0ZjA1OS4uNzJlNzg4ZTUxOTdiZGU5ZjA2 ZDczN2Q1ZjM2OTc0NzEyNmVmZGRjOSAxMDA2NDQKLS0tIGEvSlNUZXN0cy93YXNtL0J1aWxkZXIu anMKKysrIGIvSlNUZXN0cy93YXNtL0J1aWxkZXIuanMKQEAgLTU3NSw3ICs1NzUsNyBAQCBleHBv cnQgZGVmYXVsdCBjbGFzcyBCdWlsZGVyIHsKIAogICAgICAgICAgICAgY2FzZSAiRWxlbWVudCI6 CiAgICAgICAgICAgICAgICAgdGhpc1tzZWN0aW9uXSA9IGZ1bmN0aW9uKC4uLmFyZ3MpIHsKLSAg ICAgICAgICAgICAgICAgICAgaWYgKGFyZ3MubGVuZ3RoICE9PSAwKQorICAgICAgICAgICAgICAg ICAgICBpZiAoYXJncy5sZW5ndGggIT09IDAgJiYgdGhpcy5fY2hlY2tlZCkKICAgICAgICAgICAg ICAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiWW91J3JlIGRvaW5nIGl0IHdyb25nLiBUaGlz IGVsZW1lbnQgZG9lcyBub3QgdGFrZSBhcmd1bWVudHMuIFlvdSBtdXN0IGNoYWluIHRoZSBjYWxs IHdpdGggYW5vdGhlciBFbGVtZW50KCkiKTsKIAogICAgICAgICAgICAgICAgICAgICBjb25zdCBz ID0gdGhpcy5fYWRkU2VjdGlvbihzZWN0aW9uKTsKZGlmZiAtLWdpdCBhL0pTVGVzdHMvd2FzbS9q cy1hcGkvdmFsaWRhdGUuanMgYi9KU1Rlc3RzL3dhc20vanMtYXBpL3ZhbGlkYXRlLmpzCmluZGV4 IDhmNGU4YTM0ZTZiZWQwM2NmNGQ1YjJkODg0OTdjZThkZGY2ZGU5NWMuLjRmZTgzYzI4NjljNWJi MjQxZGI5MWRlMGNhODY2NmY5MjU4NTlhOTggMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvd2FzbS9qcy1h cGkvdmFsaWRhdGUuanMKKysrIGIvSlNUZXN0cy93YXNtL2pzLWFwaS92YWxpZGF0ZS5qcwpAQCAt MjksMyArMjksMTkgQEAgYXNzZXJ0LmVxKFdlYkFzc2VtYmx5LnZhbGlkYXRlLmxlbmd0aCwgMSk7 CiAKICAgICBhc3NlcnQudHJ1dGh5KFdlYkFzc2VtYmx5LnZhbGlkYXRlKGJ1aWxkZXIuV2ViQXNz ZW1ibHkoKS5nZXQoKSkpOwogfQorCit7CisgICAgY29uc3QgYnVpbGRlciA9IChuZXcgQnVpbGRl cigpKTsKKyAgICBidWlsZGVyLnNldENoZWNrZWQoZmFsc2UpOworCisgICAgYnVpbGRlci5UeXBl KCkuRW5kKCkKKyAgICAgICAgLkltcG9ydCgpLk1lbW9yeSgiaW1wIiwgIm1lbW9yeSIsIHtpbml0 aWFsOiAyMH0pLkVuZCgpCisgICAgICAgIC5Vbmtub3duKCJ0ZXN0IikuRW5kKCkKKyAgICAgICAg LkltcG9ydCgpLk1lbW9yeSgiaW1wIiwgIm1lbW9yeSIsIHtpbml0aWFsOiAyMH0pLkVuZCgpCisg ICAgICAgIC5GdW5jdGlvbigpLkVuZCgpCisgICAgICAgIC5FeHBvcnQoKS5FbmQoKQorICAgICAg ICAuQ29kZSgpCisgICAgICAgIC5FbmQoKTsKKworICAgIGFzc2VydC5mYWxzeShXZWJBc3NlbWJs eS52YWxpZGF0ZShidWlsZGVyLldlYkFzc2VtYmx5KCkuZ2V0KCkpKTsKK30K 332914 2018-02-01 15:22:45 -0800 2018-02-01 15:22:45 -0800 Patch for landing bug-182404-20180201152243.patch text/plain 9947 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy OGMxNzQzZTkzN2M1MzgxZTMzOGRmNWQ1NjJkOTRiNzVmNDI5OGUyLi4zNzUxN2Q1ZTc2NTUzZDAz Y2FhMjJlMDM4ZTc5ZjI4YjYyM2IyZDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wMi0wMSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggY3Jhc2hlcyBkdWUgdG8gbWlzaGFuZGxpbmcgY3VzdG9tIHNl Y3Rpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTgyNDA0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjkzNTg2Mz4KKworICAgICAgICBSZXZp ZXdlZCBieSBTYWFtIEJhcmF0aS4KKworICAgICAgICBUaGlzIGFsc28gY2xlYW5zIHVwIHNvbWUg b2Ygb3VyIHZhbGlkYXRpb24gY29kZS4gV2UgYWxzbworICAgICAgICBtaXN0YWtlbmx5LCBhbGxv d2VkIHVua25vd24gKGRpZmZlcmVudCBmcm9tIGN1c3RvbSBzZWN0aW9ucyB3aXRoCisgICAgICAg IGlkOiAwKSBzZWN0aW9uIGlkcy4KKworICAgICAgICAqIHdhc20vV2FzbU1vZHVsZVBhcnNlci5j cHA6CisgICAgICAgIChKU0M6Oldhc206Ok1vZHVsZVBhcnNlcjo6cGFyc2UpOgorICAgICAgICAq IHdhc20vV2FzbU1vZHVsZVBhcnNlci5oOgorICAgICAgICAqIHdhc20vV2FzbVNlY3Rpb25zLmg6 CisgICAgICAgIChKU0M6Oldhc206OmlzS25vd25TZWN0aW9uKToKKyAgICAgICAgKEpTQzo6V2Fz bTo6ZGVjb2RlU2VjdGlvbik6CisgICAgICAgIChKU0M6Oldhc206OnZhbGlkYXRlT3JkZXIpOgor ICAgICAgICAoSlNDOjpXYXNtOjptYWtlU3RyaW5nKToKKyAgICAgICAgKEpTQzo6V2FzbTo6aXNW YWxpZFNlY3Rpb24pOiBEZWxldGVkLgorCiAyMDE4LTAxLTMxICBTYWFtIEJhcmF0aSAgPHNiYXJh dGlAYXBwbGUuY29tPgogCiAgICAgICAgIEpTQyBpbmNvcnJlY3RseSBpbnRlcnByZXRpbmcgc2Ny aXB0LCBzZXRzIEdsb2JhbCBQcm9wZXJ0eSBpbnN0ZWFkIG9mIEdsb2JhbCBMZXhpY2FsIHZhcmlh YmxlIChMaXRlcmFsUGFyc2VyIC8gSlNPTlAgcGF0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL1dhc21Nb2R1bGVQYXJzZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vV2FzbU1vZHVsZVBhcnNlci5jcHAKaW5kZXggYTA5ODc4OWZhMDBlYTg4ZTkzMjJm ZmFhOTgwOGNkNTdlZjJiNjY1NS4uMzgyZTZjMThhODU3MDZiNGI5YjIzNmQ1MTYyNzBiNzE3NzMz YmJhOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBh cnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBhcnNl ci5jcHAKQEAgLTU1LDIwICs1NSwxOSBAQCBhdXRvIE1vZHVsZVBhcnNlcjo6cGFyc2UoKSAtPiBS ZXN1bHQKICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFwYXJzZVVJbnQzMih2ZXJzaW9uTnVtYmVy KSwgImNhbid0IHBhcnNlIHZlcnNpb24gbnVtYmVyIik7CiAgICAgV0FTTV9QQVJTRVJfRkFJTF9J Rih2ZXJzaW9uTnVtYmVyICE9IGV4cGVjdGVkVmVyc2lvbk51bWJlciwgInVuZXhwZWN0ZWQgdmVy c2lvbiBudW1iZXIgIiwgdmVyc2lvbk51bWJlciwgIiBleHBlY3RlZCAiLCBleHBlY3RlZFZlcnNp b25OdW1iZXIpOwogCi0gICAgU2VjdGlvbiBwcmV2aW91c1NlY3Rpb24gPSBTZWN0aW9uOjpDdXN0 b207CisgICAgLy8gVGhpcyBpcyBub3QgcmVhbGx5IGEga25vd24gc2VjdGlvbi4KKyAgICBTZWN0 aW9uIHByZXZpb3VzS25vd25TZWN0aW9uID0gU2VjdGlvbjo6QmVnaW47CiAgICAgd2hpbGUgKG1f b2Zmc2V0IDwgbGVuZ3RoKCkpIHsKICAgICAgICAgdWludDhfdCBzZWN0aW9uQnl0ZTsKIAogICAg ICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFwYXJzZVVJbnQ3KHNlY3Rpb25CeXRlKSwgImNhbid0 IGdldCBzZWN0aW9uIGJ5dGUiKTsKIAogICAgICAgICBTZWN0aW9uIHNlY3Rpb24gPSBTZWN0aW9u OjpDdXN0b207Ci0gICAgICAgIGlmIChzZWN0aW9uQnl0ZSkgewotICAgICAgICAgICAgaWYgKGlz VmFsaWRTZWN0aW9uKHNlY3Rpb25CeXRlKSkKLSAgICAgICAgICAgICAgICBzZWN0aW9uID0gc3Rh dGljX2Nhc3Q8U2VjdGlvbj4oc2VjdGlvbkJ5dGUpOwotICAgICAgICB9CisgICAgICAgIFdBU01f UEFSU0VSX0ZBSUxfSUYoIWRlY29kZVNlY3Rpb24oc2VjdGlvbkJ5dGUsIHNlY3Rpb24pKTsKKyAg ICAgICAgQVNTRVJUKHNlY3Rpb24gIT0gU2VjdGlvbjo6QmVnaW4pOwogCiAgICAgICAgIHVpbnQz Ml90IHNlY3Rpb25MZW5ndGg7Ci0gICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYoIXZhbGlkYXRl T3JkZXIocHJldmlvdXNTZWN0aW9uLCBzZWN0aW9uKSwgImludmFsaWQgc2VjdGlvbiBvcmRlciwg IiwgcHJldmlvdXNTZWN0aW9uLCAiIGZvbGxvd2VkIGJ5ICIsIHNlY3Rpb24pOworICAgICAgICBX QVNNX1BBUlNFUl9GQUlMX0lGKCF2YWxpZGF0ZU9yZGVyKHByZXZpb3VzS25vd25TZWN0aW9uLCBz ZWN0aW9uKSwgImludmFsaWQgc2VjdGlvbiBvcmRlciwgIiwgcHJldmlvdXNLbm93blNlY3Rpb24s ICIgZm9sbG93ZWQgYnkgIiwgc2VjdGlvbik7CiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYo IXBhcnNlVmFyVUludDMyKHNlY3Rpb25MZW5ndGgpLCAiY2FuJ3QgZ2V0ICIsIHNlY3Rpb24sICIg c2VjdGlvbidzIGxlbmd0aCIpOwogICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKHNlY3Rpb25M ZW5ndGggPiBsZW5ndGgoKSAtIG1fb2Zmc2V0LCBzZWN0aW9uLCAic2VjdGlvbiBvZiBzaXplICIs IHNlY3Rpb25MZW5ndGgsICIgd291bGQgb3ZlcmZsb3cgTW9kdWxlJ3Mgc2l6ZSIpOwogCkBAIC04 MCwxOCArNzksMjUgQEAgYXV0byBNb2R1bGVQYXJzZXI6OnBhcnNlKCkgLT4gUmVzdWx0CiAgICAg ICAgICAgICBXQVNNX0ZBSUxfSUZfSEVMUEVSX0ZBSUxTKHBhcnNlICMjIE5BTUUoKSk7ICAgICAg ICAgICAgIFwKICAgICAgICAgICAgIGJyZWFrOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICB9Ci0gICAgICAgIEZPUl9FQUNIX1dBU01f U0VDVElPTihXQVNNX1NFQ1RJT05fUEFSU0UpCisgICAgICAgIEZPUl9FQUNIX0tOT1dOX1dBU01f U0VDVElPTihXQVNNX1NFQ1RJT05fUEFSU0UpCiAjdW5kZWYgV0FTTV9TRUNUSU9OX1BBUlNFCiAK ICAgICAgICAgY2FzZSBTZWN0aW9uOjpDdXN0b206IHsKICAgICAgICAgICAgIFdBU01fRkFJTF9J Rl9IRUxQRVJfRkFJTFMocGFyc2VDdXN0b20oc2VjdGlvbkxlbmd0aCkpOwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KKworICAgICAgICBjYXNlIFNlY3Rpb246OkJlZ2luOiB7CisgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYoZW5k ICE9IG1fb2Zmc2V0LCAicGFyc2luZyBlbmRlZCBiZWZvcmUgdGhlIGVuZCBvZiAiLCBzZWN0aW9u LCAiIHNlY3Rpb24iKTsKIAotICAgICAgICBwcmV2aW91c1NlY3Rpb24gPSBzZWN0aW9uOworCisg ICAgICAgIGlmIChpc0tub3duU2VjdGlvbihzZWN0aW9uKSkKKyAgICAgICAgICAgIHByZXZpb3Vz S25vd25TZWN0aW9uID0gc2VjdGlvbjsKICAgICB9CiAKICAgICByZXR1cm4geyB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBhcnNlci5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1vZHVsZVBhcnNlci5oCmluZGV4IDVhZDIxMDA4 M2U1ZmQ1NWEyMjUzMjlkYThmMjJjYTFiMGU0ZjM1MjEuLmE2NTFiZTE3Y2UyM2I4NWZiYjk3YmJi Njg1NzAzYjM5YjY0YjcyYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L1dhc21Nb2R1bGVQYXJzZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNt TW9kdWxlUGFyc2VyLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogcHJpdmF0ZToKIAogI2Rl ZmluZSBXQVNNX1NFQ1RJT05fREVDTEFSRV9QQVJTRVIoTkFNRSwgSUQsIERFU0NSSVBUSU9OKSBQ YXJ0aWFsUmVzdWx0IFdBUk5fVU5VU0VEX1JFVFVSTiBwYXJzZSAjIyBOQU1FKCk7Ci0gICAgRk9S X0VBQ0hfV0FTTV9TRUNUSU9OKFdBU01fU0VDVElPTl9ERUNMQVJFX1BBUlNFUikKKyAgICBGT1Jf RUFDSF9LTk9XTl9XQVNNX1NFQ1RJT04oV0FTTV9TRUNUSU9OX0RFQ0xBUkVfUEFSU0VSKQogI3Vu ZGVmIFdBU01fU0VDVElPTl9ERUNMQVJFX1BBUlNFUgogCiAgICAgUGFydGlhbFJlc3VsdCBXQVJO X1VOVVNFRF9SRVRVUk4gcGFyc2VDdXN0b20odWludDMyX3QpOwpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbVNlY3Rpb25zLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9XYXNtU2VjdGlvbnMuaAppbmRleCBmNjM1YzgxOWEzNTdiMTAzOGJlYTIzNTgyM2Zi M2FjOTUyYzdjNzE5Li5lNjkyNGI3OTUzY2MzNjQ2YmVlOTA4NDQxYTYzYzYzYzI5NGE3N2Q2IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtU2VjdGlvbnMuaAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtU2VjdGlvbnMuaApAQCAtMzQsNyArMzQs NyBAQAogCiBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIFdhc20gewogCi0jZGVmaW5lIEZPUl9F QUNIX1dBU01fU0VDVElPTihtYWNybykgXAorI2RlZmluZSBGT1JfRUFDSF9LTk9XTl9XQVNNX1NF Q1RJT04obWFjcm8pIFwKICAgICBtYWNybyhUeXBlLCAgICAgMSwgIkZ1bmN0aW9uIHNpZ25hdHVy ZSBkZWNsYXJhdGlvbnMiKSBcCiAgICAgbWFjcm8oSW1wb3J0LCAgIDIsICJJbXBvcnQgZGVjbGFy YXRpb25zIikgXAogICAgIG1hY3JvKEZ1bmN0aW9uLCAzLCAiRnVuY3Rpb24gZGVjbGFyYXRpb25z IikgXApAQCAtNDgsMzggKzQ4LDU4IEBAIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgV2FzbSB7 CiAgICAgbWFjcm8oRGF0YSwgICAgMTEsICJEYXRhIHNlZ21lbnRzIikKIAogZW51bSBjbGFzcyBT ZWN0aW9uIDogdWludDhfdCB7CisgICAgLy8gSXQncyBpbXBvcnRhbnQgdGhhdCBCZWdpbiBpcyBs ZXNzIHRoYW4gZXZlcnkgb3RoZXIgc2VjdGlvbiBudW1iZXIgYW5kIHRoYXQgQ3VzdG9tIGlzIGdy ZWF0ZXIuCisgICAgLy8gVGhpcyBvbmx5IHdvcmtzIGJlY2F1c2Ugc2VjdGlvbiBudW1iZXJzIGFy ZSBjdXJyZW50bHkgbW9ub3RvbmljYWxseSBpbmNyZWFzaW5nLgorICAgIC8vIEFsc28sIEJlZ2lu IGlzIG5vdCBhIHJlYWwgc2VjdGlvbiBidXQgaXMgdXNlZCBhcyBhIG1hcmtlciBmb3IgdmFsaWRh dGluZyB0aGUgb3JkZXJpbmcKKyAgICAvLyBvZiBzZWN0aW9ucy4KKyAgICBCZWdpbiA9IDAsCiAj ZGVmaW5lIERFRklORV9XQVNNX1NFQ1RJT05fRU5VTShOQU1FLCBJRCwgREVTQ1JJUFRJT04pIE5B TUUgPSBJRCwKLSAgICBGT1JfRUFDSF9XQVNNX1NFQ1RJT04oREVGSU5FX1dBU01fU0VDVElPTl9F TlVNKQorICAgIEZPUl9FQUNIX0tOT1dOX1dBU01fU0VDVElPTihERUZJTkVfV0FTTV9TRUNUSU9O X0VOVU0pCiAjdW5kZWYgREVGSU5FX1dBU01fU0VDVElPTl9FTlVNCiAgICAgQ3VzdG9tCiB9Owor c3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDx1aW50OF90PihTZWN0aW9uOjpCZWdpbikgPCBzdGF0 aWNfY2FzdDx1aW50OF90PihTZWN0aW9uOjpUeXBlKSwgIkJlZ2luIHNob3VsZCBjb21lIGJlZm9y ZSB0aGUgZmlyc3Qga25vd24gc2VjdGlvbi4iKTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgSW50Pgot c3RhdGljIGlubGluZSBib29sIGlzVmFsaWRTZWN0aW9uKEludCBzZWN0aW9uKQoraW5saW5lIGJv b2wgaXNLbm93blNlY3Rpb24oSW50IHNlY3Rpb24pCiB7CiAgICAgc3dpdGNoIChzZWN0aW9uKSB7 CiAjZGVmaW5lIFZBTElEQVRFX1NFQ1RJT04oTkFNRSwgSUQsIERFU0NSSVBUSU9OKSBjYXNlIHN0 YXRpY19jYXN0PEludD4oU2VjdGlvbjo6TkFNRSk6IHJldHVybiB0cnVlOwotICAgICAgICBGT1Jf RUFDSF9XQVNNX1NFQ1RJT04oVkFMSURBVEVfU0VDVElPTikKKyAgICAgICAgRk9SX0VBQ0hfS05P V05fV0FTTV9TRUNUSU9OKFZBTElEQVRFX1NFQ1RJT04pCiAjdW5kZWYgVkFMSURBVEVfU0VDVElP TgogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiB9CiAKLXN0YXRp YyBpbmxpbmUgYm9vbCB2YWxpZGF0ZU9yZGVyKFNlY3Rpb24gcHJldmlvdXMsIFNlY3Rpb24gbmV4 dCkKK2lubGluZSBib29sIGRlY29kZVNlY3Rpb24odWludDhfdCBzZWN0aW9uQnl0ZSwgU2VjdGlv biYgc2VjdGlvbikKIHsKLSAgICBpZiAocHJldmlvdXMgPT0gU2VjdGlvbjo6Q3VzdG9tKQorICAg IHNlY3Rpb24gPSBTZWN0aW9uOjpDdXN0b207CisgICAgaWYgKCFzZWN0aW9uQnl0ZSkKICAgICAg ICAgcmV0dXJuIHRydWU7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PHVpbnQ4X3Q+KHByZXZpb3Vz KSA8IHN0YXRpY19jYXN0PHVpbnQ4X3Q+KG5leHQpOworCisgICAgaWYgKCFpc0tub3duU2VjdGlv bihzZWN0aW9uQnl0ZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHNlY3Rpb24gPSBz dGF0aWNfY2FzdDxTZWN0aW9uPihzZWN0aW9uQnl0ZSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisK K2lubGluZSBib29sIHZhbGlkYXRlT3JkZXIoU2VjdGlvbiBwcmV2aW91c0tub3duLCBTZWN0aW9u IG5leHQpCit7CisgICAgQVNTRVJUKGlzS25vd25TZWN0aW9uKHByZXZpb3VzS25vd24pIHx8IHBy ZXZpb3VzS25vd24gPT0gU2VjdGlvbjo6QmVnaW4pOworICAgIHJldHVybiBzdGF0aWNfY2FzdDx1 aW50OF90PihwcmV2aW91c0tub3duKSA8IHN0YXRpY19jYXN0PHVpbnQ4X3Q+KG5leHQpOwogfQog Ci1zdGF0aWMgaW5saW5lIGNvbnN0IGNoYXIqIG1ha2VTdHJpbmcoU2VjdGlvbiBzZWN0aW9uKQor aW5saW5lIGNvbnN0IGNoYXIqIG1ha2VTdHJpbmcoU2VjdGlvbiBzZWN0aW9uKQogewogICAgIHN3 aXRjaCAoc2VjdGlvbikgeworICAgIGNhc2UgU2VjdGlvbjo6QmVnaW46CisgICAgICAgIHJldHVy biAiQmVnaW4iOwogICAgIGNhc2UgU2VjdGlvbjo6Q3VzdG9tOgogICAgICAgICByZXR1cm4gIkN1 c3RvbSI7CiAjZGVmaW5lIFNUUklOR0lGWV9TRUNUSU9OX05BTUUoTkFNRSwgSUQsIERFU0NSSVBU SU9OKSBjYXNlIFNlY3Rpb246Ok5BTUU6IHJldHVybiAjTkFNRTsKLSAgICAgICAgRk9SX0VBQ0hf V0FTTV9TRUNUSU9OKFNUUklOR0lGWV9TRUNUSU9OX05BTUUpCisgICAgICAgIEZPUl9FQUNIX0tO T1dOX1dBU01fU0VDVElPTihTVFJJTkdJRllfU0VDVElPTl9OQU1FKQogI3VuZGVmIFNUUklOR0lG WV9TRUNUSU9OX05BTUUKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1n aXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDhiZWM0ODA5 ODY2MzMyNWFmMzlkNjdkNjRlYTgyZTZlMDU2NjVmYTkuLjY5YjQxOTY1ZjliY2NiNWEyNzlmYWFh YmNlZjFjOGM4MDM5ZTUzMGUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pT VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDItMDEgIEtlaXRoIE1pbGxl ciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGNyYXNoZXMgZHVlIHRv IG1pc2hhbmRsaW5nIGN1c3RvbSBzZWN0aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQwNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY5 MzU4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAgICAgICAgKiB3 YXNtL0J1aWxkZXIuanM6CisgICAgICAgIChleHBvcnQuZGVmYXVsdC5CdWlsZGVyLnByb3RvdHlw ZS5fcmVnaXN0ZXJTZWN0aW9uQnVpbGRlcnMuY29uc3Quc2VjdGlvbi5pbi5XQVNNLmRlc2NyaXB0 aW9uLnNlY3Rpb24uc3dpdGNoLnNlY3Rpb24uY2FzZS5zdHJpbmdfYXBwZWFyZWRfaGVyZS50aGlz LnNlY3Rpb24pOgorICAgICAgICAqIHdhc20vanMtYXBpL3ZhbGlkYXRlLmpzOgorICAgICAgICAo YXNzZXJ0LnRydXRoeSk6CisKIDIwMTgtMDEtMzEgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgSlNDIGluY29ycmVjdGx5IGludGVycHJldGluZyBzY3JpcHQsIHNl dHMgR2xvYmFsIFByb3BlcnR5IGluc3RlYWQgb2YgR2xvYmFsIExleGljYWwgdmFyaWFibGUgKExp dGVyYWxQYXJzZXIgLyBKU09OUCBwYXRoKQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy93YXNtL0J1aWxk ZXIuanMgYi9KU1Rlc3RzL3dhc20vQnVpbGRlci5qcwppbmRleCAwNGFkZjhhNzQ0OWU4MjYwYjVh MWI1YWE1MzFiMmE0MzA1ZjRmMDU5Li43MmU3ODhlNTE5N2JkZTlmMDZkNzM3ZDVmMzY5NzQ3MTI2 ZWZkZGM5IDEwMDY0NAotLS0gYS9KU1Rlc3RzL3dhc20vQnVpbGRlci5qcworKysgYi9KU1Rlc3Rz L3dhc20vQnVpbGRlci5qcwpAQCAtNTc1LDcgKzU3NSw3IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNz IEJ1aWxkZXIgewogCiAgICAgICAgICAgICBjYXNlICJFbGVtZW50IjoKICAgICAgICAgICAgICAg ICB0aGlzW3NlY3Rpb25dID0gZnVuY3Rpb24oLi4uYXJncykgewotICAgICAgICAgICAgICAgICAg ICBpZiAoYXJncy5sZW5ndGggIT09IDApCisgICAgICAgICAgICAgICAgICAgIGlmIChhcmdzLmxl bmd0aCAhPT0gMCAmJiB0aGlzLl9jaGVja2VkKQogICAgICAgICAgICAgICAgICAgICAgICAgdGhy b3cgbmV3IEVycm9yKCJZb3UncmUgZG9pbmcgaXQgd3JvbmcuIFRoaXMgZWxlbWVudCBkb2VzIG5v dCB0YWtlIGFyZ3VtZW50cy4gWW91IG11c3QgY2hhaW4gdGhlIGNhbGwgd2l0aCBhbm90aGVyIEVs ZW1lbnQoKSIpOwogCiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHMgPSB0aGlzLl9hZGRTZWN0 aW9uKHNlY3Rpb24pOwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy93YXNtL2pzLWFwaS92YWxpZGF0ZS5q cyBiL0pTVGVzdHMvd2FzbS9qcy1hcGkvdmFsaWRhdGUuanMKaW5kZXggOGY0ZThhMzRlNmJlZDAz Y2Y0ZDViMmQ4ODQ5N2NlOGRkZjZkZTk1Yy4uNGZlODNjMjg2OWM1YmIyNDFkYjkxZGUwY2E4NjY2 ZjkyNTg1OWE5OCAxMDA2NDQKLS0tIGEvSlNUZXN0cy93YXNtL2pzLWFwaS92YWxpZGF0ZS5qcwor KysgYi9KU1Rlc3RzL3dhc20vanMtYXBpL3ZhbGlkYXRlLmpzCkBAIC0yOSwzICsyOSwxOSBAQCBh c3NlcnQuZXEoV2ViQXNzZW1ibHkudmFsaWRhdGUubGVuZ3RoLCAxKTsKIAogICAgIGFzc2VydC50 cnV0aHkoV2ViQXNzZW1ibHkudmFsaWRhdGUoYnVpbGRlci5XZWJBc3NlbWJseSgpLmdldCgpKSk7 CiB9CisKK3sKKyAgICBjb25zdCBidWlsZGVyID0gKG5ldyBCdWlsZGVyKCkpOworICAgIGJ1aWxk ZXIuc2V0Q2hlY2tlZChmYWxzZSk7CisKKyAgICBidWlsZGVyLlR5cGUoKS5FbmQoKQorICAgICAg ICAuSW1wb3J0KCkuTWVtb3J5KCJpbXAiLCAibWVtb3J5Iiwge2luaXRpYWw6IDIwfSkuRW5kKCkK KyAgICAgICAgLlVua25vd24oInRlc3QiKS5FbmQoKQorICAgICAgICAuSW1wb3J0KCkuTWVtb3J5 KCJpbXAiLCAibWVtb3J5Iiwge2luaXRpYWw6IDIwfSkuRW5kKCkKKyAgICAgICAgLkZ1bmN0aW9u KCkuRW5kKCkKKyAgICAgICAgLkV4cG9ydCgpLkVuZCgpCisgICAgICAgIC5Db2RlKCkKKyAgICAg ICAgLkVuZCgpOworCisgICAgYXNzZXJ0LmZhbHN5KFdlYkFzc2VtYmx5LnZhbGlkYXRlKGJ1aWxk ZXIuV2ViQXNzZW1ibHkoKS5nZXQoKSkpOworfQo=