193969 2019-01-29 10:57:48 -0800 [MathML] Move enum class ScriptType to MathMLScriptsElement. 2019-01-29 11:40:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1499602 0 zalan 2019-01-29 10:57:48 -0800 It is MathML specific type after all. 1499603 1 360476 zalan 2019-01-29 10:59:48 -0800 Created attachment 360476 Patch 1499619 2 360476 commit-queue 2019-01-29 11:40:00 -0800 Comment on attachment 360476 Patch Clearing flags on attachment: 360476 Committed r240666: <https://trac.webkit.org/changeset/240666> 1499620 3 commit-queue 2019-01-29 11:40:02 -0800 All reviewed patches have been landed. Closing bug. 1499621 4 webkit-bug-importer 2019-01-29 11:40:29 -0800 <rdar://problem/47639859> 360476 2019-01-29 10:59:48 -0800 2019-01-29 11:40:00 -0800 Patch bug-193969-20190129105948.patch text/plain 19899 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmUwYjEwMjk4YWFlNzVl M2QxN2RlNTRjMmJmZDE2ZWQxZTVlMjA1Mi4uZTlhYWJiYWQ0YjFmOTY0NjFlMGQ2ODBiZTU4ZjNh YTU2YTMzMTY3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTAxLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hdGhNTF0gTW92ZSBlbnVt IGNsYXNzIFNjcmlwdFR5cGUgdG8gTWF0aE1MU2NyaXB0c0VsZW1lbnQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM5NjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1hdGhtbC9NYXRoTUxTY3JpcHRz RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JpcHRUeXBlT2YpOgorICAgICAgICAq IG1hdGhtbC9NYXRoTUxTY3JpcHRzRWxlbWVudC5oOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRo bWwvUmVuZGVyTWF0aE1MU2NyaXB0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRo TUxTY3JpcHRzOjpzY3JpcHRUeXBlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1h dGhNTFNjcmlwdHM6OnZhbGlkYXRlQW5kR2V0UmVmZXJlbmNlQ2hpbGRyZW4pOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTWF0aE1MU2NyaXB0czo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0 aHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MU2NyaXB0czo6dmVydGljYWxNZXRy aWNzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhNTFNjcmlwdHM6OmxheW91dEJsb2Nr KToKKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMuaDoKKyAg ICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFVuZGVyT3Zlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxVbmRlck92ZXI6OmlzVmFsaWQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MVW5kZXJPdmVyOjp1bmRlciBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxVbmRlck92ZXI6Om92ZXIgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MVW5kZXJPdmVyOjpjb21wdXRlUHJlZmVycmVkTG9naWNh bFdpZHRocyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxVbmRlck92ZXI6Omhhc0Fj Y2VudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxVbmRlck92ZXI6Omxh eW91dEJsb2NrKToKKwogMjAxOS0wMS0yOCAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtjc3MtbG9naWNhbF0gUmVqZWN0IHVuaXRsZXNzIGxlbmd0aCBxdWly ayBpbiAnaW5zZXQnIHNob3J0aGFuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbWF0aG1s L01hdGhNTFNjcmlwdHNFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL21hdGhtbC9NYXRoTUxT Y3JpcHRzRWxlbWVudC5jcHAKaW5kZXggYjExOTc3ZDNlYzNkYTZjZTkwYmNlZjZjYjRhZjFjZWNi NTFlZjkzNy4uZDIyMjI4Y2M1MTMwYTVlMTc5MmYzYjdkYzZhNjJiZTMzMDc5ZWMyZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbWF0aG1sL01hdGhNTFNjcmlwdHNFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9tYXRobWwvTWF0aE1MU2NyaXB0c0VsZW1lbnQuY3BwCkBAIC0zOCwy MiArMzgsMjIgQEAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKE1hdGhNTFNjcmlwdHNFbGVt ZW50KTsKIAogdXNpbmcgbmFtZXNwYWNlIE1hdGhNTE5hbWVzOwogCi1zdGF0aWMgU2NyaXB0VHlw ZSBzY3JpcHRUeXBlT2YoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSkKK3N0YXRpYyBNYXRo TUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZSBzY3JpcHRUeXBlT2YoY29uc3QgUXVhbGlmaWVk TmFtZSYgdGFnTmFtZSkKIHsKICAgICBpZiAodGFnTmFtZSA9PSBtc3ViVGFnKQotICAgICAgICBy ZXR1cm4gU2NyaXB0VHlwZTo6U3ViOworICAgICAgICByZXR1cm4gTWF0aE1MU2NyaXB0c0VsZW1l bnQ6OlNjcmlwdFR5cGU6OlN1YjsKICAgICBpZiAodGFnTmFtZSA9PSBtc3VwVGFnKQotICAgICAg ICByZXR1cm4gU2NyaXB0VHlwZTo6U3VwZXI7CisgICAgICAgIHJldHVybiBNYXRoTUxTY3JpcHRz RWxlbWVudDo6U2NyaXB0VHlwZTo6U3VwZXI7CiAgICAgaWYgKHRhZ05hbWUgPT0gbXN1YnN1cFRh ZykKLSAgICAgICAgcmV0dXJuIFNjcmlwdFR5cGU6OlN1YlN1cDsKKyAgICAgICAgcmV0dXJuIE1h dGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpTdWJTdXA7CiAgICAgaWYgKHRhZ05hbWUg PT0gbXVuZGVyVGFnKQotICAgICAgICByZXR1cm4gU2NyaXB0VHlwZTo6VW5kZXI7CisgICAgICAg IHJldHVybiBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6VW5kZXI7CiAgICAgaWYg KHRhZ05hbWUgPT0gbW92ZXJUYWcpCi0gICAgICAgIHJldHVybiBTY3JpcHRUeXBlOjpPdmVyOwor ICAgICAgICByZXR1cm4gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6Ok92ZXI7CiAg ICAgaWYgKHRhZ05hbWUgPT0gbXVuZGVyb3ZlclRhZykKLSAgICAgICAgcmV0dXJuIFNjcmlwdFR5 cGU6OlVuZGVyT3ZlcjsKKyAgICAgICAgcmV0dXJuIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3Jp cHRUeXBlOjpVbmRlck92ZXI7CiAgICAgQVNTRVJUKHRhZ05hbWUgPT0gbW11bHRpc2NyaXB0c1Rh Zyk7Ci0gICAgcmV0dXJuIFNjcmlwdFR5cGU6Ok11bHRpc2NyaXB0czsKKyAgICByZXR1cm4gTWF0 aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6Ok11bHRpc2NyaXB0czsKIH0KIAogTWF0aE1M U2NyaXB0c0VsZW1lbnQ6Ok1hdGhNTFNjcmlwdHNFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUm IHRhZ05hbWUsIERvY3VtZW50JiBkb2N1bWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L21hdGhtbC9NYXRoTUxTY3JpcHRzRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvbWF0aG1sL01h dGhNTFNjcmlwdHNFbGVtZW50LmgKaW5kZXggZDJiYzY1MWNmYzFlOGY2N2U2NzczZjM3MDhlOWQ1 ZjRhMWI2Y2ZjMS4uZTRmYjU0MjhlMmVjM2Y3YjRlZTU5MzY1NGIxMTY5ZmVjOWRkZGVhYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbWF0aG1sL01hdGhNTFNjcmlwdHNFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbWF0aG1sL01hdGhNTFNjcmlwdHNFbGVtZW50LmgKQEAgLTMxLDEy ICszMSwxMiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWVudW0gY2xhc3MgU2NyaXB0VHlw ZTsKLQogY2xhc3MgTWF0aE1MU2NyaXB0c0VsZW1lbnQgOiBwdWJsaWMgTWF0aE1MUHJlc2VudGF0 aW9uRWxlbWVudCB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRChNYXRoTUxTY3JpcHRzRWxl bWVudCk7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxNYXRoTUxTY3JpcHRzRWxlbWVudD4gY3Jl YXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50Jik7CisKKyAgICBlbnVt IGNsYXNzIFNjcmlwdFR5cGUgeyBTdWIsIFN1cGVyLCBTdWJTdXAsIE11bHRpc2NyaXB0cywgVW5k ZXIsIE92ZXIsIFVuZGVyT3ZlciB9OwogICAgIFNjcmlwdFR5cGUgc2NyaXB0VHlwZSgpIGNvbnN0 IHsgcmV0dXJuIG1fc2NyaXB0VHlwZTsgfQogICAgIGNvbnN0IExlbmd0aCYgc3Vic2NyaXB0U2hp ZnQoKTsKICAgICBjb25zdCBMZW5ndGgmIHN1cGVyc2NyaXB0U2hpZnQoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU2NyaXB0cy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMuY3Bw CmluZGV4IDFlYzQ5ZjIxYTQyYzE1NzZiZTJjNGE5YzA4ZDE1OWZmYTg4YmY0ZjkuLmJmZjlhMDZm MTE5NGJhZWNlZjY3YjRmMDE4ZDBjNGMyZWQzZWNjNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU2NyaXB0cy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxTY3JpcHRzLmNwcApAQCAtNTQs NyArNTQsNyBAQCBNYXRoTUxTY3JpcHRzRWxlbWVudCYgUmVuZGVyTWF0aE1MU2NyaXB0czo6ZWxl bWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PE1hdGhNTFNjcmlwdHNFbGVtZW50 Jj4obm9kZUZvck5vbkFub255bW91cygpKTsKIH0KIAotU2NyaXB0VHlwZSBSZW5kZXJNYXRoTUxT Y3JpcHRzOjpzY3JpcHRUeXBlKCkgY29uc3QKK01hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRU eXBlIFJlbmRlck1hdGhNTFNjcmlwdHM6OnNjcmlwdFR5cGUoKSBjb25zdAogewogICAgIHJldHVy biBlbGVtZW50KCkuc2NyaXB0VHlwZSgpOwogfQpAQCAtODIsMTAgKzgyLDEwIEBAIE9wdGlvbmFs PFJlbmRlck1hdGhNTFNjcmlwdHM6OlJlZmVyZW5jZUNoaWxkcmVuPiBSZW5kZXJNYXRoTUxTY3Jp cHRzOjp2YWxpZGF0ZUFuCiAgICAgcmVmZXJlbmNlLnByZXNjcmlwdERlbGltaXRlciA9IG51bGxw dHI7CiAKICAgICBzd2l0Y2ggKHNjcmlwdFR5cGUoKSkgewotICAgIGNhc2UgU2NyaXB0VHlwZTo6 U3ViOgotICAgIGNhc2UgU2NyaXB0VHlwZTo6U3VwZXI6Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpV bmRlcjoKLSAgICBjYXNlIFNjcmlwdFR5cGU6Ok92ZXI6IHsKKyAgICBjYXNlIE1hdGhNTFNjcmlw dHNFbGVtZW50OjpTY3JpcHRUeXBlOjpTdWI6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVu dDo6U2NyaXB0VHlwZTo6U3VwZXI6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2Ny aXB0VHlwZTo6VW5kZXI6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlw ZTo6T3ZlcjogewogICAgICAgICAvLyBUaGVzZSBlbGVtZW50cyBtdXN0IGhhdmUgZXhhY3RseSB0 d28gY2hpbGRyZW4uCiAgICAgICAgIC8vIFRoZSBzZWNvbmQgY2hpbGQgaXMgYSBwb3N0c2NyaXB0 IGFuZCB0aGVyZSBhcmUgbm8gcHJlc2NyaXB0cy4KICAgICAgICAgLy8gPG1zdWI+IGJhc2Ugc3Vi c2NyaXB0IDwvbXN1Yj4KQEAgLTk4LDggKzk4LDggQEAgT3B0aW9uYWw8UmVuZGVyTWF0aE1MU2Ny aXB0czo6UmVmZXJlbmNlQ2hpbGRyZW4+IFJlbmRlck1hdGhNTFNjcmlwdHM6OnZhbGlkYXRlQW4K ICAgICAgICAgcmVmZXJlbmNlLmZpcnN0UG9zdFNjcmlwdCA9IHNjcmlwdDsKICAgICAgICAgcmV0 dXJuIHJlZmVyZW5jZTsKICAgICB9Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpTdWJTdXA6Ci0gICAg Y2FzZSBTY3JpcHRUeXBlOjpVbmRlck92ZXI6IHsKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVt ZW50OjpTY3JpcHRUeXBlOjpTdWJTdXA6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6 U2NyaXB0VHlwZTo6VW5kZXJPdmVyOiB7CiAgICAgICAgIC8vIFRoZXNlIGVsZW1lbnRzIG11c3Qg aGF2ZSBleGFjdGx5IHRocmVlIGNoaWxkcmVuLgogICAgICAgICAvLyBUaGUgc2Vjb25kIGFuZCB0 aGlyZCBjaGlsZHJlbiBhcmUgcG9zdHNjcmlwdHMgYW5kIHRoZXJlIGFyZSBubyBwcmVzY3JpcHRz LgogICAgICAgICAvLyA8bXN1YnN1cD4gYmFzZSBzdWJzY3JpcHQgc3VwZXJzY3JpcHQgPC9tc3Vi c3VwPgpAQCAtMTEzLDcgKzExMyw3IEBAIE9wdGlvbmFsPFJlbmRlck1hdGhNTFNjcmlwdHM6OlJl ZmVyZW5jZUNoaWxkcmVuPiBSZW5kZXJNYXRoTUxTY3JpcHRzOjp2YWxpZGF0ZUFuCiAgICAgICAg IHJlZmVyZW5jZS5maXJzdFBvc3RTY3JpcHQgPSBzdWJTY3JpcHQ7CiAgICAgICAgIHJldHVybiBy ZWZlcmVuY2U7CiAgICAgfQotICAgIGNhc2UgU2NyaXB0VHlwZTo6TXVsdGlzY3JpcHRzOiB7Cisg ICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6TXVsdGlzY3JpcHRzOiB7 CiAgICAgICAgIC8vIFRoaXMgZWxlbWVudCBhY2NlcHRzIHRoZSBmb2xsb3dpbmcgc3ludGF4Ogog ICAgICAgICAvLwogICAgICAgICAvLyA8bW11bHRpc2NyaXB0cz4KQEAgLTE4OSwxOSArMTg5LDE5 IEBAIHZvaWQgUmVuZGVyTWF0aE1MU2NyaXB0czo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0 aHMoKQogICAgIExheW91dFVuaXQgc3BhY2UgPSBzcGFjZUFmdGVyU2NyaXB0KCk7CiAKICAgICBz d2l0Y2ggKHNjcmlwdFR5cGUoKSkgewotICAgIGNhc2UgU2NyaXB0VHlwZTo6U3ViOgotICAgIGNh c2UgU2NyaXB0VHlwZTo6VW5kZXI6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2Ny aXB0VHlwZTo6U3ViOgorICAgIGNhc2UgTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6 OlVuZGVyOgogICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSByZWZlcmVuY2Uu YmFzZS0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CiAgICAgICAgIG1fbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoICs9IHN0ZDo6bWF4KDBfbHUsIHJlZmVyZW5jZS5maXJzdFBvc3RTY3JpcHQt Pm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIC0gYmFzZUl0YWxpY0NvcnJlY3Rpb24gKyBzcGFj ZSk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU2NyaXB0VHlwZTo6U3VwZXI6Ci0gICAgY2Fz ZSBTY3JpcHRUeXBlOjpPdmVyOgorICAgIGNhc2UgTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlw dFR5cGU6OlN1cGVyOgorICAgIGNhc2UgTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6 Ok92ZXI6CiAgICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHJlZmVyZW5jZS5i YXNlLT5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKICAgICAgICAgbV9tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGggKz0gc3RkOjptYXgoMF9sdSwgcmVmZXJlbmNlLmZpcnN0UG9zdFNjcmlwdC0+ bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBzcGFjZSk7CiAgICAgICAgIGJyZWFrOwotICAg IGNhc2UgU2NyaXB0VHlwZTo6U3ViU3VwOgotICAgIGNhc2UgU2NyaXB0VHlwZTo6VW5kZXJPdmVy OgotICAgIGNhc2UgU2NyaXB0VHlwZTo6TXVsdGlzY3JpcHRzOiB7CisgICAgY2FzZSBNYXRoTUxT Y3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6U3ViU3VwOgorICAgIGNhc2UgTWF0aE1MU2NyaXB0 c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlVuZGVyT3ZlcjoKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNF bGVtZW50OjpTY3JpcHRUeXBlOjpNdWx0aXNjcmlwdHM6IHsKICAgICAgICAgYXV0byBzdWJTY3Jp cHQgPSByZWZlcmVuY2UuZmlyc3RQcmVTY3JpcHQ7CiAgICAgICAgIHdoaWxlIChzdWJTY3JpcHQp IHsKICAgICAgICAgICAgIGF1dG8gc3VwU2NyaXB0ID0gc3ViU2NyaXB0LT5uZXh0U2libGluZ0Jv eCgpOwpAQCAtMjYxLDcgKzI2MSw3IEBAIFJlbmRlck1hdGhNTFNjcmlwdHM6OlZlcnRpY2FsTWV0 cmljcyBSZW5kZXJNYXRoTUxTY3JpcHRzOjp2ZXJ0aWNhbE1ldHJpY3MoY29uc3QKIAogICAgIExh eW91dFVuaXQgYmFzZUFzY2VudCA9IGFzY2VudEZvckNoaWxkKCpyZWZlcmVuY2UuYmFzZSk7CiAg ICAgTGF5b3V0VW5pdCBiYXNlRGVzY2VudCA9IHJlZmVyZW5jZS5iYXNlLT5sb2dpY2FsSGVpZ2h0 KCkgLSBiYXNlQXNjZW50OwotICAgIGlmIChzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6U3Vi IHx8IHNjcmlwdFR5cGUoKSA9PSBTY3JpcHRUeXBlOjpTdWJTdXAgfHwgc2NyaXB0VHlwZSgpID09 IFNjcmlwdFR5cGU6Ok11bHRpc2NyaXB0cyB8fCBzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6 VW5kZXIgfHwgc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6OlVuZGVyT3ZlcikgeworICAgIGlm IChzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlN1YiB8 fCBzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlN1YlN1 cCB8fCBzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6Ok11 bHRpc2NyaXB0cyB8fCBzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlw dFR5cGU6OlVuZGVyIHx8IHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2Ny aXB0VHlwZTo6VW5kZXJPdmVyKSB7CiAgICAgICAgIG1ldHJpY3Muc3ViU2hpZnQgPSBzdGQ6Om1h eChwYXJhbWV0ZXJzLnN1YnNjcmlwdFNoaWZ0RG93biwgYmFzZURlc2NlbnQgKyBwYXJhbWV0ZXJz LnN1YnNjcmlwdEJhc2VsaW5lRHJvcE1pbik7CiAgICAgICAgIGlmICghaXNSZW5kZXJNYXRoTUxV bmRlck92ZXIoKSkgewogICAgICAgICAgICAgLy8gSXQgaXMgbm90IGNsZWFyIGhvdyB0byBpbnRl cnByZXQgdGhlIGRlZmF1bHQgc2hpZnQgYW5kIGl0IGlzIG5vdCBhdmFpbGFibGUgeWV0IGFueXdh eS4KQEAgLTI3MCw3ICsyNzAsNyBAQCBSZW5kZXJNYXRoTUxTY3JpcHRzOjpWZXJ0aWNhbE1ldHJp Y3MgUmVuZGVyTWF0aE1MU2NyaXB0czo6dmVydGljYWxNZXRyaWNzKGNvbnN0CiAgICAgICAgICAg ICBtZXRyaWNzLnN1YlNoaWZ0ID0gc3RkOjptYXgobWV0cmljcy5zdWJTaGlmdCwgc3BlY2lmaWVk TWluU3ViU2hpZnQpOwogICAgICAgICB9CiAgICAgfQotICAgIGlmIChzY3JpcHRUeXBlKCkgPT0g U2NyaXB0VHlwZTo6U3VwZXIgfHwgc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6OlN1YlN1cCB8 fCBzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6TXVsdGlzY3JpcHRzICB8fCBzY3JpcHRUeXBl KCkgPT0gU2NyaXB0VHlwZTo6T3ZlciB8fCBzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6VW5k ZXJPdmVyKSB7CisgICAgaWYgKHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6 U2NyaXB0VHlwZTo6U3VwZXIgfHwgc2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50 OjpTY3JpcHRUeXBlOjpTdWJTdXAgfHwgc2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVt ZW50OjpTY3JpcHRUeXBlOjpNdWx0aXNjcmlwdHMgIHx8IHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxT Y3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6T3ZlciB8fCBzY3JpcHRUeXBlKCkgPT0gTWF0aE1M U2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlVuZGVyT3ZlcikgewogICAgICAgICBtZXRyaWNz LnN1cFNoaWZ0ID0gc3RkOjptYXgocGFyYW1ldGVycy5zdXBlcnNjcmlwdFNoaWZ0VXAsIGJhc2VB c2NlbnQgLSBwYXJhbWV0ZXJzLnN1cGVyU2NyaXB0QmFzZWxpbmVEcm9wTWF4KTsKICAgICAgICAg aWYgKCFpc1JlbmRlck1hdGhNTFVuZGVyT3ZlcigpKSB7CiAgICAgICAgICAgICAvLyBJdCBpcyBu b3QgY2xlYXIgaG93IHRvIGludGVycHJldCB0aGUgZGVmYXVsdCBzaGlmdCBhbmQgaXQgaXMgbm90 IGF2YWlsYWJsZSB5ZXQgYW55d2F5LgpAQCAtMjgxLDI1ICsyODEsMjUgQEAgUmVuZGVyTWF0aE1M U2NyaXB0czo6VmVydGljYWxNZXRyaWNzIFJlbmRlck1hdGhNTFNjcmlwdHM6OnZlcnRpY2FsTWV0 cmljcyhjb25zdAogICAgIH0KIAogICAgIHN3aXRjaCAoc2NyaXB0VHlwZSgpKSB7Ci0gICAgY2Fz ZSBTY3JpcHRUeXBlOjpTdWI6Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpVbmRlcjogeworICAgIGNh c2UgTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlN1YjoKKyAgICBjYXNlIE1hdGhN TFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpVbmRlcjogewogICAgICAgICBMYXlvdXRVbml0 IHN1YkFzY2VudCA9IGFzY2VudEZvckNoaWxkKCpyZWZlcmVuY2UuZmlyc3RQb3N0U2NyaXB0KTsK ICAgICAgICAgTGF5b3V0VW5pdCBzdWJEZXNjZW50ID0gcmVmZXJlbmNlLmZpcnN0UG9zdFNjcmlw dC0+bG9naWNhbEhlaWdodCgpIC0gc3ViQXNjZW50OwogICAgICAgICBtZXRyaWNzLmRlc2NlbnQg PSBzdWJEZXNjZW50OwogICAgICAgICBtZXRyaWNzLnN1YlNoaWZ0ID0gc3RkOjptYXgobWV0cmlj cy5zdWJTaGlmdCwgc3ViQXNjZW50IC0gcGFyYW1ldGVycy5zdWJzY3JpcHRUb3BNYXgpOwogICAg IH0KICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpTdXBlcjoKLSAgICBjYXNl IFNjcmlwdFR5cGU6Ok92ZXI6IHsKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3Jp cHRUeXBlOjpTdXBlcjoKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBl OjpPdmVyOiB7CiAgICAgICAgIExheW91dFVuaXQgc3VwQXNjZW50ID0gYXNjZW50Rm9yQ2hpbGQo KnJlZmVyZW5jZS5maXJzdFBvc3RTY3JpcHQpOwogICAgICAgICBMYXlvdXRVbml0IHN1cERlc2Nl bnQgPSByZWZlcmVuY2UuZmlyc3RQb3N0U2NyaXB0LT5sb2dpY2FsSGVpZ2h0KCkgLSBzdXBBc2Nl bnQ7CiAgICAgICAgIG1ldHJpY3MuYXNjZW50ID0gc3VwQXNjZW50OwogICAgICAgICBtZXRyaWNz LnN1cFNoaWZ0ID0gc3RkOjptYXgobWV0cmljcy5zdXBTaGlmdCwgcGFyYW1ldGVycy5zdXBlcnNj cmlwdEJvdHRvbU1pbiArIHN1cERlc2NlbnQpOwogICAgIH0KICAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBTY3JpcHRUeXBlOjpTdWJTdXA6Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpVbmRlck92ZXI6 Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpNdWx0aXNjcmlwdHM6IHsKKyAgICBjYXNlIE1hdGhNTFNj cmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpTdWJTdXA6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRz RWxlbWVudDo6U2NyaXB0VHlwZTo6VW5kZXJPdmVyOgorICAgIGNhc2UgTWF0aE1MU2NyaXB0c0Vs ZW1lbnQ6OlNjcmlwdFR5cGU6Ok11bHRpc2NyaXB0czogewogICAgICAgICAvLyBGSVhNRTogV2Ug c2hvdWxkIG1vdmUgdGhlIGNvZGUgdXBkYXRpbmcgVmVydGljYWxNZXRyaWNzIGZvciBlYWNoIHN1 Yi9zdXAgcGFpciBpbiBhIGhlbHBlcgogICAgICAgICAvLyBmdW5jdGlvbi4gVGhhdCB3YXksIFN1 YlN1cC9VbmRlck92ZXIgY2FuIGp1c3QgbWFrZSBvbmUgY2FsbCBhbmQgdGhlIGxvb3AgZm9yIE11 bHRpc2NyaXB0cwogICAgICAgICAvLyBjYW4gYmUgcmV3cml0dGVuIGluIGEgbW9yZSByZWFkYWJs ZS4KQEAgLTM3OCw4ICszNzgsOCBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlwdHM6OmxheW91dEJs b2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICBzZXRMb2dpY2FsSGVp Z2h0KGFzY2VudCArIGRlc2NlbnQpOwogCiAgICAgc3dpdGNoIChzY3JpcHRUeXBlKCkpIHsKLSAg ICBjYXNlIFNjcmlwdFR5cGU6OlN1YjoKLSAgICBjYXNlIFNjcmlwdFR5cGU6OlVuZGVyOiB7Cisg ICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6U3ViOgorICAgIGNhc2Ug TWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlVuZGVyOiB7CiAgICAgICAgIHNldExv Z2ljYWxXaWR0aChyZWZlcmVuY2UuYmFzZS0+bG9naWNhbFdpZHRoKCkgKyBzdGQ6Om1heCgwX2x1 LCByZWZlcmVuY2UuZmlyc3RQb3N0U2NyaXB0LT5sb2dpY2FsV2lkdGgoKSAtIGJhc2VJdGFsaWND b3JyZWN0aW9uICsgc3BhY2UpKTsKICAgICAgICAgTGF5b3V0UG9pbnQgYmFzZUxvY2F0aW9uKG1p cnJvcklmTmVlZGVkKGhvcml6b250YWxPZmZzZXQsICpyZWZlcmVuY2UuYmFzZSksIGFzY2VudCAt IGJhc2VBc2NlbnQpOwogICAgICAgICByZWZlcmVuY2UuYmFzZS0+c2V0TG9jYXRpb24oYmFzZUxv Y2F0aW9uKTsKQEAgLTM4OSw4ICszODksOCBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlwdHM6Omxh eW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICAgICAgcmVm ZXJlbmNlLmZpcnN0UG9zdFNjcmlwdC0+c2V0TG9jYXRpb24oc2NyaXB0TG9jYXRpb24pOwogICAg IH0KICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpTdXBlcjoKLSAgICBjYXNl IFNjcmlwdFR5cGU6Ok92ZXI6IHsKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3Jp cHRUeXBlOjpTdXBlcjoKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBl OjpPdmVyOiB7CiAgICAgICAgIHNldExvZ2ljYWxXaWR0aChyZWZlcmVuY2UuYmFzZS0+bG9naWNh bFdpZHRoKCkgKyBzdGQ6Om1heCgwX2x1LCByZWZlcmVuY2UuZmlyc3RQb3N0U2NyaXB0LT5sb2dp Y2FsV2lkdGgoKSArIHNwYWNlKSk7CiAgICAgICAgIExheW91dFBvaW50IGJhc2VMb2NhdGlvbiht aXJyb3JJZk5lZWRlZChob3Jpem9udGFsT2Zmc2V0LCAqcmVmZXJlbmNlLmJhc2UpLCBhc2NlbnQg LSBiYXNlQXNjZW50KTsKICAgICAgICAgcmVmZXJlbmNlLmJhc2UtPnNldExvY2F0aW9uKGJhc2VM b2NhdGlvbik7CkBAIC00MDAsOSArNDAwLDkgQEAgdm9pZCBSZW5kZXJNYXRoTUxTY3JpcHRzOjps YXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgICAgIHJl ZmVyZW5jZS5maXJzdFBvc3RTY3JpcHQtPnNldExvY2F0aW9uKHNjcmlwdExvY2F0aW9uKTsKICAg ICB9CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgU2NyaXB0VHlwZTo6U3ViU3VwOgotICAgIGNh c2UgU2NyaXB0VHlwZTo6VW5kZXJPdmVyOgotICAgIGNhc2UgU2NyaXB0VHlwZTo6TXVsdGlzY3Jp cHRzOiB7CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6U3ViU3Vw OgorICAgIGNhc2UgTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlVuZGVyT3ZlcjoK KyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpNdWx0aXNjcmlwdHM6 IHsKICAgICAgICAgLy8gQ2FsY3VsYXRlIHRoZSBsb2dpY2FsIHdpZHRoLgogICAgICAgICBMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aDsKICAgICAgICAgYXV0byBzdWJTY3JpcHQgPSByZWZlcmVuY2Uu Zmlyc3RQcmVTY3JpcHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0 aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRo bWwvUmVuZGVyTWF0aE1MU2NyaXB0cy5oCmluZGV4IGRkYTBiZTUyZDQyYTk0YzVjYWZiZjAyMjQ1 NTU1OWRjMmFmZjIzYzUuLjgyZjI1NzBmZjhjOTdhNDc1N2FkZTExNGNhN2FkODNiNzkzYjQ2MGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1M U2NyaXB0cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0 aE1MU2NyaXB0cy5oCkBAIC0yOSwxNCArMjksMTEgQEAKIAogI2lmIEVOQUJMRShNQVRITUwpCiAK KyNpbmNsdWRlICJNYXRoTUxTY3JpcHRzRWxlbWVudC5oIgogI2luY2x1ZGUgIlJlbmRlck1hdGhN TEJsb2NrLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgTWF0aE1MU2NyaXB0c0Vs ZW1lbnQ7Ci0KLWVudW0gY2xhc3MgU2NyaXB0VHlwZSB7IFN1YiwgU3VwZXIsIFN1YlN1cCwgTXVs dGlzY3JpcHRzLCBVbmRlciwgT3ZlciwgVW5kZXJPdmVyIH07Ci0KIC8vIFJlbmRlciBhIGJhc2Ug d2l0aCBzY3JpcHRzLgogY2xhc3MgUmVuZGVyTWF0aE1MU2NyaXB0cyA6IHB1YmxpYyBSZW5kZXJN YXRoTUxCbG9jayB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRChSZW5kZXJNYXRoTUxTY3Jp cHRzKTsKQEAgLTQ3LDcgKzQ0LDcgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIGJvb2wgaXNS ZW5kZXJNYXRoTUxTY3JpcHRzKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogICAg IGNvbnN0IGNoYXIqIHJlbmRlck5hbWUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiAiUmVuZGVy TWF0aE1MU2NyaXB0cyI7IH0KLSAgICBTY3JpcHRUeXBlIHNjcmlwdFR5cGUoKSBjb25zdDsKKyAg ICBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZSBzY3JpcHRUeXBlKCkgY29uc3Q7CiAg ICAgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpIG92ZXJyaWRlOwogICAgIHZv aWQgbGF5b3V0QmxvY2soYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0IHBhZ2VMb2dp Y2FsSGVpZ2h0ID0gMF9sdSkgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MVW5kZXJPdmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MVW5kZXJPdmVyLmNwcAppbmRleCA4OGE4 ZDIwNmNiNThjMmY4YWVmYzMxYjk0ZTU3MDc2MjYzYzFmNmJkLi42YTZkZGNhNzYzNTYyMDRmYjcx NmFmNzMxOTAwMTUxNjVjOGQ5YjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvbWF0aG1sL1JlbmRlck1hdGhNTFVuZGVyT3Zlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxVbmRlck92ZXIuY3BwCkBAIC0xMzUsMTAgKzEz NSwxMCBAQCBib29sIFJlbmRlck1hdGhNTFVuZGVyT3Zlcjo6aXNWYWxpZCgpIGNvbnN0CiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZ0JveCgpOwog ICAgIHN3aXRjaCAoc2NyaXB0VHlwZSgpKSB7Ci0gICAgY2FzZSBTY3JpcHRUeXBlOjpPdmVyOgot ICAgIGNhc2UgU2NyaXB0VHlwZTo6VW5kZXI6CisgICAgY2FzZSBNYXRoTUxTY3JpcHRzRWxlbWVu dDo6U2NyaXB0VHlwZTo6T3ZlcjoKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3Jp cHRUeXBlOjpVbmRlcjoKICAgICAgICAgcmV0dXJuICFjaGlsZDsKLSAgICBjYXNlIFNjcmlwdFR5 cGU6OlVuZGVyT3ZlcjoKKyAgICBjYXNlIE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBl OjpVbmRlck92ZXI6CiAgICAgICAgIHJldHVybiBjaGlsZCAmJiAhY2hpbGQtPm5leHRTaWJsaW5n Qm94KCk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC0x NjIsMTYgKzE2MiwxNiBAQCBSZW5kZXJCb3gmIFJlbmRlck1hdGhNTFVuZGVyT3Zlcjo6YmFzZSgp IGNvbnN0CiBSZW5kZXJCb3gmIFJlbmRlck1hdGhNTFVuZGVyT3Zlcjo6dW5kZXIoKSBjb25zdAog ewogICAgIEFTU0VSVChpc1ZhbGlkKCkpOwotICAgIEFTU0VSVChzY3JpcHRUeXBlKCkgPT0gU2Ny aXB0VHlwZTo6VW5kZXIgfHwgc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6OlVuZGVyT3Zlcik7 CisgICAgQVNTRVJUKHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0 VHlwZTo6VW5kZXIgfHwgc2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3Jp cHRUeXBlOjpVbmRlck92ZXIpOwogICAgIHJldHVybiAqZmlyc3RDaGlsZEJveCgpLT5uZXh0U2li bGluZ0JveCgpOwogfQogCiBSZW5kZXJCb3gmIFJlbmRlck1hdGhNTFVuZGVyT3Zlcjo6b3Zlcigp IGNvbnN0CiB7CiAgICAgQVNTRVJUKGlzVmFsaWQoKSk7Ci0gICAgQVNTRVJUKHNjcmlwdFR5cGUo KSA9PSBTY3JpcHRUeXBlOjpPdmVyIHx8IHNjcmlwdFR5cGUoKSA9PSBTY3JpcHRUeXBlOjpVbmRl ck92ZXIpOworICAgIEFTU0VSVChzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6 OlNjcmlwdFR5cGU6Ok92ZXIgfHwgc2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50 OjpTY3JpcHRUeXBlOjpVbmRlck92ZXIpOwogICAgIGF1dG8qIHNlY29uZENoaWxkID0gZmlyc3RD aGlsZEJveCgpLT5uZXh0U2libGluZ0JveCgpOwotICAgIHJldHVybiBzY3JpcHRUeXBlKCkgPT0g U2NyaXB0VHlwZTo6T3ZlciA/ICpzZWNvbmRDaGlsZCA6ICpzZWNvbmRDaGlsZC0+bmV4dFNpYmxp bmdCb3goKTsKKyAgICByZXR1cm4gc2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50 OjpTY3JpcHRUeXBlOjpPdmVyID8gKnNlY29uZENoaWxkIDogKnNlY29uZENoaWxkLT5uZXh0U2li bGluZ0JveCgpOwogfQogCiAKQEAgLTE5MiwxMCArMTkyLDEwIEBAIHZvaWQgUmVuZGVyTWF0aE1M VW5kZXJPdmVyOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAKICAgICBMYXlvdXRV bml0IHByZWZlcnJlZFdpZHRoID0gYmFzZSgpLm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOwog Ci0gICAgaWYgKHNjcmlwdFR5cGUoKSA9PSBTY3JpcHRUeXBlOjpVbmRlciB8fCBzY3JpcHRUeXBl KCkgPT0gU2NyaXB0VHlwZTo6VW5kZXJPdmVyKQorICAgIGlmIChzY3JpcHRUeXBlKCkgPT0gTWF0 aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlVuZGVyIHx8IHNjcmlwdFR5cGUoKSA9PSBN YXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6VW5kZXJPdmVyKQogICAgICAgICBwcmVm ZXJyZWRXaWR0aCA9IHN0ZDo6bWF4KHByZWZlcnJlZFdpZHRoLCB1bmRlcigpLm1heFByZWZlcnJl ZExvZ2ljYWxXaWR0aCgpKTsKIAotICAgIGlmIChzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6 T3ZlciB8fCBzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6VW5kZXJPdmVyKQorICAgIGlmIChz Y3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6Ok92ZXIgfHwg c2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpVbmRlck92 ZXIpCiAgICAgICAgIHByZWZlcnJlZFdpZHRoID0gc3RkOjptYXgocHJlZmVycmVkV2lkdGgsIG92 ZXIoKS5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSk7CiAKICAgICBtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gcHJlZmVycmVkV2lkdGg7 CkBAIC0yMTAsNyArMjEwLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJNYXRoTUxVbmRlck92ZXI6Omhv cml6b250YWxPZmZzZXQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIAogYm9vbCBSZW5k ZXJNYXRoTUxVbmRlck92ZXI6Omhhc0FjY2VudChib29sIGFjY2VudFVuZGVyKSBjb25zdAogewot ICAgIEFTU0VSVChzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6VW5kZXJPdmVyIHx8IChhY2Nl bnRVbmRlciAmJiBzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6VW5kZXIpIHx8ICghYWNjZW50 VW5kZXIgJiYgc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6Ok92ZXIpKTsKKyAgICBBU1NFUlQo c2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpVbmRlck92 ZXIgfHwgKGFjY2VudFVuZGVyICYmIHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxlbWVu dDo6U2NyaXB0VHlwZTo6VW5kZXIpIHx8ICghYWNjZW50VW5kZXIgJiYgc2NyaXB0VHlwZSgpID09 IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpPdmVyKSk7CiAKICAgICBjb25zdCBN YXRoTUxFbGVtZW50OjpCb29sZWFuVmFsdWUmIGF0dHJpYnV0ZVZhbHVlID0gYWNjZW50VW5kZXIg PyBlbGVtZW50KCkuYWNjZW50VW5kZXIoKSA6IGVsZW1lbnQoKS5hY2NlbnQoKTsKICAgICBpZiAo YXR0cmlidXRlVmFsdWUgPT0gTWF0aE1MRWxlbWVudDo6Qm9vbGVhblZhbHVlOjpUcnVlKQpAQCAt MzA2LDE5ICszMDYsMTkgQEAgdm9pZCBSZW5kZXJNYXRoTUxVbmRlck92ZXI6OmxheW91dEJsb2Nr KGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCBwYWdlTG8KICAgICBzdHJldGNoSG9y aXpvbnRhbE9wZXJhdG9yc0FuZExheW91dENoaWxkcmVuKCk7CiAKICAgICBBU1NFUlQoIWJhc2Uo KS5uZWVkc0xheW91dCgpKTsKLSAgICBBU1NFUlQoc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6 Ok92ZXIgfHwgIXVuZGVyKCkubmVlZHNMYXlvdXQoKSk7Ci0gICAgQVNTRVJUKHNjcmlwdFR5cGUo KSA9PSBTY3JpcHRUeXBlOjpVbmRlciB8fCAhb3ZlcigpLm5lZWRzTGF5b3V0KCkpOworICAgIEFT U0VSVChzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6Ok92 ZXIgfHwgIXVuZGVyKCkubmVlZHNMYXlvdXQoKSk7CisgICAgQVNTRVJUKHNjcmlwdFR5cGUoKSA9 PSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6VW5kZXIgfHwgIW92ZXIoKS5uZWVk c0xheW91dCgpKTsKIAogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoID0gYmFzZSgpLmxvZ2lj YWxXaWR0aCgpOwotICAgIGlmIChzY3JpcHRUeXBlKCkgPT0gU2NyaXB0VHlwZTo6VW5kZXIgfHwg c2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6OlVuZGVyT3ZlcikKKyAgICBpZiAoc2NyaXB0VHlw ZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpVbmRlciB8fCBzY3JpcHRU eXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1lbnQ6OlNjcmlwdFR5cGU6OlVuZGVyT3ZlcikKICAg ICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptYXgobG9naWNhbFdpZHRoLCB1bmRlcigpLmxvZ2lj YWxXaWR0aCgpKTsKLSAgICBpZiAoc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6Ok92ZXIgfHwg c2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6OlVuZGVyT3ZlcikKKyAgICBpZiAoc2NyaXB0VHlw ZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpPdmVyIHx8IHNjcmlwdFR5 cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6VW5kZXJPdmVyKQogICAg ICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIG92ZXIoKS5sb2dpY2Fs V2lkdGgoKSk7CiAgICAgc2V0TG9naWNhbFdpZHRoKGxvZ2ljYWxXaWR0aCk7CiAKICAgICBWZXJ0 aWNhbFBhcmFtZXRlcnMgcGFyYW1ldGVycyA9IHZlcnRpY2FsUGFyYW1ldGVycygpOwogICAgIExh eW91dFVuaXQgdmVydGljYWxPZmZzZXQ7Ci0gICAgaWYgKHNjcmlwdFR5cGUoKSA9PSBTY3JpcHRU eXBlOjpPdmVyIHx8IHNjcmlwdFR5cGUoKSA9PSBTY3JpcHRUeXBlOjpVbmRlck92ZXIpIHsKKyAg ICBpZiAoc2NyaXB0VHlwZSgpID09IE1hdGhNTFNjcmlwdHNFbGVtZW50OjpTY3JpcHRUeXBlOjpP dmVyIHx8IHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxlbWVudDo6U2NyaXB0VHlwZTo6 VW5kZXJPdmVyKSB7CiAgICAgICAgIHZlcnRpY2FsT2Zmc2V0ICs9IHBhcmFtZXRlcnMub3ZlckV4 dHJhQXNjZW5kZXI7CiAgICAgICAgIG92ZXIoKS5zZXRMb2NhdGlvbihMYXlvdXRQb2ludChob3Jp em9udGFsT2Zmc2V0KG92ZXIoKSksIHZlcnRpY2FsT2Zmc2V0KSk7CiAgICAgICAgIGlmIChwYXJh bWV0ZXJzLnVzZVVuZGVyT3ZlckJhckZhbGxCYWNrKSB7CkBAIC0zMzYsNyArMzM2LDcgQEAgdm9p ZCBSZW5kZXJNYXRoTUxVbmRlck92ZXI6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJl biwgTGF5b3V0VW5pdCBwYWdlTG8KICAgICB9CiAgICAgYmFzZSgpLnNldExvY2F0aW9uKExheW91 dFBvaW50KGhvcml6b250YWxPZmZzZXQoYmFzZSgpKSwgdmVydGljYWxPZmZzZXQpKTsKICAgICB2 ZXJ0aWNhbE9mZnNldCArPSBiYXNlKCkubG9naWNhbEhlaWdodCgpOwotICAgIGlmIChzY3JpcHRU eXBlKCkgPT0gU2NyaXB0VHlwZTo6VW5kZXIgfHwgc2NyaXB0VHlwZSgpID09IFNjcmlwdFR5cGU6 OlVuZGVyT3ZlcikgeworICAgIGlmIChzY3JpcHRUeXBlKCkgPT0gTWF0aE1MU2NyaXB0c0VsZW1l bnQ6OlNjcmlwdFR5cGU6OlVuZGVyIHx8IHNjcmlwdFR5cGUoKSA9PSBNYXRoTUxTY3JpcHRzRWxl bWVudDo6U2NyaXB0VHlwZTo6VW5kZXJPdmVyKSB7CiAgICAgICAgIGlmIChwYXJhbWV0ZXJzLnVz ZVVuZGVyT3ZlckJhckZhbGxCYWNrKSB7CiAgICAgICAgICAgICBpZiAoIWhhc0FjY2VudFVuZGVy KCkpCiAgICAgICAgICAgICAgICAgdmVydGljYWxPZmZzZXQgKz0gcGFyYW1ldGVycy51bmRlckdh cE1pbjsK