258761 2023-06-30 19:10:50 -0700 [FFC] Add support for [9.2.3.E] use max-content when flex-basis is content... 2023-07-01 15:45:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1964602 0 zalan 2023-06-30 19:10:50 -0700 https://www.w3.org/TR/css-flexbox-1/#algo-main-item 1964606 1 466890 zalan 2023-06-30 21:06:25 -0700 Created attachment 466890 [fast-cq]Patch 1964651 2 ews-feeder 2023-07-01 15:44:12 -0700 Committed 265690@main (01a8c97f3b3e): <https://commits.webkit.org/265690@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466890. 1964652 3 webkit-bug-importer 2023-07-01 15:45:18 -0700 <rdar://problem/111624360> 466890 2023-06-30 21:06:25 -0700 2023-07-01 15:44:13 -0700 [fast-cq]Patch bug-258761-20230630210624.patch text/plain 16912 zalan RnJvbSBlNGM1MjEzYjYyODNlNjI1ZGZhODJlNjg2OTk4MDBmNjQxNzkyYzRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgMzAgSnVuIDIwMjMgMTk6MTA6NTggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbRkZDXSBB ZGQgc3VwcG9ydCBmb3IgWzkuMi4zLkVdIHVzZSBtYXgtY29udGVudCB3aGVuCiBmbGV4LWJhc2lz IGlzIGNvbnRlbnQuLi4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1 ODc2MQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpQYXJ0aWFsbHkgaW1wbGVtZW50IGh0 dHBzOi8vd3d3LnczLm9yZy9UUi9jc3MtZmxleGJveC0xLyNhbGdvLW1haW4taXRlbSA5LjMuMy5F IHdoZW4KY29udGVudCBzaG91bGQgYmUgc2l6ZWQgdXNpbmcgbWF4LWNvbnRlbnQuCgoxLiBJRkMg dHlwZSBvZiBmbGV4IGl0ZW0gb25seQoyLiBVc2Ugbm9uLWludGVncmF0aW9uIGNvZGVwYXRoIHRv IGNvbXB1dGUgbWF4LWNvbnRlbnQgZm9yIG5vdwoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6 OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQpOgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcDoKKFdlYkNvcmU6 OkxheW91dDo6RmxleExheW91dDo6RmxleExheW91dCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhM YXlvdXQ6Om1heENvbnRlbnRGb3JGbGV4SXRlbSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkZs ZXhMYXlvdXQ6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemVGb3JGbGV4SXRlbXMgY29u c3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpzdHJldGNoRmxleExpbmVzIGNvbnN0 KToKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6aGFuZGxlTWFpbkF4aXNBbGlnbm1lbnQg Y29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpoYW5kbGVDcm9zc0F4aXNBbGln bm1lbnRGb3JGbGV4SXRlbXMgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4TGF5b3V0Ojpo YW5kbGVDcm9zc0F4aXNBbGlnbm1lbnRGb3JGbGV4TGluZXMgY29uc3QpOgooV2ViQ29yZTo6TGF5 b3V0OjpGbGV4TGF5b3V0OjpmbGV4Q29udGFpbmVyIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6 RmxleExheW91dDo6ZmxleEZvcm1hdHRpbmdDb250ZXh0IGNvbnN0KToKKiBTb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oOgooV2ViQ29yZTo6 TGF5b3V0OjpGbGV4TGF5b3V0Ojppc1NpbmdsZUxpbmVGbGV4Q29udGFpbmVyIGNvbnN0KToKKFdl YkNvcmU6OkxheW91dDo6RmxleExheW91dDo6ZmxleENvbnRhaW5lclN0eWxlIGNvbnN0KToKKFdl YkNvcmU6OkxheW91dDo6RmxleExheW91dDo6ZmxleENvbnRhaW5lciBjb25zdCk6IERlbGV0ZWQu CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhMYXlvdXQ6OnJvb3RTdHlsZSBjb25zdCk6IERlbGV0ZWQu CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6bWF4aW11bUNvbnRlbnRTaXplKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgotLS0KIC4u Li9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICAgICB8ICAyICstCiAuLi4v Zm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAgICAgfCA3MCArKysrKysrKysr KysrLS0tLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oICAgICAg fCAxMyArKy0tCiAuLi4vaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAg fCAxMiArKysrCiAuLi4vaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggICAgICAgICAg fCAgMSArCiA1IGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNTU4 OTUwOTAwZTEwLi5jODEwMTY2NGEyODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0 dGluZ0NvbnRleHQuY3BwCkBAIC01Myw3ICs1Myw3IEBAIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6 RmxleEZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEVsZW1lbnRCb3gmIGZvcm1hdHRpbmdDb250ZXh0 CiB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KGNvbnN0IENvbnN0cmFpbnRzRm9y RmxleENvbnRlbnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8gbG9naWNhbEZsZXhJdGVtcyA9 IGNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZShjb25zdHJhaW50cyk7Ci0gICAgYXV0byBm bGV4TGF5b3V0ID0gRmxleExheW91dCB7IHJvb3QoKSB9OworICAgIGF1dG8gZmxleExheW91dCA9 IEZsZXhMYXlvdXQgeyAqdGhpcyB9OwogCiAgICAgYXV0byBsb2dpY2FsRmxleENvbnN0cmFpbnRz ID0gWyZdIHsKICAgICAgICAgYXV0byBmbGV4RGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxl eERpcmVjdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwCmluZGV4IGU2ZjZmMjUwZjE5MS4u ZTQ5ODRmOWIyMDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwCkBAIC0yOSw2ICsyOSw3IEBA CiAjaW5jbHVkZSAiRmxleEZvcm1hdHRpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSAiRmxleEZvcm1h dHRpbmdHZW9tZXRyeS5oIgogI2luY2x1ZGUgIkZsZXhSZWN0LmgiCisjaW5jbHVkZSAiSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZVNldHRlcnMuaCIKICNp bmNsdWRlICJTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhLmgiCiAjaW5jbHVkZSAiU3R5bGVTZWxm QWxpZ25tZW50RGF0YS5oIgpAQCAtNTEsOCArNTIsOCBAQCBzdHJ1Y3QgUG9zaXRpb25BbmRNYXJn aW5zIHsKICAgICBMYXlvdXRVbml0IG1hcmdpbkVuZDsKIH07CiAKLUZsZXhMYXlvdXQ6OkZsZXhM YXlvdXQoY29uc3QgRWxlbWVudEJveCYgZmxleENvbnRhaW5lcikKLSAgICA6IG1fZmxleENvbnRh aW5lcihmbGV4Q29udGFpbmVyKQorRmxleExheW91dDo6RmxleExheW91dChjb25zdCBGbGV4Rm9y bWF0dGluZ0NvbnRleHQmIGZsZXhGb3JtYXR0aW5nQ29udGV4dCkKKyAgICA6IG1fZmxleEZvcm1h dHRpbmdDb250ZXh0KGZsZXhGb3JtYXR0aW5nQ29udGV4dCkKIHsKIH0KIApAQCAtMTUyLDIzICsx NTMsNDAgQEAgdm9pZCBGbGV4TGF5b3V0Ojpjb21wdXRlQXZhaWxhYmxlTWFpbkFuZENyb3NzU3Bh Y2UoY29uc3QgTG9naWNhbENvbnN0cmFpbnRzJiBsb2cKICAgICBtX2F2YWlsYWJsZUNyb3NzU3Bh Y2UgPSBjb21wdXRlZEZpbmFsU2l6ZShsb2dpY2FsQ29uc3RyYWludHMuY3Jvc3NBeGlzKTsKIH0K IAorTGF5b3V0VW5pdCBGbGV4TGF5b3V0OjptYXhDb250ZW50Rm9yRmxleEl0ZW0oY29uc3QgTG9n aWNhbEZsZXhJdGVtJiBmbGV4SXRlbSkgY29uc3QKK3sKKyAgICAvLyA5LjIuMyBFIE90aGVyd2lz ZSwgc2l6ZSB0aGUgaXRlbSBpbnRvIHRoZSBhdmFpbGFibGUgc3BhY2UgdXNpbmcgaXRzIHVzZWQg ZmxleCBiYXNpcyBpbiBwbGFjZSBvZiBpdHMgbWFpbiBzaXplLAorICAgIC8vIHRyZWF0aW5nIGEg dmFsdWUgb2YgY29udGVudCBhcyBtYXgtY29udGVudC4gSWYgYSBjcm9zcyBzaXplIGlzIG5lZWRl ZCB0byBkZXRlcm1pbmUgdGhlIG1haW4gc2l6ZSAoZS5nLiB3aGVuIHRoZSBmbGV4IGl0ZW3igJlz IG1haW4gc2l6ZQorICAgIC8vIGlzIGluIGl0cyBibG9jayBheGlzKSBhbmQgdGhlIGZsZXggaXRl beKAmXMgY3Jvc3Mgc2l6ZSBpcyBhdXRvIGFuZCBub3QgZGVmaW5pdGUsIGluIHRoaXMgY2FsY3Vs YXRpb24gdXNlIGZpdC1jb250ZW50IGFzIHRoZSBmbGV4IGl0ZW3igJlzIGNyb3NzIHNpemUuCisg ICAgLy8gVGhlIGZsZXggYmFzZSBzaXplIGlzIHRoZSBpdGVt4oCZcyByZXN1bHRpbmcgbWFpbiBz aXplLgorICAgIGF1dG8mIGZsZXhJdGVtQm94ID0gZmxleEl0ZW0ubGF5b3V0Qm94KCk7CisgICAg aWYgKCFmbGV4SXRlbUJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsK KyAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKKyAgICAgICAgcmV0dXJuIHsg fTsKKyAgICB9CisKKyAgICBpZiAoZmxleEl0ZW0uaXNPcmhvZ29uYWwoKSAmJiAhZmxleEl0ZW0u Y3Jvc3NBeGlzKCkuZGVmaW5pdGVTaXplKSB7CisgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5U RURfWUVUKCk7CisgICAgICAgIHJldHVybiB7IH07CisgICAgfQorICAgIGF1dG8mIGlubGluZUZv cm1hdHRpbmdTdGF0ZSA9IGZsZXhGb3JtYXR0aW5nQ29udGV4dCgpLmxheW91dFN0YXRlKCkuZW5z dXJlSW5saW5lRm9ybWF0dGluZ1N0YXRlKGZsZXhJdGVtQm94KTsKKyAgICByZXR1cm4gSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQgeyBmbGV4SXRlbUJveCwgaW5saW5lRm9ybWF0dGluZ1N0YXRlLCB7 IH0gfS5tYXhpbXVtQ29udGVudFNpemUoKTsKK30KKwogRmxleExheW91dDo6RmxleEJhc2VBbmRI eXBvdGhldGljYWxNYWluU2l6ZUxpc3QgRmxleExheW91dDo6ZmxleEJhc2VBbmRIeXBvdGhldGlj YWxNYWluU2l6ZUZvckZsZXhJdGVtcyhjb25zdCBMb2dpY2FsQ29uc3RyYWludHM6OkF4aXNHZW9t ZXRyeSYgbWFpbkF4aXMsIGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcykgY29uc3QK IHsKICAgICBhdXRvIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemVMaXN0ID0gRmxleEJh c2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZUxpc3QgeyB9OwogICAgIGZvciAoYXV0byYgZmxleEl0 ZW0gOiBmbGV4SXRlbXMpIHsKLSAgICAgICAgYXV0byBmbGV4QmFzZSA9IExheW91dFVuaXQgeyB9 OwogICAgICAgICAvLyAzLiBEZXRlcm1pbmUgdGhlIGZsZXggYmFzZSBzaXplIGFuZCBoeXBvdGhl dGljYWwgbWFpbiBzaXplIG9mIGVhY2ggaXRlbToKLSAgICAgICAgYXV0byBjb21wdXRlRmxleEJh c2UgPSBbJl0geworICAgICAgICBhdXRvIGNvbXB1dGVkRmxleEJhc2UgPSBbJl0oKSAtPiBMYXlv dXRVbml0IHsKICAgICAgICAgICAgIC8vIEEuIElmIHRoZSBpdGVtIGhhcyBhIGRlZmluaXRlIHVz ZWQgZmxleCBiYXNpcywgdGhhdCdzIHRoZSBmbGV4IGJhc2Ugc2l6ZS4KLSAgICAgICAgICAgIGlm IChhdXRvIGRlZmluaXRlRmxleEJhc2UgPSBmbGV4SXRlbS5tYWluQXhpcygpLmRlZmluaXRlRmxl eEJhc2lzKSB7Ci0gICAgICAgICAgICAgICAgZmxleEJhc2UgPSAqZGVmaW5pdGVGbGV4QmFzZTsK LSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAo YXV0byBkZWZpbml0ZUZsZXhCYXNlID0gZmxleEl0ZW0ubWFpbkF4aXMoKS5kZWZpbml0ZUZsZXhC YXNpcykKKyAgICAgICAgICAgICAgICByZXR1cm4gKmRlZmluaXRlRmxleEJhc2U7CiAgICAgICAg ICAgICAvLyBCLiBJZiB0aGUgZmxleCBpdGVtIGhhcy4uLgogICAgICAgICAgICAgaWYgKGZsZXhJ dGVtLmhhc0FzcGVjdFJhdGlvKCkgJiYgZmxleEl0ZW0uaGFzQ29udGVudEZsZXhCYXNpcygpICYm IGZsZXhJdGVtLmNyb3NzQXhpcygpLmRlZmluaXRlU2l6ZSkgewogICAgICAgICAgICAgICAgIC8v IFRoZSBmbGV4IGJhc2Ugc2l6ZSBpcyBjYWxjdWxhdGVkIGZyb20gaXRzIGlubmVyIGNyb3NzIHNp emUgYW5kIHRoZSBmbGV4IGl0ZW0ncyBpbnRyaW5zaWMgYXNwZWN0IHJhdGlvLgogICAgICAgICAg ICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAvLyBDLiBJZiB0aGUgdXNlZCBmbGV4IGJhc2lzIGlzIGNvbnRlbnQgb3IgZGVwZW5kcyBv biBpdHMgYXZhaWxhYmxlIHNwYWNlLCBhbmQgdGhlIGZsZXggY29udGFpbmVyIGlzIGJlaW5nIHNp emVkIHVuZGVyCiAgICAgICAgICAgICAvLyAgICBhIG1pbi1jb250ZW50IG9yIG1heC1jb250ZW50 IGNvbnN0cmFpbnQsIHNpemUgdGhlIGl0ZW0gdW5kZXIgdGhhdCBjb25zdHJhaW50CkBAIC0xNzcs NyArMTk1LDcgQEAgRmxleExheW91dDo6RmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZUxp c3QgRmxleExheW91dDo6ZmxleEJhc2VBbmRIeXBvdGhldGkKICAgICAgICAgICAgIGlmIChmbGV4 QmFzaXNDb250ZW50T3JBdmFpbGFibGVTcGFjZURlcGVuZGVudCAmJiBmbGV4Q29udGFpbmVySGFz TWluTWF4Q29uc3RyYWludHMpIHsKICAgICAgICAgICAgICAgICAvLyBDb21wdXRlIGZsZXggaXRl bSdzIG1haW4gc2l6ZS4KICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lF VCgpOwotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICByZXR1cm4geyB9 OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgLy8gRC4gSWYgdGhlIHVzZWQgZmxleCBiYXNp cyBpcyBjb250ZW50IG9yIGRlcGVuZHMgb24gaXRzIGF2YWlsYWJsZSBzcGFjZSwgdGhlIGF2YWls YWJsZSBtYWluIHNpemUgaXMgaW5maW5pdGUsCiAgICAgICAgICAgICAvLyAgICBhbmQgdGhlIGZs ZXggaXRlbSdzIGlubGluZSBheGlzIGlzIHBhcmFsbGVsIHRvIHRoZSBtYWluIGF4aXMsIGxheSB0 aGUgaXRlbSBvdXQgdXNpbmcgdGhlIHJ1bGVzIGZvciBhIGJveCBpbiBhbiBvcnRob2dvbmFsIGZs b3cuCkBAIC0xODUsMjEgKzIwMywyMSBAQCBGbGV4TGF5b3V0OjpGbGV4QmFzZUFuZEh5cG90aGV0 aWNhbE1haW5TaXplTGlzdCBGbGV4TGF5b3V0OjpmbGV4QmFzZUFuZEh5cG90aGV0aQogICAgICAg ICAgICAgaWYgKGZsZXhCYXNpc0NvbnRlbnRPckF2YWlsYWJsZVNwYWNlRGVwZW5kZW50ICYmIGZs ZXhJdGVtLmlzT3Job2dvbmFsKCkpIHsKICAgICAgICAgICAgICAgICAvLyBMYXkgdGhlIGl0ZW0g b3V0IHVzaW5nIHRoZSBydWxlcyBmb3IgYSBib3ggaW4gYW4gb3J0aG9nb25hbCBmbG93LiBUaGUg ZmxleCBiYXNlIHNpemUgaXMgdGhlIGl0ZW0ncyBtYXgtY29udGVudCBtYWluIHNpemUuCiAgICAg ICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKLSAgICAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIC8vIEUuIE90aGVyd2lzZSwgc2l6ZSB0aGUgaXRlbSBpbnRvIHRoZSBhdmFpbGFi bGUgc3BhY2UgdXNpbmcgaXRzIHVzZWQgZmxleCBiYXNpcyBpbiBwbGFjZSBvZiBpdHMgbWFpbiBz aXplLCB0cmVhdGluZyBhIHZhbHVlIG9mIGNvbnRlbnQgYXMgbWF4LWNvbnRlbnQuCi0gICAgICAg ICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOworICAgICAgICAgICAgcmV0dXJuIG1h eENvbnRlbnRGb3JGbGV4SXRlbShmbGV4SXRlbSk7CiAgICAgICAgIH07Ci0gICAgICAgIGNvbXB1 dGVGbGV4QmFzZSgpOworICAgICAgICBhdXRvIGZsZXhCYXNlU2l6ZSA9IGNvbXB1dGVkRmxleEJh c2UoKTsKIAogICAgICAgICBhdXRvIGh5cG90aGV0aWNhbE1haW5TaXplID0gWyZdIHsKICAgICAg ICAgICAgIC8vIFRoZSBoeXBvdGhldGljYWwgbWFpbiBzaXplIGlzIHRoZSBpdGVtJ3MgZmxleCBi YXNlIHNpemUgY2xhbXBlZCBhY2NvcmRpbmcgdG8gaXRzIHVzZWQgbWluIGFuZCBtYXggbWFpbiBz aXplcyAoYW5kIGZsb29yaW5nIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8pLgotICAgICAg ICAgICAgYXV0byBoeXBvdGhldGljYWxWYWx1ZSA9IGZsZXhCYXNlOworICAgICAgICAgICAgYXV0 byBoeXBvdGhldGljYWxWYWx1ZSA9IGZsZXhCYXNlU2l6ZTsKICAgICAgICAgICAgIGF1dG8gbWF4 aW11bSA9IGZsZXhJdGVtLm1haW5BeGlzKCkubWF4aW11bVNpemUudmFsdWVfb3IoaHlwb3RoZXRp Y2FsVmFsdWUpOwogICAgICAgICAgICAgYXV0byBtaW5pbXVtID0gZmxleEl0ZW0ubWFpbkF4aXMo KS5taW5pbXVtU2l6ZS52YWx1ZV9vcihoeXBvdGhldGljYWxWYWx1ZSk7CiAgICAgICAgICAgICBy ZXR1cm4gc3RkOjptYXgobWF4aW11bSwgc3RkOjptaW4obWluaW11bSwgaHlwb3RoZXRpY2FsVmFs dWUpKTsKICAgICAgICAgfTsKLSAgICAgICAgZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6 ZUxpc3QuYXBwZW5kKHsgZmxleEJhc2UsIGh5cG90aGV0aWNhbE1haW5TaXplKCkgfSk7CisgICAg ICAgIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemVMaXN0LmFwcGVuZCh7IGZsZXhCYXNl U2l6ZSwgaHlwb3RoZXRpY2FsTWFpblNpemUoKSB9KTsKICAgICB9CiAgICAgcmV0dXJuIGZsZXhC YXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemVMaXN0OwogfQpAQCAtNDQ5LDcgKzQ2Nyw3IEBAIHZv aWQgRmxleExheW91dDo6c3RyZXRjaEZsZXhMaW5lcyhMaW5lc0Nyb3NzU2l6ZUxpc3QmIGZsZXhM aW5lc0Nyb3NzU2l6ZUxpc3QsIHNpCiAgICAgLy8gSGFuZGxlICdhbGlnbi1jb250ZW50OiBzdHJl dGNoJy4KICAgICAvLyBJZiB0aGUgZmxleCBjb250YWluZXIgaGFzIGEgZGVmaW5pdGUgY3Jvc3Mg c2l6ZSwgYWxpZ24tY29udGVudCBpcyBzdHJldGNoLCBhbmQgdGhlIHN1bSBvZiB0aGUgZmxleCBs aW5lcycgY3Jvc3Mgc2l6ZXMgaXMgbGVzcyB0aGFuIHRoZSBmbGV4IGNvbnRhaW5lcidzIGlubmVy IGNyb3NzIHNpemUsCiAgICAgLy8gaW5jcmVhc2UgdGhlIGNyb3NzIHNpemUgb2YgZWFjaCBmbGV4 IGxpbmUgYnkgZXF1YWwgYW1vdW50cyBzdWNoIHRoYXQgdGhlIHN1bSBvZiB0aGVpciBjcm9zcyBz aXplcyBleGFjdGx5IGVxdWFscyB0aGUgZmxleCBjb250YWluZXIncyBpbm5lciBjcm9zcyBzaXpl LgotICAgIGlmIChyb290U3R5bGUoKS5hbGlnbkNvbnRlbnQoKS5kaXN0cmlidXRpb24oKSAhPSBD b250ZW50RGlzdHJpYnV0aW9uOjpTdHJldGNoIHx8ICFjcm9zc0F4aXMuZGVmaW5pdGVTaXplKQor ICAgIGlmIChmbGV4Q29udGFpbmVyU3R5bGUoKS5hbGlnbkNvbnRlbnQoKS5kaXN0cmlidXRpb24o KSAhPSBDb250ZW50RGlzdHJpYnV0aW9uOjpTdHJldGNoIHx8ICFjcm9zc0F4aXMuZGVmaW5pdGVT aXplKQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIGxpbmVzQ3Jvc3NTaXplID0gWyZdIHsK QEAgLTU1MCw3ICs1NjgsNyBAQCBGbGV4TGF5b3V0OjpQb3NpdGlvbkFuZE1hcmdpbnNMaXN0IEZs ZXhMYXlvdXQ6OmhhbmRsZU1haW5BeGlzQWxpZ25tZW50KExheW91dFVuaQogCiAgICAgICAgIGF1 dG8ganVzdGlmeUNvbnRlbnQgPSBbJl0gewogICAgICAgICAgICAgLy8gMi4gQWxpZ24gdGhlIGl0 ZW1zIGFsb25nIHRoZSBtYWluLWF4aXMgcGVyIGp1c3RpZnktY29udGVudC4KLSAgICAgICAgICAg IGF1dG8ganVzdGlmeUNvbnRlbnRWYWx1ZSA9IHJvb3RTdHlsZSgpLmp1c3RpZnlDb250ZW50KCk7 CisgICAgICAgICAgICBhdXRvIGp1c3RpZnlDb250ZW50VmFsdWUgPSBmbGV4Q29udGFpbmVyU3R5 bGUoKS5qdXN0aWZ5Q29udGVudCgpOwogICAgICAgICAgICAgYXV0byBpbml0aWFsT2Zmc2V0ID0g WyZdIHsKICAgICAgICAgICAgICAgICBzd2l0Y2ggKGp1c3RpZnlDb250ZW50VmFsdWUuZGlzdHJp YnV0aW9uKCkpIHsKICAgICAgICAgICAgICAgICBjYXNlIENvbnRlbnREaXN0cmlidXRpb246OkRl ZmF1bHQ6CkBAIC02OTksNyArNzE3LDcgQEAgRmxleExheW91dDo6UG9zaXRpb25BbmRNYXJnaW5z TGlzdCBGbGV4TGF5b3V0OjpoYW5kbGVDcm9zc0F4aXNBbGlnbm1lbnRGb3JGbGV4SXQKICAgICAg ICAgICAgICAgICBhdXRvIGZsZXhpdGVtT3V0ZXJDcm9zc1Bvc2l0aW9uID0gTGF5b3V0VW5pdCB7 IH07CiAKICAgICAgICAgICAgICAgICBhdXRvJiBmbGV4SXRlbUFsaWduU2VsZiA9IGZsZXhJdGVt LnN0eWxlKCkuYWxpZ25TZWxmKCk7Ci0gICAgICAgICAgICAgICAgYXV0byBhbGlnblZhbHVlID0g ZmxleEl0ZW1BbGlnblNlbGYucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OkF1dG8gPyBmbGV4 SXRlbUFsaWduU2VsZiA6IHJvb3RTdHlsZSgpLmFsaWduSXRlbXMoKTsKKyAgICAgICAgICAgICAg ICBhdXRvIGFsaWduVmFsdWUgPSBmbGV4SXRlbUFsaWduU2VsZi5wb3NpdGlvbigpICE9IEl0ZW1Q b3NpdGlvbjo6QXV0byA/IGZsZXhJdGVtQWxpZ25TZWxmIDogZmxleENvbnRhaW5lclN0eWxlKCku YWxpZ25JdGVtcygpOwogICAgICAgICAgICAgICAgIHN3aXRjaCAoYWxpZ25WYWx1ZS5wb3NpdGlv bigpKSB7CiAgICAgICAgICAgICAgICAgY2FzZSBJdGVtUG9zaXRpb246OlN0cmV0Y2g6CiAgICAg ICAgICAgICAgICAgY2FzZSBJdGVtUG9zaXRpb246Ok5vcm1hbDogewpAQCAtNzUyLDcgKzc3MCw3 IEBAIEZsZXhMYXlvdXQ6OkxpbmVzQ3Jvc3NQb3NpdGlvbkxpc3QgRmxleExheW91dDo6aGFuZGxl Q3Jvc3NBeGlzQWxpZ25tZW50Rm9yRmxleExpCiAgICAgYXV0byBmbGV4Q29udGFpbmVyVXNlZENy b3NzU2l6ZSA9IGNyb3NzQXhpcy5kZWZpbml0ZVNpemUudmFsdWVfb3IoZmxleExpbmVzQ3Jvc3NT aXplKTsKICAgICAvLyBBbGlnbiBhbGwgZmxleCBsaW5lcyBwZXIgYWxpZ24tY29udGVudC4KICAg ICBhdXRvIGluaXRpYWxPZmZzZXQgPSBbJl0oKSAtPiBMYXlvdXRVbml0IHsKLSAgICAgICAgc3dp dGNoIChyb290U3R5bGUoKS5hbGlnbkNvbnRlbnQoKS5wb3NpdGlvbigpKSB7CisgICAgICAgIHN3 aXRjaCAoZmxleENvbnRhaW5lclN0eWxlKCkuYWxpZ25Db250ZW50KCkucG9zaXRpb24oKSkgewog ICAgICAgICBjYXNlIENvbnRlbnRQb3NpdGlvbjo6U3RhcnQ6CiAgICAgICAgIGNhc2UgQ29udGVu dFBvc2l0aW9uOjpOb3JtYWw6CiAgICAgICAgICAgICByZXR1cm4geyB9OwpAQCAtNzYxLDcgKzc3 OSw3IEBAIEZsZXhMYXlvdXQ6OkxpbmVzQ3Jvc3NQb3NpdGlvbkxpc3QgRmxleExheW91dDo6aGFu ZGxlQ3Jvc3NBeGlzQWxpZ25tZW50Rm9yRmxleExpCiAgICAgICAgIGNhc2UgQ29udGVudFBvc2l0 aW9uOjpFbmQ6CiAgICAgICAgICAgICByZXR1cm4gZmxleENvbnRhaW5lclVzZWRDcm9zc1NpemUg LSBmbGV4TGluZXNDcm9zc1NpemU7CiAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBzd2l0 Y2ggKHJvb3RTdHlsZSgpLmFsaWduQ29udGVudCgpLmRpc3RyaWJ1dGlvbigpKSB7CisgICAgICAg ICAgICBzd2l0Y2ggKGZsZXhDb250YWluZXJTdHlsZSgpLmFsaWduQ29udGVudCgpLmRpc3RyaWJ1 dGlvbigpKSB7CiAgICAgICAgICAgICBjYXNlIENvbnRlbnREaXN0cmlidXRpb246OlNwYWNlQmV0 d2VlbjoKICAgICAgICAgICAgIGNhc2UgQ29udGVudERpc3RyaWJ1dGlvbjo6U3RyZXRjaDoKICAg ICAgICAgICAgICAgICByZXR1cm4geyB9OwpAQCAtNzgyLDcgKzgwMCw3IEBAIEZsZXhMYXlvdXQ6 OkxpbmVzQ3Jvc3NQb3NpdGlvbkxpc3QgRmxleExheW91dDo6aGFuZGxlQ3Jvc3NBeGlzQWxpZ25t ZW50Rm9yRmxleExpCiAgICAgICAgIGF1dG8gZXh0cmFDcm9zc1NwYWNlID0gZmxleENvbnRhaW5l clVzZWRDcm9zc1NpemUgLSBmbGV4TGluZXNDcm9zc1NpemU7CiAgICAgICAgIGlmIChleHRyYUNy b3NzU3BhY2UgPD0gMCkKICAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgIHN3aXRjaCAo cm9vdFN0eWxlKCkuYWxpZ25Db250ZW50KCkuZGlzdHJpYnV0aW9uKCkpIHsKKyAgICAgICAgc3dp dGNoIChmbGV4Q29udGFpbmVyU3R5bGUoKS5hbGlnbkNvbnRlbnQoKS5kaXN0cmlidXRpb24oKSkg ewogICAgICAgICBjYXNlIENvbnRlbnREaXN0cmlidXRpb246OlNwYWNlQmV0d2VlbjoKICAgICAg ICAgICAgIHJldHVybiBleHRyYUNyb3NzU3BhY2UgLyAobGluZVJhbmdlcy5zaXplKCkgLSAxKTsK ICAgICAgICAgY2FzZSBDb250ZW50RGlzdHJpYnV0aW9uOjpTcGFjZUFyb3VuZDoKQEAgLTgwOSw1 ICs4MjcsMTUgQEAgRmxleExheW91dDo6TGluZXNDcm9zc1Bvc2l0aW9uTGlzdCBGbGV4TGF5b3V0 OjpoYW5kbGVDcm9zc0F4aXNBbGlnbm1lbnRGb3JGbGV4TGkKICAgICByZXR1cm4gbGluZXNDcm9z c1Bvc2l0aW9uTGlzdDsKIH0KIAorY29uc3QgRWxlbWVudEJveCYgRmxleExheW91dDo6ZmxleENv bnRhaW5lcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGZsZXhGb3JtYXR0aW5nQ29udGV4dCgpLnJv b3QoKTsKK30KKworY29uc3QgRmxleEZvcm1hdHRpbmdDb250ZXh0JiBGbGV4TGF5b3V0OjpmbGV4 Rm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAoreworICAgIHJldHVybiBtX2ZsZXhGb3JtYXR0aW5n Q29udGV4dDsKK30KKwogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmgKaW5kZXggYTg0ZTg2ZmJkZGM2 Li5lMTIyNDE1Mzg3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaApAQCAtNDEsNyArNDEsNyBAQCBz dHJ1Y3QgUG9zaXRpb25BbmRNYXJnaW5zOwogLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1m bGV4Ym94LTEvCiBjbGFzcyBGbGV4TGF5b3V0IHsKIHB1YmxpYzoKLSAgICBGbGV4TGF5b3V0KGNv bnN0IEVsZW1lbnRCb3gmIGZsZXhDb250YWluZXIpOworICAgIEZsZXhMYXlvdXQoY29uc3QgRmxl eEZvcm1hdHRpbmdDb250ZXh0Jik7CiAKICAgICB1c2luZyBMb2dpY2FsRmxleEl0ZW1zID0gVmVj dG9yPExvZ2ljYWxGbGV4SXRlbT47CiAgICAgc3RydWN0IExvZ2ljYWxDb25zdHJhaW50cyB7CkBA IC04MiwxMiArODIsMTUgQEAgcHJpdmF0ZToKICAgICBQb3NpdGlvbkFuZE1hcmdpbnNMaXN0IGhh bmRsZUNyb3NzQXhpc0FsaWdubWVudEZvckZsZXhJdGVtcyhjb25zdCBMb2dpY2FsRmxleEl0ZW1z JiwgY29uc3QgTGluZVJhbmdlcyYsIGNvbnN0IFNpemVMaXN0JiBmbGV4SXRlbXNDcm9zc1NpemVM aXN0LCBjb25zdCBMaW5lc0Nyb3NzU2l6ZUxpc3QmIGZsZXhMaW5lc0Nyb3NzU2l6ZUxpc3QpIGNv bnN0OwogICAgIExpbmVzQ3Jvc3NQb3NpdGlvbkxpc3QgaGFuZGxlQ3Jvc3NBeGlzQWxpZ25tZW50 Rm9yRmxleExpbmVzKGNvbnN0IExvZ2ljYWxDb25zdHJhaW50czo6QXhpc0dlb21ldHJ5JiBjcm9z c0F4aXMsIGNvbnN0IExpbmVSYW5nZXMmLCBMaW5lc0Nyb3NzU2l6ZUxpc3QmIGZsZXhMaW5lc0Ny b3NzU2l6ZUxpc3QpIGNvbnN0OwogCi0gICAgYm9vbCBpc1NpbmdsZUxpbmVGbGV4Q29udGFpbmVy KCkgY29uc3QgeyByZXR1cm4gbV9mbGV4Q29udGFpbmVyLnN0eWxlKCkuZmxleFdyYXAoKSA9PSBG bGV4V3JhcDo6Tm9XcmFwOyB9Ci0gICAgY29uc3QgRWxlbWVudEJveCYgZmxleENvbnRhaW5lcigp IGNvbnN0IHsgcmV0dXJuIG1fZmxleENvbnRhaW5lcjsgfQotICAgIGNvbnN0IFJlbmRlclN0eWxl JiByb290U3R5bGUoKSBjb25zdCB7IHJldHVybiBmbGV4Q29udGFpbmVyKCkuc3R5bGUoKTsgfQor ICAgIExheW91dFVuaXQgbWF4Q29udGVudEZvckZsZXhJdGVtKGNvbnN0IExvZ2ljYWxGbGV4SXRl bSYpIGNvbnN0OworCisgICAgYm9vbCBpc1NpbmdsZUxpbmVGbGV4Q29udGFpbmVyKCkgY29uc3Qg eyByZXR1cm4gZmxleENvbnRhaW5lcigpLnN0eWxlKCkuZmxleFdyYXAoKSA9PSBGbGV4V3JhcDo6 Tm9XcmFwOyB9CisgICAgY29uc3QgRWxlbWVudEJveCYgZmxleENvbnRhaW5lcigpIGNvbnN0Owor ICAgIGNvbnN0IEZsZXhGb3JtYXR0aW5nQ29udGV4dCYgZmxleEZvcm1hdHRpbmdDb250ZXh0KCkg Y29uc3Q7CisgICAgY29uc3QgUmVuZGVyU3R5bGUmIGZsZXhDb250YWluZXJTdHlsZSgpIGNvbnN0 IHsgcmV0dXJuIGZsZXhDb250YWluZXIoKS5zdHlsZSgpOyB9CiAKIHByaXZhdGU6Ci0gICAgY29u c3QgRWxlbWVudEJveCYgbV9mbGV4Q29udGFpbmVyOworICAgIGNvbnN0IEZsZXhGb3JtYXR0aW5n Q29udGV4dCYgbV9mbGV4Rm9ybWF0dGluZ0NvbnRleHQ7CiAKICAgICBMYXlvdXRVbml0IG1fYXZh aWxhYmxlTWFpblNwYWNlOwogICAgIExheW91dFVuaXQgbV9hdmFpbGFibGVDcm9zc1NwYWNlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IDA4MTJlNGVhZjkxMi4uYjIyMDY5ODk1ZmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xNDEsNiArMTQxLDE4IEBAIEludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmlu c2ljV2lkdGhDb25zdHJhCiAgICAgcmV0dXJuIGNvbnN0cmFpbnRzOwogfQogCitMYXlvdXRVbml0 IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjptYXhpbXVtQ29udGVudFNpemUoKQoreworICAgIGF1 dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IGZvcm1hdHRpbmdTdGF0ZSgpOworICAgIGlmIChh dXRvIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBpbmxpbmVGb3JtYXR0aW5nU3RhdGUuaW50 cmluc2ljV2lkdGhDb25zdHJhaW50cygpKQorICAgICAgICByZXR1cm4gaW50cmluc2ljV2lkdGhD b25zdHJhaW50cy0+bWF4aW11bTsKKworICAgIGlmIChpbmxpbmVGb3JtYXR0aW5nU3RhdGUuaW5s aW5lSXRlbXMoKS5pc0VtcHR5KCkpCisgICAgICAgIElubGluZUl0ZW1zQnVpbGRlciB7IHJvb3Qo KSwgaW5saW5lRm9ybWF0dGluZ1N0YXRlIH0uYnVpbGQoeyB9KTsKKworICAgIHJldHVybiBjZWls ZWRMYXlvdXRVbml0KGNvbXB1dGVkSW50cmluc2ljV2lkdGhGb3JDb25zdHJhaW50KEludHJpbnNp Y1dpZHRoTW9kZTo6TWF4aW11bSkpOworfQorCiBzdGF0aWMgSW5saW5lSXRlbVBvc2l0aW9uIGxl YWRpbmdJbmxpbmVJdGVtUG9zaXRpb25Gb3JOZXh0TGluZShJbmxpbmVJdGVtUG9zaXRpb24gbGlu ZUNvbnRlbnRFbmQsIHN0ZDo6b3B0aW9uYWw8SW5saW5lSXRlbVBvc2l0aW9uPiBwcmV2aW91c0xp bmVUcmFpbGluZ0lubGluZUl0ZW1Qb3NpdGlvbiwgSW5saW5lSXRlbVBvc2l0aW9uIGxheW91dFJh bmdlRW5kKQogewogICAgIGlmICghcHJldmlvdXNMaW5lVHJhaWxpbmdJbmxpbmVJdGVtUG9zaXRp b24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAppbmRl eCBlY2MyZmU4ZDcyODguLmFiZTQ3YzExMzVkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC02Miw2ICs2Miw3IEBAIHB1YmxpYzoKICAgICBJ bmxpbmVMYXlvdXRSZXN1bHQgbGF5b3V0SW5GbG93QW5kRmxvYXRDb250ZW50KGNvbnN0IENvbnN0 cmFpbnRzRm9ySW5saW5lQ29udGVudCYsIElubGluZUxheW91dFN0YXRlJik7CiAgICAgdm9pZCBs YXlvdXRPdXRPZkZsb3dDb250ZW50KGNvbnN0IENvbnN0cmFpbnRzRm9ySW5saW5lQ29udGVudCYs IElubGluZUxheW91dFN0YXRlJiwgY29uc3QgSW5saW5lRGlzcGxheTo6Q29udGVudCYpOwogICAg IEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzKCkgb3ZlcnJpZGU7CisgICAgTGF5b3V0VW5pdCBtYXhpbXVtQ29udGVudFNpemUoKTsKIAog ICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdHZW9tZXRyeSYgZm9ybWF0dGluZ0dlb21ldHJ5KCkg Y29uc3QgZmluYWwgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnk7IH0KICAgICBj b25zdCBJbmxpbmVGb3JtYXR0aW5nUXVpcmtzJiBmb3JtYXR0aW5nUXVpcmtzKCkgY29uc3QgZmlu YWwgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nUXVpcmtzOyB9Cg==