241111 2022-05-30 15:14:11 -0700 [LFC][FFC] Add support for margin: auto 2022-05-31 09:09:17 -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 1872834 0 zalan 2022-05-30 15:14:11 -0700 ssia 1872837 1 459875 zalan 2022-05-30 16:10:14 -0700 Created attachment 459875 Patch 1872887 2 459875 koivisto 2022-05-30 21:33:37 -0700 Comment on attachment 459875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459875&action=review > Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:138 > + if (hasAutoMarginStart || hasAutoMarginEnd) > + autoMarginCount += hasAutoMarginStart && hasAutoMarginEnd ? 2 : 1; if (hasAutoMarginStart) ++autoMarginCount; if (hasAutoMarginEnd) ++autoMarginCount; would be easier to parse. 1872942 3 459885 zalan 2022-05-31 05:33:43 -0700 Created attachment 459885 [fast-cq]Patch 1872960 4 ews-feeder 2022-05-31 06:41:10 -0700 Committed r295051 (251146@main): <https://commits.webkit.org/251146@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459885. 1872962 5 webkit-bug-importer 2022-05-31 06:42:13 -0700 <rdar://problem/94147982> 459875 2022-05-30 16:10:14 -0700 2022-05-31 05:33:41 -0700 Patch bug-241111-20220530161013.patch text/plain 11992 zalan RnJvbSA5YTIyZmQwNmY1MmY0NzcwZTUzNDdiZjA4YjMzNWVkNDNiY2QzODA4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBN b24sIDMwIE1heSAyMDIyIDE1OjU0OjE4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBBZGQgc3VwcG9ydCBmb3IgbWFyZ2luOiBhdXRvCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQxMTExCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkF1dG8g bWFyZ2lucyB0YWtlIHVwIGFsbCBvZiB0aGUgc3BhY2UgdGhhdCB0aGV5IGNhbiBpbiB0aGVpciBh eGlzLgoxLiBjb21wdXRlIHRoZSBzcGFjZSAnbWFyZ2luOiBhdXRvJyBjYW4gdGFrZQoyLiBkaXN0 cmlidXRlIGl0IGFtb25nIGZsZXggaXRlbXMgd2l0aCAnbWFyZ2luOiBhdXRvJwozLiBhZGp1c3Qg ZmluYWwgdG9wL2xlZnQgd2l0aCB0aGUgY29tcHV0ZWQgbWFyZ2luCgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3Bw OgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkQXV0b01h cmdpblZhbHVlRm9yRmxleEl0ZW1zKToKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdD b250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UpOgooV2ViQ29yZTo6TGF5b3V0 OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OnNldEZsZXhJdGVtc0dlb21ldHJ5KToKKFdlYkNvcmU6 OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50 ZWdyYXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxl eC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaDoKLS0tCiAuLi4vZmxleC9GbGV4Rm9ybWF0dGluZ0Nv bnRleHQuY3BwICAgICAgICAgICAgfCA3OCArKysrKysrKysrKysrKysrLS0tCiAuLi4vZmxleC9G bGV4Rm9ybWF0dGluZ0NvbnRleHQuaCAgICAgICAgICAgICAgfCAgNCArLQogLi4uL2ZsZXgvTGF5 b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcCAgICAgIHwgIDUgKysKIDMgZmlsZXMgY2hhbmdl ZCwgNzUgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29u dGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgv RmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA4ODI2YTdiZGFiOGQuLmYyOGEzN2E0ZGJi NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9m bGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEx OSw3ICsxMTksMzMgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5z aWNXaWR0aENvbnN0cmFpbnRzRm9yRmxleEl0ZW1zKCkKICAgICB9CiB9CiAKLUZsZXhMYXlvdXQ6 OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1z VG9Mb2dpY2FsU3BhY2UoKQorc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVkQXV0b01hcmdpblZhbHVlRm9yRmxleEl0ZW1zKGNvbnN0IENvbnN0 cmFpbnRzRm9yRmxleENvbnRlbnQmIGNvbnN0cmFpbnRzKQoreworICAgIGF1dG8gZmxleERpcmVj dGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKKyAgICBhdXRvIGZsZXhEaXJl Y3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvdyB8 fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7CisgICAgYXV0byBh dmFpbGFibGVTcGFjZSA9IGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPyBzdGQ6Om1ha2Vfb3B0 aW9uYWwoY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxXaWR0aCkgOiBjb25zdHJhaW50 cy5hdmFpbGFibGVWZXJ0aWNhbFNwYWNlKCk7CisgICAgaWYgKCFhdmFpbGFibGVTcGFjZSkKKyAg ICAgICAgcmV0dXJuIHsgfTsKKworICAgIHNpemVfdCBhdXRvTWFyZ2luQ291bnQgPSAwOworICAg IGF1dG8gbG9naWNhbFdpZHRoID0gTGF5b3V0VW5pdCB7IH07CisKKyAgICBmb3IgKGF1dG8qIGZs ZXhJdGVtID0gcm9vdCgpLmZpcnN0SW5GbG93Q2hpbGQoKTsgZmxleEl0ZW07IGZsZXhJdGVtID0g ZmxleEl0ZW0tPm5leHRJbkZsb3dTaWJsaW5nKCkpIHsKKyAgICAgICAgYXV0byYgZmxleEl0ZW1T dHlsZSA9IGZsZXhJdGVtLT5zdHlsZSgpOworICAgICAgICBhdXRvIGhhc0F1dG9NYXJnaW5TdGFy dCA9IGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPyBmbGV4SXRlbVN0eWxlLm1hcmdpblN0YXJ0 KCkuaXNBdXRvKCkgOiBmbGV4SXRlbVN0eWxlLm1hcmdpbkJlZm9yZSgpLmlzQXV0bygpOworICAg ICAgICBhdXRvIGhhc0F1dG9NYXJnaW5FbmQgPSBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID8g ZmxleEl0ZW1TdHlsZS5tYXJnaW5FbmQoKS5pc0F1dG8oKSA6IGZsZXhJdGVtU3R5bGUubWFyZ2lu QWZ0ZXIoKS5pc0F1dG8oKTsKKyAgICAgICAgaWYgKGhhc0F1dG9NYXJnaW5TdGFydCB8fCBoYXNB dXRvTWFyZ2luRW5kKQorICAgICAgICAgICAgYXV0b01hcmdpbkNvdW50ICs9IGhhc0F1dG9NYXJn aW5TdGFydCAmJiBoYXNBdXRvTWFyZ2luRW5kID8gMiA6IDE7CisKKyAgICAgICAgYXV0byYgZmxl eEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KCpmbGV4SXRlbSk7 CisgICAgICAgIGxvZ2ljYWxXaWR0aCArPSBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID8gZmxl eEl0ZW1HZW9tZXRyeS5tYXJnaW5Cb3hXaWR0aCgpIDogZmxleEl0ZW1HZW9tZXRyeS5tYXJnaW5C b3hIZWlnaHQoKTsKKyAgICB9CisgICAgaWYgKGF1dG9NYXJnaW5Db3VudCkKKyAgICAgICAgcmV0 dXJuIHN0ZDo6bWF4KDBfbHUsICphdmFpbGFibGVTcGFjZSAtIGxvZ2ljYWxXaWR0aCkgLyBhdXRv TWFyZ2luQ291bnQ7CisgICAgcmV0dXJuIHsgfTsKK30KKworRmxleExheW91dDo6TG9naWNhbEZs ZXhJdGVtcyBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxT cGFjZShjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiBjb25zdHJhaW50cykKIHsKICAg ICBzdHJ1Y3QgRmxleEl0ZW0gewogICAgICAgICBGbGV4UmVjdCBtYXJnaW5SZWN0OwpAQCAtMTI5 LDYgKzE1NSw3IEBAIEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdD b250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhCiAgICAgYXV0byYgZm9ybWF0dGlu Z1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7CiAgICAgVmVjdG9yPEZsZXhJdGVtPiBm bGV4SXRlbUxpc3Q7CiAgICAgYXV0byBmbGV4SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZhbHNlOwor ICAgIGF1dG8gYXV0b01hcmdpblZhbHVlID0gY29tcHV0ZWRBdXRvTWFyZ2luVmFsdWVGb3JGbGV4 SXRlbXMoY29uc3RyYWludHMpOwogCiAgICAgYXV0byBjb252ZXJ0VmlzdWFsVG9Mb2dpY2FsID0g WyZdIHsKICAgICAgICAgYXV0byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0 aW9uKCk7CkBAIC0xMzYsMjIgKzE2MywzOSBAQCBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW1z IEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYQogCiAg ICAgICAgIGZvciAoYXV0byogZmxleEl0ZW0gPSByb290KCkuZmlyc3RJbkZsb3dDaGlsZCgpOyBm bGV4SXRlbTsgZmxleEl0ZW0gPSBmbGV4SXRlbS0+bmV4dEluRmxvd1NpYmxpbmcoKSkgewogICAg ICAgICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9t ZXRyeSgqZmxleEl0ZW0pOworICAgICAgICAgICAgYXV0byYgZmxleEl0ZW1TdHlsZSA9IGZsZXhJ dGVtLT5zdHlsZSgpOwogICAgICAgICAgICAgYXV0byBsb2dpY2FsU2l6ZSA9IExheW91dFNpemUg eyB9OwogCiAgICAgICAgICAgICBzd2l0Y2ggKGRpcmVjdGlvbikgewogICAgICAgICAgICAgY2Fz ZSBGbGV4RGlyZWN0aW9uOjpSb3c6Ci0gICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJv d1JldmVyc2U6CisgICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U6IHsK KyAgICAgICAgICAgICAgICBhdXRvIGhhc0F1dG9NYXJnaW5TdGFydCA9IGZsZXhJdGVtU3R5bGUu bWFyZ2luU3RhcnQoKS5pc0F1dG8oKTsKKyAgICAgICAgICAgICAgICBhdXRvIGhhc0F1dG9NYXJn aW5FbmQgPSBmbGV4SXRlbVN0eWxlLm1hcmdpbkVuZCgpLmlzQXV0bygpOworICAgICAgICAgICAg ICAgIGlmIChhdXRvTWFyZ2luVmFsdWUgJiYgKGhhc0F1dG9NYXJnaW5TdGFydCB8fCBoYXNBdXRv TWFyZ2luRW5kKSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIGhvcml6b250YWxNYXJnaW4g PSBmbGV4SXRlbUdlb21ldHJ5Lmhvcml6b250YWxNYXJnaW4oKTsKKyAgICAgICAgICAgICAgICAg ICAgaG9yaXpvbnRhbE1hcmdpbiA9IHsgaGFzQXV0b01hcmdpblN0YXJ0ID8gKmF1dG9NYXJnaW5W YWx1ZSA6IGhvcml6b250YWxNYXJnaW4uc3RhcnQsIGhhc0F1dG9NYXJnaW5FbmQgPyAqYXV0b01h cmdpblZhbHVlIDogaG9yaXpvbnRhbE1hcmdpbi5lbmQgfTsKKyAgICAgICAgICAgICAgICAgICAg ZmxleEl0ZW1HZW9tZXRyeS5zZXRIb3Jpem9udGFsTWFyZ2luKGhvcml6b250YWxNYXJnaW4pOwor ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBsb2dpY2FsU2l6ZSA9IHsgZmxleEl0 ZW1HZW9tZXRyeS5tYXJnaW5Cb3hXaWR0aCgpLCBmbGV4SXRlbUdlb21ldHJ5Lm1hcmdpbkJveEhl aWdodCgpIH07CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CiAgICAgICAg ICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNvbHVtbjoKLSAgICAgICAgICAgIGNhc2UgRmxleERp cmVjdGlvbjo6Q29sdW1uUmV2ZXJzZToKKyAgICAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6 Q29sdW1uUmV2ZXJzZTogeworICAgICAgICAgICAgICAgIGF1dG8gaGFzQXV0b01hcmdpbkJlZm9y ZSA9IGZsZXhJdGVtU3R5bGUubWFyZ2luQmVmb3JlKCkuaXNBdXRvKCk7CisgICAgICAgICAgICAg ICAgYXV0byBoYXNBdXRvTWFyZ2luQWZ0ZXIgPSBmbGV4SXRlbVN0eWxlLm1hcmdpbkFmdGVyKCku aXNBdXRvKCk7CisgICAgICAgICAgICAgICAgaWYgKGF1dG9NYXJnaW5WYWx1ZSAmJiAoaGFzQXV0 b01hcmdpbkJlZm9yZSB8fCBoYXNBdXRvTWFyZ2luQWZ0ZXIpKSB7CisgICAgICAgICAgICAgICAg ICAgIGF1dG8gdmVydGljYWxNYXJnaW4gPSBmbGV4SXRlbUdlb21ldHJ5LnZlcnRpY2FsTWFyZ2lu KCk7CisgICAgICAgICAgICAgICAgICAgIHZlcnRpY2FsTWFyZ2luID0geyBoYXNBdXRvTWFyZ2lu QmVmb3JlID8gKmF1dG9NYXJnaW5WYWx1ZSA6IHZlcnRpY2FsTWFyZ2luLmJlZm9yZSwgaGFzQXV0 b01hcmdpbkFmdGVyID8gKmF1dG9NYXJnaW5WYWx1ZSA6IHZlcnRpY2FsTWFyZ2luLmFmdGVyIH07 CisgICAgICAgICAgICAgICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0VmVydGljYWxNYXJnaW4o dmVydGljYWxNYXJnaW4pOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBsb2dp Y2FsU2l6ZSA9IHsgZmxleEl0ZW1HZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKSwgZmxleEl0ZW1H ZW9tZXRyeS5tYXJnaW5Cb3hXaWR0aCgpIH07CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQotICAg ICAgICAgICAgYXV0byBmbGV4SXRlbU9yZGVyID0gZmxleEl0ZW0tPnN0eWxlKCkub3JkZXIoKTsK KyAgICAgICAgICAgIGF1dG8gZmxleEl0ZW1PcmRlciA9IGZsZXhJdGVtU3R5bGUub3JkZXIoKTsK ICAgICAgICAgICAgIGZsZXhJdGVtc05lZWRSZW9yZGVyaW5nID0gZmxleEl0ZW1zTmVlZFJlb3Jk ZXJpbmcgfHwgZmxleEl0ZW1PcmRlciAhPSBwcmV2aW91c0xvZ2ljYWxPcmRlci52YWx1ZV9vcigw KTsKICAgICAgICAgICAgIHByZXZpb3VzTG9naWNhbE9yZGVyID0gZmxleEl0ZW1PcmRlcjsKIApA QCAtMTg2LDI4ICsyMzAsNDAgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OnNldEZsZXhJ dGVtc0dlb21ldHJ5KGNvbnN0IEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXQKICAgICBhdXRvIGRp cmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKICAgICBmb3IgKGF1dG8m IGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3QpIHsKICAgICAgICAgYXV0byYg ZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeSgqbG9naWNhbEZs ZXhJdGVtLmxheW91dEJveCk7Ci0gICAgICAgIGF1dG8gdG9wTGVmdCA9IExheW91dFBvaW50IHsg fTsKKyAgICAgICAgYXV0byBib3JkZXJCb3hUb3BMZWZ0ID0gTGF5b3V0UG9pbnQgeyB9OwogCiAg ICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7CiAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6 Um93OgotICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxv Z2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QubGVmdCgpLCBjb25zdHJhaW50 cy5sb2dpY2FsVG9wKCkgKyBsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC50b3AoKSB9OworICAg ICAgICAgICAgYm9yZGVyQm94VG9wTGVmdCA9IHsKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50 cy5ob3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC5s ZWZ0KCkgKyBmbGV4SXRlbUdlb21ldHJ5Lm1hcmdpblN0YXJ0KCksCisgICAgICAgICAgICAgICAg Y29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QudG9w KCkKKyAgICAgICAgICAgIH07CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBGbGV4 RGlyZWN0aW9uOjpSb3dSZXZlcnNlOgotICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWlu dHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxSaWdodCgpIC0gbG9naWNhbEZsZXhJdGVtLm1hcmdpblJl Y3QucmlnaHQoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbEZsZXhJdGVtLm1h cmdpblJlY3QudG9wKCkgfTsKKyAgICAgICAgICAgIGJvcmRlckJveFRvcExlZnQgPSB7CisgICAg ICAgICAgICAgICAgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxSaWdodCgpIC0gbG9n aWNhbEZsZXhJdGVtLm1hcmdpblJlY3QucmlnaHQoKSArIGZsZXhJdGVtR2VvbWV0cnkubWFyZ2lu U3RhcnQoKSwKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBsb2dp Y2FsRmxleEl0ZW0ubWFyZ2luUmVjdC50b3AoKQorICAgICAgICAgICAgfTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNvbHVtbjogewogICAgICAgICAg ICAgYXV0byBmbGlwcGVkVG9wTGVmdCA9IGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnRvcExl ZnQoKS50cmFuc3Bvc2VkUG9pbnQoKTsKLSAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFp bnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCArIGZsaXBwZWRUb3BMZWZ0LngoKSwgY29uc3Ry YWludHMubG9naWNhbFRvcCgpICsgZmxpcHBlZFRvcExlZnQueSgpIH07CisgICAgICAgICAgICBi b3JkZXJCb3hUb3BMZWZ0ID0geworICAgICAgICAgICAgICAgIGNvbnN0cmFpbnRzLmhvcml6b250 YWwoKS5sb2dpY2FsTGVmdCArIGZsaXBwZWRUb3BMZWZ0LngoKSwKKyAgICAgICAgICAgICAgICBj b25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBmbGlwcGVkVG9wTGVmdC55KCkgKyBmbGV4SXRlbUdl b21ldHJ5Lm1hcmdpbkJlZm9yZSgpCisgICAgICAgICAgICB9OwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW5SZXZlcnNlOgot ICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxM ZWZ0ICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QudG9wKCksIGNvbnN0cmFpbnRzLmxvZ2lj YWxUb3AoKSArIGxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnJpZ2h0 KCkgfTsKKyAgICAgICAgICAgIGJvcmRlckJveFRvcExlZnQgPSB7CisgICAgICAgICAgICAgICAg Y29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLm1h cmdpblJlY3QudG9wKCksCisgICAgICAgICAgICAgICAgY29uc3RyYWludHMubG9naWNhbFRvcCgp ICsgbG9naWNhbFdpZHRoIC0gbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QucmlnaHQoKSArIGZs ZXhJdGVtR2VvbWV0cnkubWFyZ2luQmVmb3JlKCkKKyAgICAgICAgICAgIH07CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgZmxleEl0ZW1HZW9t ZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b3BMZWZ0KTsKKyAgICAgICAgZmxleEl0ZW1HZW9tZXRy eS5zZXRMb2dpY2FsVG9wTGVmdChib3JkZXJCb3hUb3BMZWZ0KTsKICAgICAgICAgaWYgKGRpcmVj dGlvbiA9PSBGbGV4RGlyZWN0aW9uOjpSb3cgfHwgZGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246 OlJvd1JldmVyc2UpIHsKICAgICAgICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0Q29udGVudEJv eFdpZHRoKGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LndpZHRoKCkgLSBmbGV4SXRlbUdlb21l dHJ5Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwogICAgICAgICAgICAgZmxl eEl0ZW1HZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5S ZWN0LmhlaWdodCgpIC0gZmxleEl0ZW1HZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBh ZGRpbmcoKSk7CkBAIC0yMjEsNyArMjc3LDcgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6 OnNldEZsZXhJdGVtc0dlb21ldHJ5KGNvbnN0IEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXQKIHZv aWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRp b24oY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50cykKIHsKICAg ICBhdXRvIGZsZXhDb25zdHJhaW50cyA9IGRvd25jYXN0PENvbnN0cmFpbnRzRm9yRmxleENvbnRl bnQ+KGNvbnN0cmFpbnRzKTsKLSAgICBhdXRvIGxvZ2ljYWxGbGV4SXRlbXMgPSBjb252ZXJ0Rmxl eEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKKyAgICBhdXRvIGxvZ2ljYWxGbGV4SXRlbXMgPSBjb252 ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoZmxleENvbnN0cmFpbnRzKTsKICAgICBhdXRvIGZs ZXhMYXlvdXQgPSBGbGV4TGF5b3V0IHsgZm9ybWF0dGluZ1N0YXRlKCksIHJvb3QoKS5zdHlsZSgp IH07CiAgICAgZmxleExheW91dC5sYXlvdXQoZmxleENvbnN0cmFpbnRzLCBsb2dpY2FsRmxleEl0 ZW1zKTsKICAgICBzZXRGbGV4SXRlbXNHZW9tZXRyeShsb2dpY2FsRmxleEl0ZW1zLCBmbGV4Q29u c3RyYWludHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4 IDU5YmE1NmE3ZjM5Yi4uMWYxNzYzYmYwMmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC01OCw5ICs1OCwxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgc2l6 ZUFuZFBsYWNlRmxleEl0ZW1zKGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKTsKICAg ICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yRmxleEl0ZW1zKCk7CiAK LSAgICBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW1zIGNvbnZlcnRGbGV4SXRlbXNUb0xvZ2lj YWxTcGFjZSgpOworICAgIEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRlbXMgY29udmVydEZsZXhJ dGVtc1RvTG9naWNhbFNwYWNlKGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKTsKICAg ICB2b2lkIHNldEZsZXhJdGVtc0dlb21ldHJ5KGNvbnN0IEZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4 SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CiAKKyAgICBzdGQ6Om9w dGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkQXV0b01hcmdpblZhbHVlRm9yRmxleEl0ZW1zKGNv bnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKTsKKwogICAgIGNvbnN0IEZsZXhGb3JtYXR0 aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PEZsZXhG b3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0K ICAgICBGbGV4Rm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBkb3du Y2FzdDxGbGV4Rm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0 YXRlKCkpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwCmlu ZGV4IGE0ZmU5Zjc2YTQ5Yi4uZDI5YmNmN2RjZDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVn cmF0aW9uRmxleExheW91dC5jcHAKQEAgLTE0OCw2ICsxNDgsMTEgQEAgdm9pZCBGbGV4TGF5b3V0 Ojp1cGRhdGVSZW5kZXJlcnMoKSBjb25zdAogICAgICAgICByZW5kZXJlci5zZXRMb2NhdGlvbihi b3JkZXJCb3gudG9wTGVmdCgpKTsKICAgICAgICAgcmVuZGVyZXIuc2V0V2lkdGgoYm9yZGVyQm94 LndpZHRoKCkpOwogICAgICAgICByZW5kZXJlci5zZXRIZWlnaHQoYm9yZGVyQm94LmhlaWdodCgp KTsKKworICAgICAgICByZW5kZXJlci5zZXRNYXJnaW5TdGFydChmbGV4SXRlbUdlb21ldHJ5Lm1h cmdpblN0YXJ0KCkpOworICAgICAgICByZW5kZXJlci5zZXRNYXJnaW5FbmQoZmxleEl0ZW1HZW9t ZXRyeS5tYXJnaW5FbmQoKSk7CisgICAgICAgIHJlbmRlcmVyLnNldE1hcmdpbkJlZm9yZShmbGV4 SXRlbUdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpKTsKKyAgICAgICAgcmVuZGVyZXIuc2V0TWFyZ2lu QWZ0ZXIoZmxleEl0ZW1HZW9tZXRyeS5tYXJnaW5BZnRlcigpKTsKICAgICB9CiB9CiAKLS0gCjIu MzIuMCAoQXBwbGUgR2l0LTEzMikKCg== 459885 2022-05-31 05:33:43 -0700 2022-05-31 09:09:17 -0700 [fast-cq]Patch bug-241111-20220531053342.patch text/plain 11987 zalan RnJvbSBhNWIwZmJkNmU3NGRkZDE0OGU4ZTE4YjExYTUzMzliM2ZjYTM1MWE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBN b24sIDMwIE1heSAyMDIyIDE1OjU0OjE4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBBZGQgc3VwcG9ydCBmb3IgbWFyZ2luOiBhdXRvCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQxMTExCgpSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KCkF1dG8g bWFyZ2lucyB0YWtlIHVwIGFsbCBvZiB0aGUgc3BhY2UgdGhhdCB0aGV5IGNhbiBpbiB0aGVpciBh eGlzLgoxLiBjb21wdXRlIHRoZSBzcGFjZSAnbWFyZ2luOiBhdXRvJyBjYW4gdGFrZQoyLiBkaXN0 cmlidXRlIGl0IGFtb25nIGZsZXggaXRlbXMgd2l0aCAnbWFyZ2luOiBhdXRvJwozLiBhZGp1c3Qg ZmluYWwgdG9wL2xlZnQgd2l0aCB0aGUgY29tcHV0ZWQgbWFyZ2luCgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3Bw OgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkQXV0b01h cmdpblZhbHVlRm9yRmxleEl0ZW1zKToKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdD b250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UpOgooV2ViQ29yZTo6TGF5b3V0 OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OnNldEZsZXhJdGVtc0dlb21ldHJ5KToKKFdlYkNvcmU6 OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50 ZWdyYXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxl eC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaDoKLS0tCiAuLi4vZmxleC9GbGV4Rm9ybWF0dGluZ0Nv bnRleHQuY3BwICAgICAgICAgICAgfCA4MCArKysrKysrKysrKysrKysrLS0tCiAuLi4vZmxleC9G bGV4Rm9ybWF0dGluZ0NvbnRleHQuaCAgICAgICAgICAgICAgfCAgNCArLQogLi4uL2ZsZXgvTGF5 b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcCAgICAgIHwgIDUgKysKIDMgZmlsZXMgY2hhbmdl ZCwgNzcgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29u dGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgv RmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA4ODI2YTdiZGFiOGQuLjgyNzhlOGE3NzY5 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9m bGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEx OSw3ICsxMTksMzUgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5z aWNXaWR0aENvbnN0cmFpbnRzRm9yRmxleEl0ZW1zKCkKICAgICB9CiB9CiAKLUZsZXhMYXlvdXQ6 OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1z VG9Mb2dpY2FsU3BhY2UoKQorc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVkQXV0b01hcmdpblZhbHVlRm9yRmxleEl0ZW1zKGNvbnN0IENvbnN0 cmFpbnRzRm9yRmxleENvbnRlbnQmIGNvbnN0cmFpbnRzKQoreworICAgIGF1dG8gZmxleERpcmVj dGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKKyAgICBhdXRvIGZsZXhEaXJl Y3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvdyB8 fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7CisgICAgYXV0byBh dmFpbGFibGVTcGFjZSA9IGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPyBzdGQ6Om1ha2Vfb3B0 aW9uYWwoY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxXaWR0aCkgOiBjb25zdHJhaW50 cy5hdmFpbGFibGVWZXJ0aWNhbFNwYWNlKCk7CisgICAgaWYgKCFhdmFpbGFibGVTcGFjZSkKKyAg ICAgICAgcmV0dXJuIHsgfTsKKworICAgIHNpemVfdCBhdXRvTWFyZ2luQ291bnQgPSAwOworICAg IGF1dG8gbG9naWNhbFdpZHRoID0gTGF5b3V0VW5pdCB7IH07CisKKyAgICBmb3IgKGF1dG8qIGZs ZXhJdGVtID0gcm9vdCgpLmZpcnN0SW5GbG93Q2hpbGQoKTsgZmxleEl0ZW07IGZsZXhJdGVtID0g ZmxleEl0ZW0tPm5leHRJbkZsb3dTaWJsaW5nKCkpIHsKKyAgICAgICAgYXV0byYgZmxleEl0ZW1T dHlsZSA9IGZsZXhJdGVtLT5zdHlsZSgpOworICAgICAgICBhdXRvIGhhc0F1dG9NYXJnaW5TdGFy dCA9IGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPyBmbGV4SXRlbVN0eWxlLm1hcmdpblN0YXJ0 KCkuaXNBdXRvKCkgOiBmbGV4SXRlbVN0eWxlLm1hcmdpbkJlZm9yZSgpLmlzQXV0bygpOworICAg ICAgICBhdXRvIGhhc0F1dG9NYXJnaW5FbmQgPSBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID8g ZmxleEl0ZW1TdHlsZS5tYXJnaW5FbmQoKS5pc0F1dG8oKSA6IGZsZXhJdGVtU3R5bGUubWFyZ2lu QWZ0ZXIoKS5pc0F1dG8oKTsKKyAgICAgICAgaWYgKGhhc0F1dG9NYXJnaW5TdGFydCkKKyAgICAg ICAgICAgICsrYXV0b01hcmdpbkNvdW50OworICAgICAgICBpZiAoaGFzQXV0b01hcmdpbkVuZCkK KyAgICAgICAgICAgICsrYXV0b01hcmdpbkNvdW50OworCisgICAgICAgIGF1dG8mIGZsZXhJdGVt R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeSgqZmxleEl0ZW0pOworICAg ICAgICBsb2dpY2FsV2lkdGggKz0gZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA/IGZsZXhJdGVt R2VvbWV0cnkubWFyZ2luQm94V2lkdGgoKSA6IGZsZXhJdGVtR2VvbWV0cnkubWFyZ2luQm94SGVp Z2h0KCk7CisgICAgfQorICAgIGlmIChhdXRvTWFyZ2luQ291bnQpCisgICAgICAgIHJldHVybiBz dGQ6Om1heCgwX2x1LCAqYXZhaWxhYmxlU3BhY2UgLSBsb2dpY2FsV2lkdGgpIC8gYXV0b01hcmdp bkNvdW50OworICAgIHJldHVybiB7IH07Cit9CisKK0ZsZXhMYXlvdXQ6OkxvZ2ljYWxGbGV4SXRl bXMgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2Uo Y29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgY29uc3RyYWludHMpCiB7CiAgICAgc3Ry dWN0IEZsZXhJdGVtIHsKICAgICAgICAgRmxleFJlY3QgbWFyZ2luUmVjdDsKQEAgLTEyOSw2ICsx NTcsNyBAQCBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW1zIEZsZXhGb3JtYXR0aW5nQ29udGV4 dDo6Y29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYQogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0 ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwogICAgIFZlY3RvcjxGbGV4SXRlbT4gZmxleEl0 ZW1MaXN0OwogICAgIGF1dG8gZmxleEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBmYWxzZTsKKyAgICBh dXRvIGF1dG9NYXJnaW5WYWx1ZSA9IGNvbXB1dGVkQXV0b01hcmdpblZhbHVlRm9yRmxleEl0ZW1z KGNvbnN0cmFpbnRzKTsKIAogICAgIGF1dG8gY29udmVydFZpc3VhbFRvTG9naWNhbCA9IFsmXSB7 CiAgICAgICAgIGF1dG8gZGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigp OwpAQCAtMTM2LDIyICsxNjUsMzkgQEAgRmxleExheW91dDo6TG9naWNhbEZsZXhJdGVtcyBGbGV4 Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGEKIAogICAgICAg ICBmb3IgKGF1dG8qIGZsZXhJdGVtID0gcm9vdCgpLmZpcnN0SW5GbG93Q2hpbGQoKTsgZmxleEl0 ZW07IGZsZXhJdGVtID0gZmxleEl0ZW0tPm5leHRJbkZsb3dTaWJsaW5nKCkpIHsKICAgICAgICAg ICAgIGF1dG8mIGZsZXhJdGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnko KmZsZXhJdGVtKTsKKyAgICAgICAgICAgIGF1dG8mIGZsZXhJdGVtU3R5bGUgPSBmbGV4SXRlbS0+ c3R5bGUoKTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFNpemUgPSBMYXlvdXRTaXplIHsgfTsK IAogICAgICAgICAgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsKICAgICAgICAgICAgIGNhc2UgRmxl eERpcmVjdGlvbjo6Um93OgotICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpSb3dSZXZl cnNlOgorICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpSb3dSZXZlcnNlOiB7CisgICAg ICAgICAgICAgICAgYXV0byBoYXNBdXRvTWFyZ2luU3RhcnQgPSBmbGV4SXRlbVN0eWxlLm1hcmdp blN0YXJ0KCkuaXNBdXRvKCk7CisgICAgICAgICAgICAgICAgYXV0byBoYXNBdXRvTWFyZ2luRW5k ID0gZmxleEl0ZW1TdHlsZS5tYXJnaW5FbmQoKS5pc0F1dG8oKTsKKyAgICAgICAgICAgICAgICBp ZiAoYXV0b01hcmdpblZhbHVlICYmIChoYXNBdXRvTWFyZ2luU3RhcnQgfHwgaGFzQXV0b01hcmdp bkVuZCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gZmxl eEl0ZW1HZW9tZXRyeS5ob3Jpem9udGFsTWFyZ2luKCk7CisgICAgICAgICAgICAgICAgICAgIGhv cml6b250YWxNYXJnaW4gPSB7IGhhc0F1dG9NYXJnaW5TdGFydCA/ICphdXRvTWFyZ2luVmFsdWUg OiBob3Jpem9udGFsTWFyZ2luLnN0YXJ0LCBoYXNBdXRvTWFyZ2luRW5kID8gKmF1dG9NYXJnaW5W YWx1ZSA6IGhvcml6b250YWxNYXJnaW4uZW5kIH07CisgICAgICAgICAgICAgICAgICAgIGZsZXhJ dGVtR2VvbWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdpbihob3Jpem9udGFsTWFyZ2luKTsKKyAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgbG9naWNhbFNpemUgPSB7IGZsZXhJdGVtR2Vv bWV0cnkubWFyZ2luQm94V2lkdGgoKSwgZmxleEl0ZW1HZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQo KSB9OwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQogICAgICAgICAgICAg Y2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46Ci0gICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rp b246OkNvbHVtblJldmVyc2U6CisgICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNvbHVt blJldmVyc2U6IHsKKyAgICAgICAgICAgICAgICBhdXRvIGhhc0F1dG9NYXJnaW5CZWZvcmUgPSBm bGV4SXRlbVN0eWxlLm1hcmdpbkJlZm9yZSgpLmlzQXV0bygpOworICAgICAgICAgICAgICAgIGF1 dG8gaGFzQXV0b01hcmdpbkFmdGVyID0gZmxleEl0ZW1TdHlsZS5tYXJnaW5BZnRlcigpLmlzQXV0 bygpOworICAgICAgICAgICAgICAgIGlmIChhdXRvTWFyZ2luVmFsdWUgJiYgKGhhc0F1dG9NYXJn aW5CZWZvcmUgfHwgaGFzQXV0b01hcmdpbkFmdGVyKSkgeworICAgICAgICAgICAgICAgICAgICBh dXRvIHZlcnRpY2FsTWFyZ2luID0gZmxleEl0ZW1HZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbigpOwor ICAgICAgICAgICAgICAgICAgICB2ZXJ0aWNhbE1hcmdpbiA9IHsgaGFzQXV0b01hcmdpbkJlZm9y ZSA/ICphdXRvTWFyZ2luVmFsdWUgOiB2ZXJ0aWNhbE1hcmdpbi5iZWZvcmUsIGhhc0F1dG9NYXJn aW5BZnRlciA/ICphdXRvTWFyZ2luVmFsdWUgOiB2ZXJ0aWNhbE1hcmdpbi5hZnRlciB9OworICAg ICAgICAgICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHZlcnRp Y2FsTWFyZ2luKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgbG9naWNhbFNp emUgPSB7IGZsZXhJdGVtR2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0KCksIGZsZXhJdGVtR2VvbWV0 cnkubWFyZ2luQm94V2lkdGgoKSB9OwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgfQogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIGF1dG8gZmxleEl0ZW1PcmRlciA9IGZsZXhJdGVtLT5zdHlsZSgpLm9yZGVyKCk7CisgICAg ICAgICAgICBhdXRvIGZsZXhJdGVtT3JkZXIgPSBmbGV4SXRlbVN0eWxlLm9yZGVyKCk7CiAgICAg ICAgICAgICBmbGV4SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZsZXhJdGVtc05lZWRSZW9yZGVyaW5n IHx8IGZsZXhJdGVtT3JkZXIgIT0gcHJldmlvdXNMb2dpY2FsT3JkZXIudmFsdWVfb3IoMCk7CiAg ICAgICAgICAgICBwcmV2aW91c0xvZ2ljYWxPcmRlciA9IGZsZXhJdGVtT3JkZXI7CiAKQEAgLTE4 NiwyOCArMjMyLDQwIEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpzZXRGbGV4SXRlbXNH ZW9tZXRyeShjb25zdCBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0CiAgICAgYXV0byBkaXJlY3Rp b24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CiAgICAgZm9yIChhdXRvJiBsb2dp Y2FsRmxleEl0ZW0gOiBsb2dpY2FsRmxleEl0ZW1MaXN0KSB7CiAgICAgICAgIGF1dG8mIGZsZXhJ dGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkoKmxvZ2ljYWxGbGV4SXRl bS5sYXlvdXRCb3gpOwotICAgICAgICBhdXRvIHRvcExlZnQgPSBMYXlvdXRQb2ludCB7IH07Cisg ICAgICAgIGF1dG8gYm9yZGVyQm94VG9wTGVmdCA9IExheW91dFBvaW50IHsgfTsKIAogICAgICAg ICBzd2l0Y2ggKGRpcmVjdGlvbikgewogICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvdzoK LSAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2Fs TGVmdCArIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LmxlZnQoKSwgY29uc3RyYWludHMubG9n aWNhbFRvcCgpICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QudG9wKCkgfTsKKyAgICAgICAg ICAgIGJvcmRlckJveFRvcExlZnQgPSB7CisgICAgICAgICAgICAgICAgY29uc3RyYWludHMuaG9y aXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLm1hcmdpblJlY3QubGVmdCgp ICsgZmxleEl0ZW1HZW9tZXRyeS5tYXJnaW5TdGFydCgpLAorICAgICAgICAgICAgICAgIGNvbnN0 cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnRvcCgpCisg ICAgICAgICAgICB9OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRmxleERpcmVj dGlvbjo6Um93UmV2ZXJzZToKLSAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhv cml6b250YWwoKS5sb2dpY2FsUmlnaHQoKSAtIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnJp Z2h0KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5S ZWN0LnRvcCgpIH07CisgICAgICAgICAgICBib3JkZXJCb3hUb3BMZWZ0ID0geworICAgICAgICAg ICAgICAgIGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsUmlnaHQoKSAtIGxvZ2ljYWxG bGV4SXRlbS5tYXJnaW5SZWN0LnJpZ2h0KCkgKyBmbGV4SXRlbUdlb21ldHJ5Lm1hcmdpblN0YXJ0 KCksCisgICAgICAgICAgICAgICAgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbEZs ZXhJdGVtLm1hcmdpblJlY3QudG9wKCkKKyAgICAgICAgICAgIH07CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46IHsKICAgICAgICAgICAgIGF1 dG8gZmxpcHBlZFRvcExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC50b3BMZWZ0KCku dHJhbnNwb3NlZFBvaW50KCk7Ci0gICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5o b3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBmbGlwcGVkVG9wTGVmdC54KCksIGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3AoKSArIGZsaXBwZWRUb3BMZWZ0LnkoKSB9OworICAgICAgICAgICAgYm9yZGVy Qm94VG9wTGVmdCA9IHsKKyAgICAgICAgICAgICAgICBjb25zdHJhaW50cy5ob3Jpem9udGFsKCku bG9naWNhbExlZnQgKyBmbGlwcGVkVG9wTGVmdC54KCksCisgICAgICAgICAgICAgICAgY29uc3Ry YWludHMubG9naWNhbFRvcCgpICsgZmxpcHBlZFRvcExlZnQueSgpICsgZmxleEl0ZW1HZW9tZXRy eS5tYXJnaW5CZWZvcmUoKQorICAgICAgICAgICAgfTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CiAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Q29sdW1uUmV2ZXJzZToKLSAgICAg ICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCAr IGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnRvcCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9w KCkgKyBsb2dpY2FsV2lkdGggLSBsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC5yaWdodCgpIH07 CisgICAgICAgICAgICBib3JkZXJCb3hUb3BMZWZ0ID0geworICAgICAgICAgICAgICAgIGNvbnN0 cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCArIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5S ZWN0LnRvcCgpLAorICAgICAgICAgICAgICAgIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGxv Z2ljYWxXaWR0aCAtIGxvZ2ljYWxGbGV4SXRlbS5tYXJnaW5SZWN0LnJpZ2h0KCkgKyBmbGV4SXRl bUdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpCisgICAgICAgICAgICB9OwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIGZsZXhJdGVtR2VvbWV0cnku c2V0TG9naWNhbFRvcExlZnQodG9wTGVmdCk7CisgICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQoYm9yZGVyQm94VG9wTGVmdCk7CiAgICAgICAgIGlmIChkaXJlY3Rpb24g PT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGRpcmVjdGlvbiA9PSBGbGV4RGlyZWN0aW9uOjpSb3dS ZXZlcnNlKSB7CiAgICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0 aChsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC53aWR0aCgpIC0gZmxleEl0ZW1HZW9tZXRyeS5o b3Jpem9udGFsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpKTsKICAgICAgICAgICAgIGZsZXhJdGVt R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChsb2dpY2FsRmxleEl0ZW0ubWFyZ2luUmVjdC5o ZWlnaHQoKSAtIGZsZXhJdGVtR2VvbWV0cnkudmVydGljYWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5n KCkpOwpAQCAtMjIxLDcgKzI3OSw3IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpzZXRG bGV4SXRlbXNHZW9tZXRyeShjb25zdCBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0CiB2b2lkIEZs ZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNv bnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCiB7CiAgICAgYXV0 byBmbGV4Q29uc3RyYWludHMgPSBkb3duY2FzdDxDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Pihj b25zdHJhaW50cyk7Ci0gICAgYXV0byBsb2dpY2FsRmxleEl0ZW1zID0gY29udmVydEZsZXhJdGVt c1RvTG9naWNhbFNwYWNlKCk7CisgICAgYXV0byBsb2dpY2FsRmxleEl0ZW1zID0gY29udmVydEZs ZXhJdGVtc1RvTG9naWNhbFNwYWNlKGZsZXhDb25zdHJhaW50cyk7CiAgICAgYXV0byBmbGV4TGF5 b3V0ID0gRmxleExheW91dCB7IGZvcm1hdHRpbmdTdGF0ZSgpLCByb290KCkuc3R5bGUoKSB9Owog ICAgIGZsZXhMYXlvdXQubGF5b3V0KGZsZXhDb25zdHJhaW50cywgbG9naWNhbEZsZXhJdGVtcyk7 CiAgICAgc2V0RmxleEl0ZW1zR2VvbWV0cnkobG9naWNhbEZsZXhJdGVtcywgZmxleENvbnN0cmFp bnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA1OWJh NTZhN2YzOWIuLjFmMTc2M2JmMDJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGlu Z0NvbnRleHQuaApAQCAtNTgsOSArNTgsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNpemVBbmRQ bGFjZUZsZXhJdGVtcyhjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CiAgICAgdm9p ZCBjb21wdXRlSW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckZsZXhJdGVtcygpOwogCi0gICAg RmxleExheW91dDo6TG9naWNhbEZsZXhJdGVtcyBjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3Bh Y2UoKTsKKyAgICBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW1zIGNvbnZlcnRGbGV4SXRlbXNU b0xvZ2ljYWxTcGFjZShjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CiAgICAgdm9p ZCBzZXRGbGV4SXRlbXNHZW9tZXRyeShjb25zdCBGbGV4TGF5b3V0OjpMb2dpY2FsRmxleEl0ZW1z JiwgY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYpOwogCisgICAgc3RkOjpvcHRpb25h bDxMYXlvdXRVbml0PiBjb21wdXRlZEF1dG9NYXJnaW5WYWx1ZUZvckZsZXhJdGVtcyhjb25zdCBD b25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CisKICAgICBjb25zdCBGbGV4Rm9ybWF0dGluZ1N0 YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSBjb25zdCB7IHJldHVybiBkb3duY2FzdDxGbGV4Rm9ybWF0 dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9CiAgICAg RmxleEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93bmNhc3Q8 RmxleEZvcm1hdHRpbmdTdGF0ZT4oRm9ybWF0dGluZ0NvbnRleHQ6OmZvcm1hdHRpbmdTdGF0ZSgp KTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxl eC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcAppbmRleCBh NGZlOWY3NmE0OWIuLmQyOWJjZjdkY2QyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlvdXRJbnRlZ3JhdGlv bkZsZXhMYXlvdXQuY3BwCkBAIC0xNDgsNiArMTQ4LDExIEBAIHZvaWQgRmxleExheW91dDo6dXBk YXRlUmVuZGVyZXJzKCkgY29uc3QKICAgICAgICAgcmVuZGVyZXIuc2V0TG9jYXRpb24oYm9yZGVy Qm94LnRvcExlZnQoKSk7CiAgICAgICAgIHJlbmRlcmVyLnNldFdpZHRoKGJvcmRlckJveC53aWR0 aCgpKTsKICAgICAgICAgcmVuZGVyZXIuc2V0SGVpZ2h0KGJvcmRlckJveC5oZWlnaHQoKSk7CisK KyAgICAgICAgcmVuZGVyZXIuc2V0TWFyZ2luU3RhcnQoZmxleEl0ZW1HZW9tZXRyeS5tYXJnaW5T dGFydCgpKTsKKyAgICAgICAgcmVuZGVyZXIuc2V0TWFyZ2luRW5kKGZsZXhJdGVtR2VvbWV0cnku bWFyZ2luRW5kKCkpOworICAgICAgICByZW5kZXJlci5zZXRNYXJnaW5CZWZvcmUoZmxleEl0ZW1H ZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSk7CisgICAgICAgIHJlbmRlcmVyLnNldE1hcmdpbkFmdGVy KGZsZXhJdGVtR2VvbWV0cnkubWFyZ2luQWZ0ZXIoKSk7CiAgICAgfQogfQogCi0tIAoyLjMyLjAg KEFwcGxlIEdpdC0xMzIpCgo=