227033 2021-06-15 10:01:34 -0700 Cleanup RenderElement::RendererCreationType 2021-06-15 20:59:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham cdumez changseok esprehn+autocc ews-watchlist glenn gyuyoung.kim kondapallykalyan mifenton pdr simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1769851 0 zalan 2021-06-15 10:01:34 -0700 it's confusing and highly error-prone. 1769853 1 431453 zalan 2021-06-15 10:09:21 -0700 Created attachment 431453 Patch 1769914 2 zalan 2021-06-15 12:27:55 -0700 Looks like we've got one test covering this. Will adjust the patch. 1769928 3 431471 zalan 2021-06-15 13:07:12 -0700 Created attachment 431471 Patch 1769946 4 431471 simon.fraser 2021-06-15 13:53:20 -0700 Comment on attachment 431471 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431471&action=review > Source/WebCore/rendering/RenderElement.cpp:189 > + if (rendererTypeOverride.contains(ConstructBlockLevelRendererFor::TableTypes)) > return createRenderer<RenderBlockFlow>(element, WTFMove(style)); Is this entire 'default' block about table types? Seems like it would better to explicitly check for a table display type here? 1769968 5 zalan 2021-06-15 14:52:48 -0700 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 431471 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=431471&action=review > > > Source/WebCore/rendering/RenderElement.cpp:189 > > + if (rendererTypeOverride.contains(ConstructBlockLevelRendererFor::TableTypes)) > > return createRenderer<RenderBlockFlow>(element, WTFMove(style)); > > Is this entire 'default' block about table types? Seems like it would better > to explicitly check for a table display type here? Yeah, that's a good idea. 1770058 6 431511 zalan 2021-06-15 19:39:29 -0700 Created attachment 431511 Patch 1770069 7 ews-feeder 2021-06-15 20:58:58 -0700 Committed r278919 (238850@main): <https://commits.webkit.org/238850@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431511. 1770070 8 webkit-bug-importer 2021-06-15 20:59:17 -0700 <rdar://problem/79377750> 431453 2021-06-15 10:09:21 -0700 2021-06-15 13:07:10 -0700 Patch bug-227033-20210615100920.patch text/plain 7472 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ4NjAwOTQ1ZTEzMDBl NzEwMzdmMmJkMTZkODZhNzkzN2JmZDc0OC4uYTc3N2FhMTAwYzM1MTkxM2U0Yjg2ZTMwNWQ0MDFh MGUxMjJiNzVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIFJlbmRlckVsZW1l bnQ6OlJlbmRlcmVyQ3JlYXRpb25UeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjcwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMZXQgdGhlIGNhbGxlciBkZWZpbmUgdGhlIHByZWZlcnJlZCB0eXBl IG9mIHJlbmRlcmVyIGZvciBjZXJ0YWluIGRpc3BsYXkgdHlwZSB2YWx1ZXMuCisKKyAgICAgICAg KiBodG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZp ZWxkU2V0RWxlbWVudDo6Y3JlYXRlRWxlbWVudFJlbmRlcmVyKToKKyAgICAgICAgKiBodG1sL0hU TUxTdW1tYXJ5RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU3VtbWFyeUVsZW1l bnQ6OmNyZWF0ZUVsZW1lbnRSZW5kZXJlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKToKKwogMjAyMS0wNi0xNSAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBDb3JlTWVkaWEgV3JhcHBl ckNsYXNzIGRvZXMgbm90IG5lZWQgYWxpZ25tZW50IGZpeHVwCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRmllbGRTZXRFbGVtZW50LmNwcAppbmRleCAxNzY1Y2M1OTg4MDkzMjhkNDk2M2Y1NWI5 OTVjN2ZkNTZiMDY5MWFiLi44YzgxOWMzYWRlZDU5NmE5OWVkNzlhNWU5NjY3Mzg1YjM1ZjI4YTE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZpZWxkU2V0RWxlbWVudC5jcHAKQEAgLTE2 MCw3ICsxNjAsOCBAQCBjb25zdCBBdG9tU3RyaW5nJiBIVE1MRmllbGRTZXRFbGVtZW50Ojpmb3Jt Q29udHJvbFR5cGUoKSBjb25zdAogCiBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gSFRNTEZpZWxk U2V0RWxlbWVudDo6Y3JlYXRlRWxlbWVudFJlbmRlcmVyKFJlbmRlclN0eWxlJiYgc3R5bGUsIGNv bnN0IFJlbmRlclRyZWVQb3NpdGlvbiYpCiB7Ci0gICAgcmV0dXJuIFJlbmRlckVsZW1lbnQ6OmNy ZWF0ZUZvcigqdGhpcywgV1RGTW92ZShzdHlsZSksIFJlbmRlckVsZW1lbnQ6Ok9ubHlDcmVhdGVC bG9ja0FuZEZsZXhib3hSZW5kZXJlcnMpOworICAgIC8vIEZpZWxkc2V0cyBzaG91bGQgbWFrZSBh IGJsb2NrIGZsb3cgaWYgZGlzcGxheTogaW5saW5lIG9yIHRhYmxlIHR5cGVzIGFyZSBzZXQuCisg ICAgcmV0dXJuIFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcigqdGhpcywgV1RGTW92ZShzdHlsZSks IHsgUmVuZGVyRWxlbWVudDo6Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yOjpJbmxpbmUs IFJlbmRlckVsZW1lbnQ6OkNvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcjo6VGFibGVUeXBl cyB9KTsKIH0KIAogSFRNTExlZ2VuZEVsZW1lbnQqIEhUTUxGaWVsZFNldEVsZW1lbnQ6OmxlZ2Vu ZCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdW1tYXJ5RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdW1tYXJ5RWxlbWVudC5jcHAKaW5k ZXggODRiMTQxODI3ZTM0YmQxNWU4NDZmMzE2NDQ3YjZmNDAwMjZhZTg0Ny4uYjQ5MDQyYjA0ZTFl NzlkYjYxNTgzNThjMGI4MDE1ZDg5NjVkODc1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MU3VtbWFyeUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFN1bW1hcnlFbGVtZW50LmNwcApAQCAtNjUsNyArNjUsOSBAQCBIVE1MU3VtbWFyeUVsZW1lbnQ6 OkhUTUxTdW1tYXJ5RWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVu dCYgZAogCiBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gSFRNTFN1bW1hcnlFbGVtZW50OjpjcmVh dGVFbGVtZW50UmVuZGVyZXIoUmVuZGVyU3R5bGUmJiBzdHlsZSwgY29uc3QgUmVuZGVyVHJlZVBv c2l0aW9uJikKIHsKLSAgICByZXR1cm4gUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKCp0aGlzLCBX VEZNb3ZlKHN0eWxlKSwgUmVuZGVyRWxlbWVudDo6T25seUNyZWF0ZUJsb2NrQW5kRmxleGJveFJl bmRlcmVycyk7CisgICAgLy8gPHN1bW1hcnk+IGVsZW1lbnRzIHdpdGggZGlzcGxheTpsaXN0LWl0 ZW0gc2hvdWxkIG5vdCBiZSByZW5kZXJlZCBhcyBsaXN0IGl0ZW1zIGJlY2F1c2UKKyAgICAvLyB0 aGV5J2QgZW5kIHVwIHdpdGggdHdvIG1hcmtlcnMgYmVmb3JlIHRoZSB0ZXh0IChvbmUgZnJvbSBz dW1tYXJ5IGVsZW1lbnQgYW5kIHRoZSBvdGhlciBhcyBhIGxpc3QgaXRlbSkuCisgICAgcmV0dXJu IFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcigqdGhpcywgV1RGTW92ZShzdHlsZSksIHsgUmVuZGVy RWxlbWVudDo6Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yOjpMaXN0SXRlbSwgUmVuZGVy RWxlbWVudDo6Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yOjpUYWJsZVR5cGVzIH0pOwog fQogCiB2b2lkIEhUTUxTdW1tYXJ5RWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdChT aGFkb3dSb290JiByb290KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwCmluZGV4IDY0ZDNlZmIwZjJkOTA1YzY5N2QyODUzY2NhODhlMTE1MGJkZjZhMmIuLjlkNWFl Zjc5YTVmZWQ0ODlkMGUyM2I4ZGVkOTRjMzA0ODc2Yjc3NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTE0NSwxMyArMTQ1LDEzIEBAIFJlbmRlckVs ZW1lbnQ6On5SZW5kZXJFbGVtZW50KCkKICAgICBBU1NFUlQoIW1fZmlyc3RDaGlsZCk7CiB9CiAK LVJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBSZW5kZXJFbGVtZW50OjpjcmVhdGVGb3IoRWxlbWVu dCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwgUmVuZGVyZXJDcmVhdGlvblR5cGUgY3Jl YXRpb25UeXBlKQorUmVuZGVyUHRyPFJlbmRlckVsZW1lbnQ+IFJlbmRlckVsZW1lbnQ6OmNyZWF0 ZUZvcihFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlLCBPcHRpb25TZXQ8Q29u c3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yPiByZW5kZXJlclR5cGVPdmVycmlkZSkKIHsKICAg ICAvLyBNaW5pbWFsIHN1cHBvcnQgZm9yIGNvbnRlbnQgcHJvcGVydGllcyByZXBsYWNpbmcgYW4g ZW50aXJlIGVsZW1lbnQuCiAgICAgLy8gV29ya3Mgb25seSBpZiB3ZSBoYXZlIGV4YWN0bHkgb25l IHBpZWNlIG9mIGNvbnRlbnQgYW5kIGl0J3MgYSBVUkwuCiAgICAgLy8gT3RoZXJ3aXNlIGFjdHMg YXMgaWYgd2UgZGlkbid0IHN1cHBvcnQgdGhpcyBmZWF0dXJlLgogICAgIGNvbnN0IENvbnRlbnRE YXRhKiBjb250ZW50RGF0YSA9IHN0eWxlLmNvbnRlbnREYXRhKCk7Ci0gICAgaWYgKGNyZWF0aW9u VHlwZSA9PSBDcmVhdGVBbGxSZW5kZXJlcnMgJiYgY29udGVudERhdGEgJiYgIWNvbnRlbnREYXRh LT5uZXh0KCkgJiYgaXM8SW1hZ2VDb250ZW50RGF0YT4oKmNvbnRlbnREYXRhKSAmJiAhZWxlbWVu dC5pc1BzZXVkb0VsZW1lbnQoKSkgeworICAgIGlmICghcmVuZGVyZXJUeXBlT3ZlcnJpZGUgJiYg Y29udGVudERhdGEgJiYgIWNvbnRlbnREYXRhLT5uZXh0KCkgJiYgaXM8SW1hZ2VDb250ZW50RGF0 YT4oKmNvbnRlbnREYXRhKSAmJiAhZWxlbWVudC5pc1BzZXVkb0VsZW1lbnQoKSkgewogICAgICAg ICBTdHlsZTo6bG9hZFBlbmRpbmdSZXNvdXJjZXMoc3R5bGUsIGVsZW1lbnQuZG9jdW1lbnQoKSwg JmVsZW1lbnQpOwogICAgICAgICBhdXRvJiBzdHlsZUltYWdlID0gZG93bmNhc3Q8SW1hZ2VDb250 ZW50RGF0YT4oKmNvbnRlbnREYXRhKS5pbWFnZSgpOwogICAgICAgICBhdXRvIGltYWdlID0gY3Jl YXRlUmVuZGVyZXI8UmVuZGVySW1hZ2U+KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpLCBjb25zdF9j YXN0PFN0eWxlSW1hZ2UqPigmc3R5bGVJbWFnZSkpOwpAQCAtMTY0LDE4ICsxNjQsMTUgQEAgUmVu ZGVyUHRyPFJlbmRlckVsZW1lbnQ+IFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcihFbGVtZW50JiBl bGVtZW50LCBSZW5kZXJTdHlsZSYKICAgICBjYXNlIERpc3BsYXlUeXBlOjpDb250ZW50czoKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6SW5saW5lOgotICAg ICAgICBpZiAoY3JlYXRpb25UeXBlID09IENyZWF0ZUFsbFJlbmRlcmVycykKLSAgICAgICAgICAg IHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJJbmxpbmU+KGVsZW1lbnQsIFdURk1vdmUoc3R5 bGUpKTsKLSAgICAgICAgRkFMTFRIUk9VR0g7IC8vIEZpZWxkc2V0cyBzaG91bGQgbWFrZSBhIGJs b2NrIGZsb3cgaWYgZGlzcGxheTppbmxpbmUgaXMgc2V0LgorICAgICAgICBpZiAocmVuZGVyZXJU eXBlT3ZlcnJpZGUuY29udGFpbnMoQ29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yOjpJbmxp bmUpKQorICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckJsb2NrRmxvdz4o ZWxlbWVudCwgV1RGTW92ZShzdHlsZSkpOworICAgICAgICByZXR1cm4gY3JlYXRlUmVuZGVyZXI8 UmVuZGVySW5saW5lPihlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSk7CiAgICAgY2FzZSBEaXNwbGF5 VHlwZTo6QmxvY2s6CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6Rmxvd1Jvb3Q6CiAgICAgY2FzZSBE aXNwbGF5VHlwZTo6SW5saW5lQmxvY2s6CiAgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxS ZW5kZXJCbG9ja0Zsb3c+KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKTsKICAgICBjYXNlIERpc3Bs YXlUeXBlOjpMaXN0SXRlbToKLSAgICAgICAgLy8gPHN1bW1hcnk+IGVsZW1lbnRzIHdpdGggZGlz cGxheTpsaXN0LWl0ZW0gc2hvdWxkIG5vdCBiZSByZW5kZXJlZCBhcyBsaXN0IGl0ZW1zIGJlY2F1 c2UKLSAgICAgICAgLy8gdGhleSdkIGVuZCB1cCB3aXRoIHR3byBtYXJrZXJzIGJlZm9yZSB0aGUg dGV4dCAob25lIGZyb20gc3VtbWFyeSBlbGVtZW50IGFuZCB0aGUgb3RoZXIgYXMKLSAgICAgICAg Ly8gYSBsaXN0IGl0ZW0pLgotICAgICAgICBpZiAoY3JlYXRpb25UeXBlID09IE9ubHlDcmVhdGVC bG9ja0FuZEZsZXhib3hSZW5kZXJlcnMpCisgICAgICAgIGlmIChyZW5kZXJlclR5cGVPdmVycmlk ZS5jb250YWlucyhDb25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJGb3I6Okxpc3RJdGVtKSkKICAg ICAgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJCbG9ja0Zsb3c+KGVsZW1lbnQs IFdURk1vdmUoc3R5bGUpKTsKICAgICAgICAgcmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckxp c3RJdGVtPihlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSk7CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6 RmxleDoKQEAgLTE4OCw3ICsxODUsNyBAQCBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gUmVuZGVy RWxlbWVudDo6Y3JlYXRlRm9yKEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJgogICAgIGNh c2UgRGlzcGxheVR5cGU6OklubGluZUJveDoKICAgICAgICAgcmV0dXJuIGNyZWF0ZVJlbmRlcmVy PFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveD4oZWxlbWVudCwgV1RGTW92ZShzdHlsZSkpOwog ICAgIGRlZmF1bHQ6IHsKLSAgICAgICAgaWYgKGNyZWF0aW9uVHlwZSA9PSBPbmx5Q3JlYXRlQmxv Y2tBbmRGbGV4Ym94UmVuZGVyZXJzKQorICAgICAgICBpZiAocmVuZGVyZXJUeXBlT3ZlcnJpZGUu Y29udGFpbnMoQ29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yOjpUYWJsZVR5cGVzKSkKICAg ICAgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJCbG9ja0Zsb3c+KGVsZW1lbnQs IFdURk1vdmUoc3R5bGUpKTsKICAgICAgICAgc3dpdGNoIChzdHlsZS5kaXNwbGF5KCkpIHsKICAg ICAgICAgY2FzZSBEaXNwbGF5VHlwZTo6VGFibGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuaAppbmRleCBjMmUwNGJlOTYxYzExNWU1ZDA5MDVmMTJiMzhlMmQyZTE1NjJj NWM0Li4xYTA5Y2FiODg2NWRmNjg5N2Q3ODBiYzZhNjFkNmRiYzM1NDA0ODRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKQEAgLTM5LDggKzM5LDEyIEBAIGNsYXNz IFJlbmRlckVsZW1lbnQgOiBwdWJsaWMgUmVuZGVyT2JqZWN0IHsKIHB1YmxpYzoKICAgICB2aXJ0 dWFsIH5SZW5kZXJFbGVtZW50KCk7CiAKLSAgICBlbnVtIFJlbmRlcmVyQ3JlYXRpb25UeXBlIHsg Q3JlYXRlQWxsUmVuZGVyZXJzLCBPbmx5Q3JlYXRlQmxvY2tBbmRGbGV4Ym94UmVuZGVyZXJzIH07 Ci0gICAgc3RhdGljIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBjcmVhdGVGb3IoRWxlbWVudCYs IFJlbmRlclN0eWxlJiYsIFJlbmRlcmVyQ3JlYXRpb25UeXBlID0gQ3JlYXRlQWxsUmVuZGVyZXJz KTsKKyAgICBlbnVtIGNsYXNzIENvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvciB7CisgICAg ICAgIElubGluZSAgICAgPSAxIDw8IDAsCisgICAgICAgIExpc3RJdGVtICAgPSAxIDw8IDEsCisg ICAgICAgIFRhYmxlVHlwZXMgPSAxIDw8IDIKKyAgICB9OworICAgIHN0YXRpYyBSZW5kZXJQdHI8 UmVuZGVyRWxlbWVudD4gY3JlYXRlRm9yKEVsZW1lbnQmLCBSZW5kZXJTdHlsZSYmLCBPcHRpb25T ZXQ8Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yPiA9IHsgfSk7CiAKICAgICBib29sIGhh c0luaXRpYWxpemVkU3R5bGUoKSBjb25zdCB7IHJldHVybiBtX2hhc0luaXRpYWxpemVkU3R5bGU7 IH0KIAo= 431471 2021-06-15 13:07:12 -0700 2021-06-15 19:39:26 -0700 Patch bug-227033-20210615130712.patch text/plain 7519 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ4NjAwOTQ1ZTEzMDBl NzEwMzdmMmJkMTZkODZhNzkzN2JmZDc0OC4uYTc3N2FhMTAwYzM1MTkxM2U0Yjg2ZTMwNWQ0MDFh MGUxMjJiNzVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIFJlbmRlckVsZW1l bnQ6OlJlbmRlcmVyQ3JlYXRpb25UeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjcwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMZXQgdGhlIGNhbGxlciBkZWZpbmUgdGhlIHByZWZlcnJlZCB0eXBl IG9mIHJlbmRlcmVyIGZvciBjZXJ0YWluIGRpc3BsYXkgdHlwZSB2YWx1ZXMuCisKKyAgICAgICAg KiBodG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZp ZWxkU2V0RWxlbWVudDo6Y3JlYXRlRWxlbWVudFJlbmRlcmVyKToKKyAgICAgICAgKiBodG1sL0hU TUxTdW1tYXJ5RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU3VtbWFyeUVsZW1l bnQ6OmNyZWF0ZUVsZW1lbnRSZW5kZXJlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKToKKwogMjAyMS0wNi0xNSAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBDb3JlTWVkaWEgV3JhcHBl ckNsYXNzIGRvZXMgbm90IG5lZWQgYWxpZ25tZW50IGZpeHVwCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRmllbGRTZXRFbGVtZW50LmNwcAppbmRleCAxNzY1Y2M1OTg4MDkzMjhkNDk2M2Y1NWI5 OTVjN2ZkNTZiMDY5MWFiLi44YzgxOWMzYWRlZDU5NmE5OWVkNzlhNWU5NjY3Mzg1YjM1ZjI4YTE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGaWVsZFNldEVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZpZWxkU2V0RWxlbWVudC5jcHAKQEAgLTE2 MCw3ICsxNjAsOCBAQCBjb25zdCBBdG9tU3RyaW5nJiBIVE1MRmllbGRTZXRFbGVtZW50Ojpmb3Jt Q29udHJvbFR5cGUoKSBjb25zdAogCiBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gSFRNTEZpZWxk U2V0RWxlbWVudDo6Y3JlYXRlRWxlbWVudFJlbmRlcmVyKFJlbmRlclN0eWxlJiYgc3R5bGUsIGNv bnN0IFJlbmRlclRyZWVQb3NpdGlvbiYpCiB7Ci0gICAgcmV0dXJuIFJlbmRlckVsZW1lbnQ6OmNy ZWF0ZUZvcigqdGhpcywgV1RGTW92ZShzdHlsZSksIFJlbmRlckVsZW1lbnQ6Ok9ubHlDcmVhdGVC bG9ja0FuZEZsZXhib3hSZW5kZXJlcnMpOworICAgIC8vIEZpZWxkc2V0cyBzaG91bGQgbWFrZSBh IGJsb2NrIGZsb3cgaWYgZGlzcGxheTogaW5saW5lIG9yIHRhYmxlIHR5cGVzIGFyZSBzZXQuCisg ICAgcmV0dXJuIFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcigqdGhpcywgV1RGTW92ZShzdHlsZSks IHsgUmVuZGVyRWxlbWVudDo6Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yOjpJbmxpbmUs IFJlbmRlckVsZW1lbnQ6OkNvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcjo6VGFibGVUeXBl cyB9KTsKIH0KIAogSFRNTExlZ2VuZEVsZW1lbnQqIEhUTUxGaWVsZFNldEVsZW1lbnQ6OmxlZ2Vu ZCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdW1tYXJ5RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdW1tYXJ5RWxlbWVudC5jcHAKaW5k ZXggODRiMTQxODI3ZTM0YmQxNWU4NDZmMzE2NDQ3YjZmNDAwMjZhZTg0Ny4uMDhkZjY5ZDk3ZmMz YmU2MDI2YmU3NmIwNGE1YTQ2NDkzY2U1ZjQ4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MU3VtbWFyeUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFN1bW1hcnlFbGVtZW50LmNwcApAQCAtNjUsNyArNjUsOCBAQCBIVE1MU3VtbWFyeUVsZW1lbnQ6 OkhUTUxTdW1tYXJ5RWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVu dCYgZAogCiBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gSFRNTFN1bW1hcnlFbGVtZW50OjpjcmVh dGVFbGVtZW50UmVuZGVyZXIoUmVuZGVyU3R5bGUmJiBzdHlsZSwgY29uc3QgUmVuZGVyVHJlZVBv c2l0aW9uJikKIHsKLSAgICByZXR1cm4gUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKCp0aGlzLCBX VEZNb3ZlKHN0eWxlKSwgUmVuZGVyRWxlbWVudDo6T25seUNyZWF0ZUJsb2NrQW5kRmxleGJveFJl bmRlcmVycyk7CisgICAgLy8gPHN1bW1hcnk+IGVsZW1lbnRzIHdpdGggZGlzcGxheTpsaXN0LWl0 ZW0gc2hvdWxkIG5vdCBiZSByZW5kZXJlZCBhcyBsaXN0IGl0ZW1zIGJlY2F1c2UgdGhleSdkIGVu ZCB1cCB3aXRoIHR3byBtYXJrZXJzIGJlZm9yZSB0aGUgdGV4dCAob25lIGZyb20gc3VtbWFyeSBl bGVtZW50IGFuZCB0aGUgb3RoZXIgYXMgYSBsaXN0IGl0ZW0pLgorICAgIHJldHVybiBSZW5kZXJF bGVtZW50OjpjcmVhdGVGb3IoKnRoaXMsIFdURk1vdmUoc3R5bGUpLCB7IFJlbmRlckVsZW1lbnQ6 OkNvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcjo6TGlzdEl0ZW0sIFJlbmRlckVsZW1lbnQ6 OkNvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcjo6SW5saW5lLCBSZW5kZXJFbGVtZW50OjpD b25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJGb3I6OlRhYmxlVHlwZXMgfSk7CiB9CiAKIHZvaWQg SFRNTFN1bW1hcnlFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3Qm IHJvb3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXgg NjRkM2VmYjBmMmQ5MDVjNjk3ZDI4NTNjY2E4OGUxMTUwYmRmNmEyYi4uOWQ1YWVmNzlhNWZlZDQ4 OWQwZTIzYjhkZWQ5NGMzMDQ4NzZiNzc2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJFbGVtZW50LmNwcApAQCAtMTQ1LDEzICsxNDUsMTMgQEAgUmVuZGVyRWxlbWVudDo6flJl bmRlckVsZW1lbnQoKQogICAgIEFTU0VSVCghbV9maXJzdENoaWxkKTsKIH0KIAotUmVuZGVyUHRy PFJlbmRlckVsZW1lbnQ+IFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcihFbGVtZW50JiBlbGVtZW50 LCBSZW5kZXJTdHlsZSYmIHN0eWxlLCBSZW5kZXJlckNyZWF0aW9uVHlwZSBjcmVhdGlvblR5cGUp CitSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKEVsZW1l bnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUsIE9wdGlvblNldDxDb25zdHJ1Y3RCbG9j a0xldmVsUmVuZGVyZXJGb3I+IHJlbmRlcmVyVHlwZU92ZXJyaWRlKQogewogICAgIC8vIE1pbmlt YWwgc3VwcG9ydCBmb3IgY29udGVudCBwcm9wZXJ0aWVzIHJlcGxhY2luZyBhbiBlbnRpcmUgZWxl bWVudC4KICAgICAvLyBXb3JrcyBvbmx5IGlmIHdlIGhhdmUgZXhhY3RseSBvbmUgcGllY2Ugb2Yg Y29udGVudCBhbmQgaXQncyBhIFVSTC4KICAgICAvLyBPdGhlcndpc2UgYWN0cyBhcyBpZiB3ZSBk aWRuJ3Qgc3VwcG9ydCB0aGlzIGZlYXR1cmUuCiAgICAgY29uc3QgQ29udGVudERhdGEqIGNvbnRl bnREYXRhID0gc3R5bGUuY29udGVudERhdGEoKTsKLSAgICBpZiAoY3JlYXRpb25UeXBlID09IENy ZWF0ZUFsbFJlbmRlcmVycyAmJiBjb250ZW50RGF0YSAmJiAhY29udGVudERhdGEtPm5leHQoKSAm JiBpczxJbWFnZUNvbnRlbnREYXRhPigqY29udGVudERhdGEpICYmICFlbGVtZW50LmlzUHNldWRv RWxlbWVudCgpKSB7CisgICAgaWYgKCFyZW5kZXJlclR5cGVPdmVycmlkZSAmJiBjb250ZW50RGF0 YSAmJiAhY29udGVudERhdGEtPm5leHQoKSAmJiBpczxJbWFnZUNvbnRlbnREYXRhPigqY29udGVu dERhdGEpICYmICFlbGVtZW50LmlzUHNldWRvRWxlbWVudCgpKSB7CiAgICAgICAgIFN0eWxlOjps b2FkUGVuZGluZ1Jlc291cmNlcyhzdHlsZSwgZWxlbWVudC5kb2N1bWVudCgpLCAmZWxlbWVudCk7 CiAgICAgICAgIGF1dG8mIHN0eWxlSW1hZ2UgPSBkb3duY2FzdDxJbWFnZUNvbnRlbnREYXRhPigq Y29udGVudERhdGEpLmltYWdlKCk7CiAgICAgICAgIGF1dG8gaW1hZ2UgPSBjcmVhdGVSZW5kZXJl cjxSZW5kZXJJbWFnZT4oZWxlbWVudCwgV1RGTW92ZShzdHlsZSksIGNvbnN0X2Nhc3Q8U3R5bGVJ bWFnZSo+KCZzdHlsZUltYWdlKSk7CkBAIC0xNjQsMTggKzE2NCwxNSBAQCBSZW5kZXJQdHI8UmVu ZGVyRWxlbWVudD4gUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKEVsZW1lbnQmIGVsZW1lbnQsIFJl bmRlclN0eWxlJgogICAgIGNhc2UgRGlzcGxheVR5cGU6OkNvbnRlbnRzOgogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpJbmxpbmU6Ci0gICAgICAgIGlmIChj cmVhdGlvblR5cGUgPT0gQ3JlYXRlQWxsUmVuZGVyZXJzKQotICAgICAgICAgICAgcmV0dXJuIGNy ZWF0ZVJlbmRlcmVyPFJlbmRlcklubGluZT4oZWxlbWVudCwgV1RGTW92ZShzdHlsZSkpOwotICAg ICAgICBGQUxMVEhST1VHSDsgLy8gRmllbGRzZXRzIHNob3VsZCBtYWtlIGEgYmxvY2sgZmxvdyBp ZiBkaXNwbGF5OmlubGluZSBpcyBzZXQuCisgICAgICAgIGlmIChyZW5kZXJlclR5cGVPdmVycmlk ZS5jb250YWlucyhDb25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJGb3I6OklubGluZSkpCisgICAg ICAgICAgICByZXR1cm4gY3JlYXRlUmVuZGVyZXI8UmVuZGVyQmxvY2tGbG93PihlbGVtZW50LCBX VEZNb3ZlKHN0eWxlKSk7CisgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJJbmxp bmU+KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKTsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpCbG9j azoKICAgICBjYXNlIERpc3BsYXlUeXBlOjpGbG93Um9vdDoKICAgICBjYXNlIERpc3BsYXlUeXBl OjpJbmxpbmVCbG9jazoKICAgICAgICAgcmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckJsb2Nr Rmxvdz4oZWxlbWVudCwgV1RGTW92ZShzdHlsZSkpOwogICAgIGNhc2UgRGlzcGxheVR5cGU6Okxp c3RJdGVtOgotICAgICAgICAvLyA8c3VtbWFyeT4gZWxlbWVudHMgd2l0aCBkaXNwbGF5Omxpc3Qt aXRlbSBzaG91bGQgbm90IGJlIHJlbmRlcmVkIGFzIGxpc3QgaXRlbXMgYmVjYXVzZQotICAgICAg ICAvLyB0aGV5J2QgZW5kIHVwIHdpdGggdHdvIG1hcmtlcnMgYmVmb3JlIHRoZSB0ZXh0IChvbmUg ZnJvbSBzdW1tYXJ5IGVsZW1lbnQgYW5kIHRoZSBvdGhlciBhcwotICAgICAgICAvLyBhIGxpc3Qg aXRlbSkuCi0gICAgICAgIGlmIChjcmVhdGlvblR5cGUgPT0gT25seUNyZWF0ZUJsb2NrQW5kRmxl eGJveFJlbmRlcmVycykKKyAgICAgICAgaWYgKHJlbmRlcmVyVHlwZU92ZXJyaWRlLmNvbnRhaW5z KENvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcjo6TGlzdEl0ZW0pKQogICAgICAgICAgICAg cmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckJsb2NrRmxvdz4oZWxlbWVudCwgV1RGTW92ZShz dHlsZSkpOwogICAgICAgICByZXR1cm4gY3JlYXRlUmVuZGVyZXI8UmVuZGVyTGlzdEl0ZW0+KGVs ZW1lbnQsIFdURk1vdmUoc3R5bGUpKTsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpGbGV4OgpAQCAt MTg4LDcgKzE4NSw3IEBAIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBSZW5kZXJFbGVtZW50Ojpj cmVhdGVGb3IoRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmCiAgICAgY2FzZSBEaXNwbGF5 VHlwZTo6SW5saW5lQm94OgogICAgICAgICByZXR1cm4gY3JlYXRlUmVuZGVyZXI8UmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94PihlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSk7CiAgICAgZGVmYXVs dDogewotICAgICAgICBpZiAoY3JlYXRpb25UeXBlID09IE9ubHlDcmVhdGVCbG9ja0FuZEZsZXhi b3hSZW5kZXJlcnMpCisgICAgICAgIGlmIChyZW5kZXJlclR5cGVPdmVycmlkZS5jb250YWlucyhD b25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJGb3I6OlRhYmxlVHlwZXMpKQogICAgICAgICAgICAg cmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckJsb2NrRmxvdz4oZWxlbWVudCwgV1RGTW92ZShz dHlsZSkpOwogICAgICAgICBzd2l0Y2ggKHN0eWxlLmRpc3BsYXkoKSkgewogICAgICAgICBjYXNl IERpc3BsYXlUeXBlOjpUYWJsZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVu dC5oCmluZGV4IGMyZTA0YmU5NjFjMTE1ZTVkMDkwNWYxMmIzOGUyZDJlMTU2MmM1YzQuLjFhMDlj YWI4ODY1ZGY2ODk3ZDc4MGJjNmE2MWQ2ZGJjMzU0MDQ4NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMzksOCArMzksMTIgQEAgY2xhc3MgUmVuZGVyRWxl bWVudCA6IHB1YmxpYyBSZW5kZXJPYmplY3QgewogcHVibGljOgogICAgIHZpcnR1YWwgflJlbmRl ckVsZW1lbnQoKTsKIAotICAgIGVudW0gUmVuZGVyZXJDcmVhdGlvblR5cGUgeyBDcmVhdGVBbGxS ZW5kZXJlcnMsIE9ubHlDcmVhdGVCbG9ja0FuZEZsZXhib3hSZW5kZXJlcnMgfTsKLSAgICBzdGF0 aWMgUmVuZGVyUHRyPFJlbmRlckVsZW1lbnQ+IGNyZWF0ZUZvcihFbGVtZW50JiwgUmVuZGVyU3R5 bGUmJiwgUmVuZGVyZXJDcmVhdGlvblR5cGUgPSBDcmVhdGVBbGxSZW5kZXJlcnMpOworICAgIGVu dW0gY2xhc3MgQ29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yIHsKKyAgICAgICAgSW5saW5l ICAgICA9IDEgPDwgMCwKKyAgICAgICAgTGlzdEl0ZW0gICA9IDEgPDwgMSwKKyAgICAgICAgVGFi bGVUeXBlcyA9IDEgPDwgMgorICAgIH07CisgICAgc3RhdGljIFJlbmRlclB0cjxSZW5kZXJFbGVt ZW50PiBjcmVhdGVGb3IoRWxlbWVudCYsIFJlbmRlclN0eWxlJiYsIE9wdGlvblNldDxDb25zdHJ1 Y3RCbG9ja0xldmVsUmVuZGVyZXJGb3I+ID0geyB9KTsKIAogICAgIGJvb2wgaGFzSW5pdGlhbGl6 ZWRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSW5pdGlhbGl6ZWRTdHlsZTsgfQogCg== 431511 2021-06-15 19:39:29 -0700 2021-06-15 20:59:00 -0700 Patch bug-227033-20210615193928.patch text/plain 9610 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTg1NmNiN2Q5MDNmNDY4 Y2E3YjM5ZjM2NDA2OWM3ZjNkMzcxNTgwNi4uMWU3OGY4N2NmYzRjNzJlNGM0YTI5ZjZjYTMyODI4 NGY2MGQ0OGUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIFJlbmRlckVsZW1l bnQ6OlJlbmRlcmVyQ3JlYXRpb25UeXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjcwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFz ZXIuCisKKyAgICAgICAgTGV0IHRoZSBjYWxsZXIgZGVmaW5lIHRoZSBwcmVmZXJyZWQgdHlwZSBv ZiByZW5kZXJlciBmb3IgY2VydGFpbiBkaXNwbGF5IHR5cGUgdmFsdWVzLgorCisgICAgICAgICog aHRtbC9IVE1MRmllbGRTZXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGaWVs ZFNldEVsZW1lbnQ6OmNyZWF0ZUVsZW1lbnRSZW5kZXJlcik6CisgICAgICAgICogaHRtbC9IVE1M U3VtbWFyeUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFN1bW1hcnlFbGVtZW50 OjpjcmVhdGVFbGVtZW50UmVuZGVyZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckVsZW1lbnQ6OmNyZWF0ZUZvcik6CisKIDIwMjEtMDYtMTUgIEFuZHJlcyBHb256YWxleiAg PGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyAtIFZvaWNlT3ZlciByZWFkcyBp bmNvcnJlY3RseSBpbiBjb250ZW50IGVkaXRhYmxlIGVsZW1lbnQgaWYgcm9sZT0iZG9jdW1lbnQi LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRmllbGRTZXRFbGVtZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZpZWxkU2V0RWxlbWVudC5jcHAKaW5kZXggMTc2 NWNjNTk4ODA5MzI4ZDQ5NjNmNTViOTk1YzdmZDU2YjA2OTFhYi4uZDlmYWNmYWQ1ZmNiMzcyMWJh NzZmMTk2ZmFmOTRlNTczYjQ1ZjIwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRmllbGRTZXRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGaWVs ZFNldEVsZW1lbnQuY3BwCkBAIC0xNjAsNyArMTYwLDggQEAgY29uc3QgQXRvbVN0cmluZyYgSFRN TEZpZWxkU2V0RWxlbWVudDo6Zm9ybUNvbnRyb2xUeXBlKCkgY29uc3QKIAogUmVuZGVyUHRyPFJl bmRlckVsZW1lbnQ+IEhUTUxGaWVsZFNldEVsZW1lbnQ6OmNyZWF0ZUVsZW1lbnRSZW5kZXJlcihS ZW5kZXJTdHlsZSYmIHN0eWxlLCBjb25zdCBSZW5kZXJUcmVlUG9zaXRpb24mKQogewotICAgIHJl dHVybiBSZW5kZXJFbGVtZW50OjpjcmVhdGVGb3IoKnRoaXMsIFdURk1vdmUoc3R5bGUpLCBSZW5k ZXJFbGVtZW50OjpPbmx5Q3JlYXRlQmxvY2tBbmRGbGV4Ym94UmVuZGVyZXJzKTsKKyAgICAvLyBG aWVsZHNldHMgc2hvdWxkIG1ha2UgYSBibG9jayBmbG93IGlmIGRpc3BsYXk6IGlubGluZSBvciB0 YWJsZSB0eXBlcyBhcmUgc2V0LgorICAgIHJldHVybiBSZW5kZXJFbGVtZW50OjpjcmVhdGVGb3Io KnRoaXMsIFdURk1vdmUoc3R5bGUpLCB7IFJlbmRlckVsZW1lbnQ6OkNvbnN0cnVjdEJsb2NrTGV2 ZWxSZW5kZXJlckZvcjo6SW5saW5lLCBSZW5kZXJFbGVtZW50OjpDb25zdHJ1Y3RCbG9ja0xldmVs UmVuZGVyZXJGb3I6OlRhYmxlT3JUYWJsZVBhcnQgfSk7CiB9CiAKIEhUTUxMZWdlbmRFbGVtZW50 KiBIVE1MRmllbGRTZXRFbGVtZW50OjpsZWdlbmQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MU3VtbWFyeUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MU3VtbWFyeUVsZW1lbnQuY3BwCmluZGV4IDg0YjE0MTgyN2UzNGJkMTVlODQ2ZjMxNjQ0 N2I2ZjQwMDI2YWU4NDcuLmMzM2ZlNmUzNGRjYTQyZDFjZTU1MGQ2ODg3ZTMxM2YxZGEwYzU2Mjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN1bW1hcnlFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdW1tYXJ5RWxlbWVudC5jcHAKQEAgLTY1LDcg KzY1LDggQEAgSFRNTFN1bW1hcnlFbGVtZW50OjpIVE1MU3VtbWFyeUVsZW1lbnQoY29uc3QgUXVh bGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQmIGQKIAogUmVuZGVyUHRyPFJlbmRlckVsZW1l bnQ+IEhUTUxTdW1tYXJ5RWxlbWVudDo6Y3JlYXRlRWxlbWVudFJlbmRlcmVyKFJlbmRlclN0eWxl JiYgc3R5bGUsIGNvbnN0IFJlbmRlclRyZWVQb3NpdGlvbiYpCiB7Ci0gICAgcmV0dXJuIFJlbmRl ckVsZW1lbnQ6OmNyZWF0ZUZvcigqdGhpcywgV1RGTW92ZShzdHlsZSksIFJlbmRlckVsZW1lbnQ6 Ok9ubHlDcmVhdGVCbG9ja0FuZEZsZXhib3hSZW5kZXJlcnMpOworICAgIC8vIDxzdW1tYXJ5PiBl bGVtZW50cyB3aXRoIGRpc3BsYXk6bGlzdC1pdGVtIHNob3VsZCBub3QgYmUgcmVuZGVyZWQgYXMg bGlzdCBpdGVtcyBiZWNhdXNlIHRoZXknZCBlbmQgdXAgd2l0aCB0d28gbWFya2VycyBiZWZvcmUg dGhlIHRleHQgKG9uZSBmcm9tIHN1bW1hcnkgZWxlbWVudCBhbmQgdGhlIG90aGVyIGFzIGEgbGlz dCBpdGVtKS4KKyAgICByZXR1cm4gUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKCp0aGlzLCBXVEZN b3ZlKHN0eWxlKSwgeyBSZW5kZXJFbGVtZW50OjpDb25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJG b3I6Okxpc3RJdGVtLCBSZW5kZXJFbGVtZW50OjpDb25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJG b3I6OklubGluZSwgUmVuZGVyRWxlbWVudDo6Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9y OjpUYWJsZU9yVGFibGVQYXJ0IH0pOwogfQogCiB2b2lkIEhUTUxTdW1tYXJ5RWxlbWVudDo6ZGlk QWRkVXNlckFnZW50U2hhZG93Um9vdChTaGFkb3dSb290JiByb290KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IDY0ZDNlZmIwZjJkOTA1YzY5N2QyODUz Y2NhODhlMTE1MGJkZjZhMmIuLjgyNzdjZDRjNzM2ZWJlYmY2ZjEwMzhlY2ZhNGIyZDI0M2M4MmYw NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTE0 NSwxMyArMTQ1LDEzIEBAIFJlbmRlckVsZW1lbnQ6On5SZW5kZXJFbGVtZW50KCkKICAgICBBU1NF UlQoIW1fZmlyc3RDaGlsZCk7CiB9CiAKLVJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBSZW5kZXJF bGVtZW50OjpjcmVhdGVGb3IoRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwg UmVuZGVyZXJDcmVhdGlvblR5cGUgY3JlYXRpb25UeXBlKQorUmVuZGVyUHRyPFJlbmRlckVsZW1l bnQ+IFJlbmRlckVsZW1lbnQ6OmNyZWF0ZUZvcihFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHls ZSYmIHN0eWxlLCBPcHRpb25TZXQ8Q29uc3RydWN0QmxvY2tMZXZlbFJlbmRlcmVyRm9yPiByZW5k ZXJlclR5cGVPdmVycmlkZSkKIHsKICAgICAvLyBNaW5pbWFsIHN1cHBvcnQgZm9yIGNvbnRlbnQg cHJvcGVydGllcyByZXBsYWNpbmcgYW4gZW50aXJlIGVsZW1lbnQuCiAgICAgLy8gV29ya3Mgb25s eSBpZiB3ZSBoYXZlIGV4YWN0bHkgb25lIHBpZWNlIG9mIGNvbnRlbnQgYW5kIGl0J3MgYSBVUkwu CiAgICAgLy8gT3RoZXJ3aXNlIGFjdHMgYXMgaWYgd2UgZGlkbid0IHN1cHBvcnQgdGhpcyBmZWF0 dXJlLgogICAgIGNvbnN0IENvbnRlbnREYXRhKiBjb250ZW50RGF0YSA9IHN0eWxlLmNvbnRlbnRE YXRhKCk7Ci0gICAgaWYgKGNyZWF0aW9uVHlwZSA9PSBDcmVhdGVBbGxSZW5kZXJlcnMgJiYgY29u dGVudERhdGEgJiYgIWNvbnRlbnREYXRhLT5uZXh0KCkgJiYgaXM8SW1hZ2VDb250ZW50RGF0YT4o KmNvbnRlbnREYXRhKSAmJiAhZWxlbWVudC5pc1BzZXVkb0VsZW1lbnQoKSkgeworICAgIGlmICgh cmVuZGVyZXJUeXBlT3ZlcnJpZGUgJiYgY29udGVudERhdGEgJiYgIWNvbnRlbnREYXRhLT5uZXh0 KCkgJiYgaXM8SW1hZ2VDb250ZW50RGF0YT4oKmNvbnRlbnREYXRhKSAmJiAhZWxlbWVudC5pc1Bz ZXVkb0VsZW1lbnQoKSkgewogICAgICAgICBTdHlsZTo6bG9hZFBlbmRpbmdSZXNvdXJjZXMoc3R5 bGUsIGVsZW1lbnQuZG9jdW1lbnQoKSwgJmVsZW1lbnQpOwogICAgICAgICBhdXRvJiBzdHlsZUlt YWdlID0gZG93bmNhc3Q8SW1hZ2VDb250ZW50RGF0YT4oKmNvbnRlbnREYXRhKS5pbWFnZSgpOwog ICAgICAgICBhdXRvIGltYWdlID0gY3JlYXRlUmVuZGVyZXI8UmVuZGVySW1hZ2U+KGVsZW1lbnQs IFdURk1vdmUoc3R5bGUpLCBjb25zdF9jYXN0PFN0eWxlSW1hZ2UqPigmc3R5bGVJbWFnZSkpOwpA QCAtMTY0LDE4ICsxNjQsMTUgQEAgUmVuZGVyUHRyPFJlbmRlckVsZW1lbnQ+IFJlbmRlckVsZW1l bnQ6OmNyZWF0ZUZvcihFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYKICAgICBjYXNlIERp c3BsYXlUeXBlOjpDb250ZW50czoKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgY2FzZSBE aXNwbGF5VHlwZTo6SW5saW5lOgotICAgICAgICBpZiAoY3JlYXRpb25UeXBlID09IENyZWF0ZUFs bFJlbmRlcmVycykKLSAgICAgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJJbmxp bmU+KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKTsKLSAgICAgICAgRkFMTFRIUk9VR0g7IC8vIEZp ZWxkc2V0cyBzaG91bGQgbWFrZSBhIGJsb2NrIGZsb3cgaWYgZGlzcGxheTppbmxpbmUgaXMgc2V0 LgorICAgICAgICBpZiAocmVuZGVyZXJUeXBlT3ZlcnJpZGUuY29udGFpbnMoQ29uc3RydWN0Qmxv Y2tMZXZlbFJlbmRlcmVyRm9yOjpJbmxpbmUpKQorICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVJl bmRlcmVyPFJlbmRlckJsb2NrRmxvdz4oZWxlbWVudCwgV1RGTW92ZShzdHlsZSkpOworICAgICAg ICByZXR1cm4gY3JlYXRlUmVuZGVyZXI8UmVuZGVySW5saW5lPihlbGVtZW50LCBXVEZNb3ZlKHN0 eWxlKSk7CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6QmxvY2s6CiAgICAgY2FzZSBEaXNwbGF5VHlw ZTo6Rmxvd1Jvb3Q6CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6SW5saW5lQmxvY2s6CiAgICAgICAg IHJldHVybiBjcmVhdGVSZW5kZXJlcjxSZW5kZXJCbG9ja0Zsb3c+KGVsZW1lbnQsIFdURk1vdmUo c3R5bGUpKTsKICAgICBjYXNlIERpc3BsYXlUeXBlOjpMaXN0SXRlbToKLSAgICAgICAgLy8gPHN1 bW1hcnk+IGVsZW1lbnRzIHdpdGggZGlzcGxheTpsaXN0LWl0ZW0gc2hvdWxkIG5vdCBiZSByZW5k ZXJlZCBhcyBsaXN0IGl0ZW1zIGJlY2F1c2UKLSAgICAgICAgLy8gdGhleSdkIGVuZCB1cCB3aXRo IHR3byBtYXJrZXJzIGJlZm9yZSB0aGUgdGV4dCAob25lIGZyb20gc3VtbWFyeSBlbGVtZW50IGFu ZCB0aGUgb3RoZXIgYXMKLSAgICAgICAgLy8gYSBsaXN0IGl0ZW0pLgotICAgICAgICBpZiAoY3Jl YXRpb25UeXBlID09IE9ubHlDcmVhdGVCbG9ja0FuZEZsZXhib3hSZW5kZXJlcnMpCisgICAgICAg IGlmIChyZW5kZXJlclR5cGVPdmVycmlkZS5jb250YWlucyhDb25zdHJ1Y3RCbG9ja0xldmVsUmVu ZGVyZXJGb3I6Okxpc3RJdGVtKSkKICAgICAgICAgICAgIHJldHVybiBjcmVhdGVSZW5kZXJlcjxS ZW5kZXJCbG9ja0Zsb3c+KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKTsKICAgICAgICAgcmV0dXJu IGNyZWF0ZVJlbmRlcmVyPFJlbmRlckxpc3RJdGVtPihlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSk7 CiAgICAgY2FzZSBEaXNwbGF5VHlwZTo6RmxleDoKQEAgLTE4OCw4ICsxODUsOSBAQCBSZW5kZXJQ dHI8UmVuZGVyRWxlbWVudD4gUmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKEVsZW1lbnQmIGVsZW1l bnQsIFJlbmRlclN0eWxlJgogICAgIGNhc2UgRGlzcGxheVR5cGU6OklubGluZUJveDoKICAgICAg ICAgcmV0dXJuIGNyZWF0ZVJlbmRlcmVyPFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveD4oZWxl bWVudCwgV1RGTW92ZShzdHlsZSkpOwogICAgIGRlZmF1bHQ6IHsKLSAgICAgICAgaWYgKGNyZWF0 aW9uVHlwZSA9PSBPbmx5Q3JlYXRlQmxvY2tBbmRGbGV4Ym94UmVuZGVyZXJzKQorICAgICAgICBp ZiAoc3R5bGUuaXNEaXNwbGF5VGFibGVPclRhYmxlUGFydCgpICYmIHJlbmRlcmVyVHlwZU92ZXJy aWRlLmNvbnRhaW5zKENvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcjo6VGFibGVPclRhYmxl UGFydCkpCiAgICAgICAgICAgICByZXR1cm4gY3JlYXRlUmVuZGVyZXI8UmVuZGVyQmxvY2tGbG93 PihlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSk7CisKICAgICAgICAgc3dpdGNoIChzdHlsZS5kaXNw bGF5KCkpIHsKICAgICAgICAgY2FzZSBEaXNwbGF5VHlwZTo6VGFibGU6CiAgICAgICAgIGNhc2Ug RGlzcGxheVR5cGU6OklubGluZVRhYmxlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bGVtZW50LmgKaW5kZXggYzJlMDRiZTk2MWMxMTVlNWQwOTA1ZjEyYjM4ZTJkMmUxNTYyYzVjNC4u ZDM3N2VhNjgyNzg3NmNlMTRhNmU5MDgwMGU1NzAyZDU2ZGNmNDgzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCkBAIC0zOSw4ICszOSwxMiBAQCBjbGFzcyBSZW5k ZXJFbGVtZW50IDogcHVibGljIFJlbmRlck9iamVjdCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+ UmVuZGVyRWxlbWVudCgpOwogCi0gICAgZW51bSBSZW5kZXJlckNyZWF0aW9uVHlwZSB7IENyZWF0 ZUFsbFJlbmRlcmVycywgT25seUNyZWF0ZUJsb2NrQW5kRmxleGJveFJlbmRlcmVycyB9OwotICAg IHN0YXRpYyBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gY3JlYXRlRm9yKEVsZW1lbnQmLCBSZW5k ZXJTdHlsZSYmLCBSZW5kZXJlckNyZWF0aW9uVHlwZSA9IENyZWF0ZUFsbFJlbmRlcmVycyk7Cisg ICAgZW51bSBjbGFzcyBDb25zdHJ1Y3RCbG9ja0xldmVsUmVuZGVyZXJGb3IgeworICAgICAgICBJ bmxpbmUgICAgICAgICAgID0gMSA8PCAwLAorICAgICAgICBMaXN0SXRlbSAgICAgICAgID0gMSA8 PCAxLAorICAgICAgICBUYWJsZU9yVGFibGVQYXJ0ID0gMSA8PCAyCisgICAgfTsKKyAgICBzdGF0 aWMgUmVuZGVyUHRyPFJlbmRlckVsZW1lbnQ+IGNyZWF0ZUZvcihFbGVtZW50JiwgUmVuZGVyU3R5 bGUmJiwgT3B0aW9uU2V0PENvbnN0cnVjdEJsb2NrTGV2ZWxSZW5kZXJlckZvcj4gPSB7IH0pOwog CiAgICAgYm9vbCBoYXNJbml0aWFsaXplZFN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9oYXNJbml0 aWFsaXplZFN0eWxlOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmgKaW5kZXggOTNkOTU3MWU2ZGU1NTU3YTc2Y2QwNDk1ZDQyNTU5MGI2YTBmZWE3MS4u MzQ0MGYwNzY1NjFjYWIyYWZiOWEwNTFiNjBlZmI0MWYxZDAxY2Y1YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE1MDAsNiArMTUwMCw3IEBA IHB1YmxpYzoKICAgICBib29sIGlzT3JpZ2luYWxEaXNwbGF5SW5saW5lVHlwZSgpIGNvbnN0IHsg cmV0dXJuIGlzRGlzcGxheUlubGluZVR5cGUob3JpZ2luYWxEaXNwbGF5KCkpOyB9CiAgICAgYm9v bCBpc0Rpc3BsYXlGbGV4aWJsZU9yR3JpZEJveCgpIGNvbnN0IHsgcmV0dXJuIGlzRGlzcGxheUZs ZXhpYmxlT3JHcmlkQm94KGRpc3BsYXkoKSk7IH0KICAgICBib29sIGlzRGlzcGxheVJlZ2lvblR5 cGUoKSBjb25zdDsKKyAgICBib29sIGlzRGlzcGxheVRhYmxlT3JUYWJsZVBhcnQoKSBjb25zdCB7 IHJldHVybiBpc0Rpc3BsYXlUYWJsZU9yVGFibGVQYXJ0KGRpc3BsYXkoKSk7IH0KICAgICBib29s IGlzT3JpZ2luYWxEaXNwbGF5TGlzdEl0ZW1UeXBlKCkgY29uc3QgeyByZXR1cm4gaXNEaXNwbGF5 TGlzdEl0ZW1UeXBlKG9yaWdpbmFsRGlzcGxheSgpKTsgfQogCiAgICAgYm9vbCBzZXRXcml0aW5n TW9kZShXcml0aW5nTW9kZSk7CkBAIC0xOTY3LDYgKzE5NjgsNyBAQCBwcml2YXRlOgogICAgIHN0 YXRpYyBib29sIGlzRGlzcGxheUdyaWRCb3goRGlzcGxheVR5cGUpOwogICAgIHN0YXRpYyBib29s IGlzRGlzcGxheUZsZXhpYmxlT3JHcmlkQm94KERpc3BsYXlUeXBlKTsKICAgICBzdGF0aWMgYm9v bCBpc0Rpc3BsYXlMaXN0SXRlbVR5cGUoRGlzcGxheVR5cGUpOworICAgIHN0YXRpYyBib29sIGlz RGlzcGxheVRhYmxlT3JUYWJsZVBhcnQoRGlzcGxheVR5cGUpOwogCiAgICAgc3RhdGljIExheW91 dEJveEV4dGVudCBzaGFkb3dFeHRlbnQoY29uc3QgU2hhZG93RGF0YSopOwogICAgIHN0YXRpYyBM YXlvdXRCb3hFeHRlbnQgc2hhZG93SW5zZXRFeHRlbnQoY29uc3QgU2hhZG93RGF0YSopOwpAQCAt MjM3Nyw2ICsyMzc5LDE0IEBAIGlubGluZSBib29sIFJlbmRlclN0eWxlOjppc0Rpc3BsYXlMaXN0 SXRlbVR5cGUoRGlzcGxheVR5cGUgZGlzcGxheSkKICAgICByZXR1cm4gZGlzcGxheSA9PSBEaXNw bGF5VHlwZTo6TGlzdEl0ZW07CiB9CiAKK2lubGluZSBib29sIFJlbmRlclN0eWxlOjppc0Rpc3Bs YXlUYWJsZU9yVGFibGVQYXJ0KERpc3BsYXlUeXBlIGRpc3BsYXkpCit7CisgICAgcmV0dXJuIGRp c3BsYXkgPT0gRGlzcGxheVR5cGU6OlRhYmxlIHx8IGRpc3BsYXkgPT0gRGlzcGxheVR5cGU6Oklu bGluZVRhYmxlIHx8IGRpc3BsYXkgPT0gRGlzcGxheVR5cGU6OlRhYmxlQ2VsbAorICAgICAgICB8 fCBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpUYWJsZUNhcHRpb24gfHwgZGlzcGxheSA9PSBEaXNw bGF5VHlwZTo6VGFibGVSb3dHcm91cCB8fCBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpUYWJsZUhl YWRlckdyb3VwCisgICAgICAgIHx8IGRpc3BsYXkgPT0gRGlzcGxheVR5cGU6OlRhYmxlRm9vdGVy R3JvdXAgfHwgZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6VGFibGVSb3cgfHwgZGlzcGxheSA9PSBE aXNwbGF5VHlwZTo6VGFibGVDb2x1bW5Hcm91cAorICAgICAgICB8fCBkaXNwbGF5ID09IERpc3Bs YXlUeXBlOjpUYWJsZUNvbHVtbjsKK30KKwogaW5saW5lIGJvb2wgUmVuZGVyU3R5bGU6Omhhc0Fu eVB1YmxpY1BzZXVkb1N0eWxlcygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fbm9uSW5oZXJpdGVk RmxhZ3MuaGFzQW55UHVibGljUHNldWRvU3R5bGVzKCk7Cg==