230724 2021-09-23 15:18:28 -0700 [LFC][IFC] InlineLevelBox only needs a handful of style properties 2021-09-24 07:40:21 -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 1796691 0 zalan 2021-09-23 15:18:28 -0700 ssia 1796693 1 439098 zalan 2021-09-23 15:21:09 -0700 Created attachment 439098 Patch 1796755 2 439118 zalan 2021-09-23 19:58:17 -0700 Created attachment 439118 Patch 1796858 3 439118 koivisto 2021-09-24 06:07:40 -0700 Comment on attachment 439118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439118&action=review > Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h:133 > + struct Style { > + const FontMetrics& primaryFontMetrics; > + const Length& lineHeight; > + InlineLayoutUnit primaryFontSize { 0 }; > + VerticalAlignment verticalAlignment { }; > + }; > + Style m_style; Nice 1796875 4 ews-feeder 2021-09-24 07:39:11 -0700 Committed r283042 (242102@main): <https://commits.webkit.org/242102@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439118. 1796876 5 webkit-bug-importer 2021-09-24 07:40:21 -0700 <rdar://problem/83495963> 439098 2021-09-23 15:21:09 -0700 2021-09-23 19:58:15 -0700 Patch bug-230724-20210923152108.patch text/plain 14658 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyOTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFkMGFhMmJjODAwNTI0 NDFiMjAyOGRjNmM3NzhlY2Y2YzgxZjI2NS4uMzk2MGY4NDFiN2M3YTNhZWRjMWY0YjIyMDU1NWFl YWZhNmZlMjE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA5LTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZUxl dmVsQm94IG9ubHkgbmVlZHMgYSBoYW5kZnVsIG9mIHN0eWxlIHByb3BlcnRpZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDcyNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFy YXRpb24gZm9yIHN1cHBvcnRpbmcgZmlyc3QtbGluZSBzdHlsZSB3aGVyZSB0aGUgaW5jb21pbmcg UmVuZGVyU3R5bGUmIGRlcGVuZHMgb24gd2hldGhlciB0aGUgaW5saW5lIGxldmVsIGJveCBpcyBv biB0aGUgZmlyc3QgbGluZSBvciBub3QuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVMZXZlbEJveDo6SW5saW5lTGV2ZWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjptX3N0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6 OmlzUHJlZmVycmVkTGluZUhlaWdodEZvbnRNZXRyaWNzQmFzZWQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVMZXZlbEJveDo6cHJpbWFyeUZvbnRNZXRyaWNzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OmZvbnRTaXplIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0 b21pY0lubGluZUxldmVsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2 ZWxCb3g6OmNyZWF0ZUlubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlR2VuZXJpY0lubGluZUxldmVsQm94KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6bV90eXBlKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveDo6TGluZUJveCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZl bEJveGVzKToKKwogMjAyMS0wOS0yMyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0lGQ11bTEZDXSBJbmxpbmVMZXZlbEJveCBuZWVkcyB0byByZXRhaW4gb25seSBh IHNtYWxsIHNldCBvZiBzdHlsZSBwcm9wZXJ0aWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGV2ZWxC b3guaAppbmRleCBjNjQ4NTI1YTk1YTNkZTA3YTNkMjY3OGMxYjY5YzMzOWMyMTkxN2FkLi4zMjNm ZjdiOWE2ZTU2NjE0ZGUwNGY0YzZmMGZmOTRkOWUxM2U2NjJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxldmVsQm94LmgKQEAgLTQzLDEwICs0MywxMCBAQCBjbGFzcyBMaW5lQm94VmVydGljYWxB bGlnbmVyOwogY2xhc3MgSW5saW5lTGV2ZWxCb3ggewogcHVibGljOgogICAgIGVudW0gY2xhc3Mg TGluZVNwYW5uaW5nSW5saW5lQm94IHsgWWVzLCBObyB9OwotICAgIHN0YXRpYyBJbmxpbmVMZXZl bEJveCBjcmVhdGVJbmxpbmVCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs TGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExpbmVTcGFubmluZ0lubGluZUJv eCA9IExpbmVTcGFubmluZ0lubGluZUJveDo6Tm8pOwotICAgIHN0YXRpYyBJbmxpbmVMZXZlbEJv eCBjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplKTsKLSAgICBzdGF0aWMgSW5saW5lTGV2ZWxC b3ggY3JlYXRlTGluZUJyZWFrQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNh bExlZnQpOwotICAgIHN0YXRpYyBJbmxpbmVMZXZlbEJveCBjcmVhdGVHZW5lcmljSW5saW5lTGV2 ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CisgICAgc3Rh dGljIElubGluZUxldmVsQm94IGNyZWF0ZUlubGluZUJveChjb25zdCBCb3gmLCBjb25zdCBSZW5k ZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoLCBMaW5lU3Bhbm5pbmdJbmxpbmVCb3ggPSBMaW5lU3Bhbm5pbmdJbmxpbmVC b3g6Ok5vKTsKKyAgICBzdGF0aWMgSW5saW5lTGV2ZWxCb3ggY3JlYXRlQXRvbWljSW5saW5lTGV2 ZWxCb3goY29uc3QgQm94JiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplKTsKKyAgICBzdGF0aWMgSW5saW5lTGV2ZWxCb3gg Y3JlYXRlTGluZUJyZWFrQm94KGNvbnN0IEJveCYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CisgICAgc3RhdGljIElubGluZUxldmVsQm94IGNyZWF0 ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSYsIElu bGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOwogCiAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNl bGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxpbmU7IH0KICAgICBzdGQ6Om9wdGlvbmFsPElu bGluZUxheW91dFVuaXQ+IGRlc2NlbnQoKSBjb25zdCB7IHJldHVybiBtX2Rlc2NlbnQ7IH0KQEAg LTY5LDkgKzY5LDkgQEAgcHVibGljOgogICAgIH07CiAgICAgVmVydGljYWxBbGlnbm1lbnQgdmVy dGljYWxBbGlnbigpIGNvbnN0OwogICAgIElubGluZUxheW91dFVuaXQgcHJlZmVycmVkTGluZUhl aWdodCgpIGNvbnN0OwotICAgIGJvb2wgaXNQcmVmZXJyZWRMaW5lSGVpZ2h0Rm9udE1ldHJpY3NC YXNlZCgpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCkubGluZUhlaWdodCgpLmlz TmVnYXRpdmUoKTsgfQotICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBwcmltYXJ5Rm9udE1ldHJpY3Mo KSBjb25zdCB7IHJldHVybiBsYXlvdXRCb3goKS5zdHlsZSgpLmZvbnRDYXNjYWRlKCkucHJpbWFy eUZvbnQoKS5mb250TWV0cmljcygpOyB9Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBmb250U2l6ZSgp IGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCkuZm9udENhc2NhZGUoKS5mb250RGVz Y3JpcHRpb24oKS5jb21wdXRlZFBpeGVsU2l6ZSgpOyB9CisgICAgYm9vbCBpc1ByZWZlcnJlZExp bmVIZWlnaHRGb250TWV0cmljc0Jhc2VkKCkgY29uc3Q7CisgICAgY29uc3QgRm9udE1ldHJpY3Mm IHByaW1hcnlGb250TWV0cmljcygpIGNvbnN0OworICAgIElubGluZUxheW91dFVuaXQgZm9udFNp emUoKSBjb25zdDsKIAogICAgIGJvb2wgaXNJbmxpbmVCb3goKSBjb25zdCB7IHJldHVybiBtX3R5 cGUgPT0gVHlwZTo6SW5saW5lQm94IHx8IGlzUm9vdElubGluZUJveCgpIHx8IGlzTGluZVNwYW5u aW5nSW5saW5lQm94KCk7IH0KICAgICBib29sIGlzUm9vdElubGluZUJveCgpIGNvbnN0IHsgcmV0 dXJuIG1fdHlwZSA9PSBUeXBlOjpSb290SW5saW5lQm94OyB9CkBAIC05Miw4ICs5Miw3IEBAIHB1 YmxpYzoKIAogICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5 b3V0Qm94OyB9CiAKLSAgICBJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplLCBUeXBlKTsKLSAgICBJbmxpbmVMZXZl bEJveCgpID0gZGVmYXVsdDsKKyAgICBJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBjb25zdCBS ZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNp emUsIFR5cGUpOwogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBMaW5lQm94OwpAQCAtMTI0 LDEyICsxMjMsMjAgQEAgcHJpdmF0ZToKICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVu aXQ+IG1fZGVzY2VudDsKICAgICBib29sIG1faGFzQ29udGVudCB7IGZhbHNlIH07CiAgICAgVHlw ZSBtX3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKKworICAgIHN0cnVjdCBTdHlsZSB7CisgICAg ICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBwcmltYXJ5Rm9udE1ldHJpY3M7CisgICAgICAgIGJvb2wg aXNQcmVmZXJyZWRMaW5lSGVpZ2h0Rm9udE1ldHJpY3NCYXNlZCB7IHRydWUgfTsKKyAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBwcmltYXJ5Rm9udFNpemUgeyAwIH07CisgICAgfTsKKyAgICBTdHls ZSBtX3N0eWxlOwogfTsKIAotaW5saW5lIElubGluZUxldmVsQm94OjpJbmxpbmVMZXZlbEJveChj b25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5l TGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSwgVHlwZSB0eXBlKQoraW5saW5lIElubGluZUxldmVsQm94 OjpJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxv Z2ljYWxTaXplLCBUeXBlIHR5cGUpCiAgICAgOiBtX2xheW91dEJveChtYWtlV2Vha1B0cihsYXlv dXRCb3gpKQogICAgICwgbV9sb2dpY2FsUmVjdCh7IH0sIGxvZ2ljYWxMZWZ0LCBsb2dpY2FsU2l6 ZS53aWR0aCgpLCBsb2dpY2FsU2l6ZS5oZWlnaHQoKSkKICAgICAsIG1fdHlwZSh0eXBlKQorICAg ICwgbV9zdHlsZSh7IHN0eWxlLmZvbnRDYXNjYWRlKCkucHJpbWFyeUZvbnQoKS5mb250TWV0cmlj cygpLCBzdHlsZS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpLCBJbmxpbmVMYXlvdXRVbml0KHN0 eWxlLmZvbnRDYXNjYWRlKCkuZm9udERlc2NyaXB0aW9uKCkuY29tcHV0ZWRQaXhlbFNpemUoKSkg fSkKIHsKIH0KIApAQCAtMTY2LDI0ICsxNzMsMzkgQEAgaW5saW5lIGJvb2wgSW5saW5lTGV2ZWxC b3g6Omhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIHZlcnRp Y2FsQWxpZ25tZW50ID09IFZlcnRpY2FsQWxpZ246OlRvcCB8fCB2ZXJ0aWNhbEFsaWdubWVudCA9 PSBWZXJ0aWNhbEFsaWduOjpCb3R0b207CiB9CiAKLWlubGluZSBJbmxpbmVMZXZlbEJveCBJbmxp bmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRC b3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgbG9naWNh bFNpemUpCitpbmxpbmUgYm9vbCBJbmxpbmVMZXZlbEJveDo6aXNQcmVmZXJyZWRMaW5lSGVpZ2h0 Rm9udE1ldHJpY3NCYXNlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc3R5bGUuaXNQcmVmZXJy ZWRMaW5lSGVpZ2h0Rm9udE1ldHJpY3NCYXNlZDsKK30KKworaW5saW5lIGNvbnN0IEZvbnRNZXRy aWNzJiBJbmxpbmVMZXZlbEJveDo6cHJpbWFyeUZvbnRNZXRyaWNzKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gbV9zdHlsZS5wcmltYXJ5Rm9udE1ldHJpY3M7Cit9CisKK2lubGluZSBJbmxpbmVMYXlv dXRVbml0IElubGluZUxldmVsQm94Ojpmb250U2l6ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1f c3R5bGUucHJpbWFyeUZvbnRTaXplOworfQorCitpbmxpbmUgSW5saW5lTGV2ZWxCb3ggSW5saW5l TGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQs IElubGluZUxheW91dFNpemUgbG9naWNhbFNpemUpCiB7Ci0gICAgcmV0dXJuIElubGluZUxldmVs Qm94IHsgbGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgbG9naWNhbFNpemUsIFR5cGU6OkF0b21pY0lu bGluZUxldmVsQm94IH07CisgICAgcmV0dXJuIElubGluZUxldmVsQm94IHsgbGF5b3V0Qm94LCBz dHlsZSwgbG9naWNhbExlZnQsIGxvZ2ljYWxTaXplLCBUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJv eCB9OwogfQogCi1pbmxpbmUgSW5saW5lTGV2ZWxCb3ggSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlu bGluZUJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVm dCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExpbmVTcGFubmluZ0lubGluZUJveCBp c0xpbmVTcGFubmluZykKK2lubGluZSBJbmxpbmVMZXZlbEJveCBJbmxpbmVMZXZlbEJveDo6Y3Jl YXRlSW5saW5lQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5 bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNh bFdpZHRoLCBMaW5lU3Bhbm5pbmdJbmxpbmVCb3ggaXNMaW5lU3Bhbm5pbmcpCiB7Ci0gICAgcmV0 dXJuIElubGluZUxldmVsQm94IHsgbGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0 U2l6ZSB7IGxvZ2ljYWxXaWR0aCwgeyB9IH0sIGlzTGluZVNwYW5uaW5nID09IExpbmVTcGFubmlu Z0lubGluZUJveDo6WWVzID8gVHlwZTo6TGluZVNwYW5uaW5nSW5saW5lQm94IDogVHlwZTo6SW5s aW5lQm94IH07CisgICAgcmV0dXJuIElubGluZUxldmVsQm94IHsgbGF5b3V0Qm94LCBzdHlsZSwg bG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyBsb2dpY2FsV2lkdGgsIHsgfSB9LCBpc0xp bmVTcGFubmluZyA9PSBMaW5lU3Bhbm5pbmdJbmxpbmVCb3g6OlllcyA/IFR5cGU6OkxpbmVTcGFu bmluZ0lubGluZUJveCA6IFR5cGU6OklubGluZUJveCB9OwogfQogCi1pbmxpbmUgSW5saW5lTGV2 ZWxCb3ggSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxpbmVCcmVha0JveChjb25zdCBCb3gmIGxheW91 dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCkKK2lubGluZSBJbmxpbmVMZXZlbEJv eCBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQp CiB7Ci0gICAgcmV0dXJuIElubGluZUxldmVsQm94IHsgbGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0U2l6ZSB7IH0sIFR5cGU6OkxpbmVCcmVha0JveCB9OworICAgIHJldHVybiBJ bmxpbmVMZXZlbEJveCB7IGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlv dXRTaXplIHsgfSwgVHlwZTo6TGluZUJyZWFrQm94IH07CiB9CiAKLWlubGluZSBJbmxpbmVMZXZl bEJveCBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlR2VuZXJpY0lubGluZUxldmVsQm94KGNvbnN0IEJv eCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KQoraW5saW5lIElubGlu ZUxldmVsQm94IElubGluZUxldmVsQm94OjpjcmVhdGVHZW5lcmljSW5saW5lTGV2ZWxCb3goY29u c3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsTGVmdCkKIHsKLSAgICByZXR1cm4gSW5saW5lTGV2ZWxCb3ggeyBsYXlvdXRC b3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgfSwgVHlwZTo6R2VuZXJpY0lubGlu ZUxldmVsQm94IH07CisgICAgcmV0dXJuIElubGluZUxldmVsQm94IHsgbGF5b3V0Qm94LCBzdHls ZSwgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyB9LCBUeXBlOjpHZW5lcmljSW5saW5l TGV2ZWxCb3ggfTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcAppbmRl eCBkMDVlZjc3MGRiYmUwYTU4MDZiNzMzMzRmYWYxNGQ5Zjk1NGY0ZWJhLi5jY2Y4YmRlMmUwNmZj NTYwM2I0ZGNlZWIxOTQxYTQzYzkzZTk5YTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94LmNwcApAQCAtMzUsNyArMzUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2Ug TGF5b3V0IHsKIAogTGluZUJveDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIElu bGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsV2lkdGgsIHNpemVfdCBub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQpCi0g ICAgOiBtX3Jvb3RJbmxpbmVCb3gocm9vdExheW91dEJveCwgY29udGVudExvZ2ljYWxMZWZ0LCBJ bmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGluZUxldmVs Qm94OjpUeXBlOjpSb290SW5saW5lQm94KQorICAgIDogbV9yb290SW5saW5lQm94KHJvb3RMYXlv dXRCb3gsIHJvb3RMYXlvdXRCb3guc3R5bGUoKSwgY29udGVudExvZ2ljYWxMZWZ0LCBJbmxpbmVM YXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGluZUxldmVsQm94OjpU eXBlOjpSb290SW5saW5lQm94KQogewogICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5y ZXNlcnZlSW5pdGlhbENhcGFjaXR5KG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCk7CiAg ICAgbV9ub25Sb290SW5saW5lTGV2ZWxCb3hNYXAucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShub25T cGFubmluZ0lubGluZUxldmVsQm94Q291bnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveEJ1aWxkZXIuY3BwCmluZGV4IDNhM2JiZWMyMmUxOWQ0YzljOGJkZTk3NDJlMTUwNDZj MTEzY2YwMDIuLmZhNDI2ZmEyMTJkMzAwMWUwMzQ1ZDgyMWM4Y2ZiZjI5ZDVjODJkM2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCb3hCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKQEAgLTI2NSw3ICsy NjUsNyBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGln bklubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZQogICAgICAgICB9CiAgICAgICAgIC8vIENv bnN0cnVjdCB0aGUgbWlzc2luZyBMaW5lQm94OjpJbmxpbmVCb3hlcyBzdGFydGluZyB3aXRoIHRo ZSB0b3Btb3N0IGxheW91dCBib3guCiAgICAgICAgIGZvciAoYXV0byogbGF5b3V0Qm94IDogV1RG OjptYWtlUmV2ZXJzZWRSYW5nZShsYXlvdXRCb3hlc1dpdGhvdXRJbmxpbmVCb3hlcykpIHsKLSAg ICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJv eCgqbGF5b3V0Qm94LCByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gu bG9naWNhbFdpZHRoKCksIElubGluZUxldmVsQm94OjpMaW5lU3Bhbm5pbmdJbmxpbmVCb3g6Olll cyk7CisgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJ bmxpbmVCb3goKmxheW91dEJveCwgbGF5b3V0Qm94LT5zdHlsZSgpLCByb290SW5saW5lQm94Lmxv Z2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gubG9naWNhbFdpZHRoKCksIElubGluZUxldmVsQm94 OjpMaW5lU3Bhbm5pbmdJbmxpbmVCb3g6Olllcyk7CiAgICAgICAgICAgICBzZXRJbml0aWFsVmVy dGljYWxHZW9tZXRyeUZvcklubGluZUJveChpbmxpbmVCb3gpOwogICAgICAgICAgICAgdXBkYXRl Q2FuVXNlU2ltcGxpZmllZEFsaWdubWVudChpbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJv eC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwpAQCAtMjc2LDYgKzI3Niw4 IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lCiAgICAgYXV0byBsaW5lSGFzQ29udGVudCA9IGZh bHNlOwogICAgIGZvciAoYXV0byYgcnVuIDogcnVucykgewogICAgICAgICBhdXRvJiBsYXlvdXRC b3ggPSBydW4ubGF5b3V0Qm94KCk7CisgICAgICAgIC8vIEZJWE1FOiBNYWtlIHRoaXMgbGluZSBp bmRleCBkZXBlbmRlbnQgdG8gc3VwcG9ydCBmaXJzdC1saW5lIHN0eWxlLgorICAgICAgICBhdXRv JiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwogICAgICAgICBhdXRvIHJ1bkhhc0NvbnRlbnQg PSBbJl0gKCkgLT4gYm9vbCB7CiAgICAgICAgICAgICBBU1NFUlQoIWxpbmVIYXNDb250ZW50KTsK ICAgICAgICAgICAgIGlmIChydW4uaXNUZXh0KCkgfHwgcnVuLmlzQm94KCkgfHwgcnVuLmlzU29m dExpbmVCcmVhaygpIHx8IHJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkKQEAgLTMwNCw3ICszMDYsNyBA QCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGlu ZUxldmVsQm94ZXMoTGluZUJveCYgbGluZQogICAgICAgICAgICAgfSBlbHNlIGlmIChsYXlvdXRC b3guaXNJbmxpbmVCbG9ja0JveCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlIGJhc2VsaW5l IG9mIGFuICdpbmxpbmUtYmxvY2snIGlzIHRoZSBiYXNlbGluZSBvZiBpdHMgbGFzdCBsaW5lIGJv eCBpbiB0aGUgbm9ybWFsIGZsb3csIHVubGVzcyBpdCBoYXMgZWl0aGVyIG5vIGluLWZsb3cgbGlu ZSBib3hlcyBvcgogICAgICAgICAgICAgICAgIC8vIGlmIGl0cyAnb3ZlcmZsb3cnIHByb3BlcnR5 IGhhcyBhIGNvbXB1dGVkIHZhbHVlIG90aGVyIHRoYW4gJ3Zpc2libGUnLCBpbiB3aGljaCBjYXNl IHRoZSBiYXNlbGluZSBpcyB0aGUgYm90dG9tIG1hcmdpbiBlZGdlLgotICAgICAgICAgICAgICAg IGF1dG8gc3ludGhlc2l6ZUJhc2VsaW5lID0gIWxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZv cm1hdHRpbmdDb250ZXh0KCkgfHwgIWxheW91dEJveC5zdHlsZSgpLmlzT3ZlcmZsb3dWaXNpYmxl KCk7CisgICAgICAgICAgICAgICAgYXV0byBzeW50aGVzaXplQmFzZWxpbmUgPSAhbGF5b3V0Qm94 LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSB8fCAhc3R5bGUuaXNPdmVyZmxv d1Zpc2libGUoKTsKICAgICAgICAgICAgICAgICBpZiAoc3ludGhlc2l6ZUJhc2VsaW5lKQogICAg ICAgICAgICAgICAgICAgICBhc2NlbnQgPSBtYXJnaW5Cb3hIZWlnaHQ7CiAgICAgICAgICAgICAg ICAgZWxzZSB7CkBAIC0zMTgsNyArMzIwLDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94QnVp bGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmUKICAg ICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBhc2NlbnQgPSBtYXJnaW5Cb3hIZWlnaHQ7 CiAgICAgICAgICAgICBsb2dpY2FsTGVmdCArPSBzdGQ6Om1heCgwX2x1LCBpbmxpbmVMZXZlbEJv eEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkpOwotICAgICAgICAgICAgYXV0byBhdG9taWNJbmxpbmVM ZXZlbEJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveChsYXlv dXRCb3gsIGxvZ2ljYWxMZWZ0LCB7IGlubGluZUxldmVsQm94R2VvbWV0cnkuYm9yZGVyQm94V2lk dGgoKSwgbWFyZ2luQm94SGVpZ2h0IH0pOworICAgICAgICAgICAgYXV0byBhdG9taWNJbmxpbmVM ZXZlbEJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveChsYXlv dXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgeyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRl ckJveFdpZHRoKCksIG1hcmdpbkJveEhlaWdodCB9KTsKICAgICAgICAgICAgIGF0b21pY0lubGlu ZUxldmVsQm94LnNldEJhc2VsaW5lKGFzY2VudCk7CiAgICAgICAgICAgICBhdG9taWNJbmxpbmVM ZXZlbEJveC5zZXRMYXlvdXRCb3VuZHMoSW5saW5lTGV2ZWxCb3g6OkxheW91dEJvdW5kcyB7IGFz Y2VudCwgbWFyZ2luQm94SGVpZ2h0IC0gYXNjZW50IH0pOwogICAgICAgICAgICAgdXBkYXRlQ2Fu VXNlU2ltcGxpZmllZEFsaWdubWVudChhdG9taWNJbmxpbmVMZXZlbEJveCwgaW5saW5lTGV2ZWxC b3hHZW9tZXRyeSk7CkBAIC0zMzIsNyArMzM0LDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94 QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmUK ICAgICAgICAgICAgIGF1dG8gbWFyZ2luU3RhcnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21l dHJ5Rm9yQm94KGxheW91dEJveCkubWFyZ2luU3RhcnQoKTsKICAgICAgICAgICAgIGF1dG8gaW5p dGlhbExvZ2ljYWxXaWR0aCA9IHJvb3RJbmxpbmVCb3gubG9naWNhbFdpZHRoKCkgLSAocnVuLmxv Z2ljYWxMZWZ0KCkgKyBtYXJnaW5TdGFydCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5pdGlhbExv Z2ljYWxXaWR0aCA+PSAwKTsKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gSW5saW5lTGV2 ZWxCb3g6OmNyZWF0ZUlubGluZUJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0ICsgbWFyZ2luU3Rh cnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJ bmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxM ZWZ0ICsgbWFyZ2luU3RhcnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAgc2V0 SW5pdGlhbFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goaW5saW5lQm94KTsKICAgICAgICAg ICAgIHVwZGF0ZUNhblVzZVNpbXBsaWZpZWRBbGlnbm1lbnQoaW5saW5lQm94KTsKICAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKQEAgLTM3 MCwxNCArMzcyLDE0IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVj dEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lCiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7Ci0g ICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVMaW5l QnJlYWtCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCk7CisgICAgICAgICAgICBhdXRvIGxpbmVC cmVha0JveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3gobGF5b3V0Qm94LCBz dHlsZSwgbG9naWNhbExlZnQpOwogICAgICAgICAgICAgc2V0SW5pdGlhbFZlcnRpY2FsR2VvbWV0 cnlGb3JJbmxpbmVCb3gobGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIHVwZGF0ZUNhblVzZVNp bXBsaWZpZWRBbGlnbm1lbnQobGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRk SW5saW5lTGV2ZWxCb3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChydW4uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgp KSB7Ci0gICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KElubGluZUxldmVsQm94 OjpjcmVhdGVHZW5lcmljSW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCkpOwor ICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChJbmxpbmVMZXZlbEJveDo6Y3Jl YXRlR2VuZXJpY0lubGluZUxldmVsQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxMZWZ0KSk7 CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsK 439118 2021-09-23 19:58:17 -0700 2021-09-24 07:39:13 -0700 Patch bug-230724-20210923195816.patch text/plain 16061 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2FmYmIzMWE2MDVhZjZm MjU5ZGIyOTM3OTRhZDA1MmEyY2M1YzMxNS4uMzU0Mzg1YTFiZDk5OTE1NzMyNzgyZmFhYzdhY2E0 ZGU4ZjA0ODFjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA5LTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZUxl dmVsQm94IG9ubHkgbmVlZHMgYSBoYW5kZnVsIG9mIHN0eWxlIHByb3BlcnRpZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDcyNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFy YXRpb24gZm9yIHN1cHBvcnRpbmcgZmlyc3QtbGluZSBzdHlsZSB3aGVyZSB0aGUgaW5jb21pbmcg UmVuZGVyU3R5bGUmIGRlcGVuZHMgb24gd2hldGhlciB0aGUgaW5saW5lIGxldmVsIGJveCBpcyBv biB0aGUgZmlyc3QgbGluZSBvciBub3QuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVMZXZlbEJveDo6SW5saW5lTGV2ZWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjptX3N0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6 OmlzUHJlZmVycmVkTGluZUhlaWdodEZvbnRNZXRyaWNzQmFzZWQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVMZXZlbEJveDo6cHJpbWFyeUZvbnRNZXRyaWNzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OmZvbnRTaXplIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0 b21pY0lubGluZUxldmVsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2 ZWxCb3g6OmNyZWF0ZUlubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlR2VuZXJpY0lubGluZUxldmVsQm94KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6bV90eXBlKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveDo6TGluZUJveCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZl bEJveGVzKToKKwogMjAyMS0wOS0yMyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0lGQ11bTEZDXSBJbmxpbmVMZXZlbEJveCBuZWVkcyB0byByZXRhaW4gb25seSBh IHNtYWxsIHNldCBvZiBzdHlsZSBwcm9wZXJ0aWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGV2ZWxC b3guaAppbmRleCBhNmY4MzRmMDVkYjEyYTM0ZGM5MTY1MjlkNTA3NWIzZjQ2YmU2ODQzLi5lMjA0 NTAzNDQ3NjdjZTI3M2I1Zjk5OGJmMmRmNzBiNmNkMTA0MzRmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxldmVsQm94LmgKQEAgLTQzLDEwICs0MywxMCBAQCBjbGFzcyBMaW5lQm94VmVydGljYWxB bGlnbmVyOwogY2xhc3MgSW5saW5lTGV2ZWxCb3ggewogcHVibGljOgogICAgIGVudW0gY2xhc3Mg TGluZVNwYW5uaW5nSW5saW5lQm94IHsgWWVzLCBObyB9OwotICAgIHN0YXRpYyBJbmxpbmVMZXZl bEJveCBjcmVhdGVJbmxpbmVCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs TGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExpbmVTcGFubmluZ0lubGluZUJv eCA9IExpbmVTcGFubmluZ0lubGluZUJveDo6Tm8pOwotICAgIHN0YXRpYyBJbmxpbmVMZXZlbEJv eCBjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplKTsKLSAgICBzdGF0aWMgSW5saW5lTGV2ZWxC b3ggY3JlYXRlTGluZUJyZWFrQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNh bExlZnQpOwotICAgIHN0YXRpYyBJbmxpbmVMZXZlbEJveCBjcmVhdGVHZW5lcmljSW5saW5lTGV2 ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CisgICAgc3Rh dGljIElubGluZUxldmVsQm94IGNyZWF0ZUlubGluZUJveChjb25zdCBCb3gmLCBjb25zdCBSZW5k ZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQg bG9naWNhbFdpZHRoLCBMaW5lU3Bhbm5pbmdJbmxpbmVCb3ggPSBMaW5lU3Bhbm5pbmdJbmxpbmVC b3g6Ok5vKTsKKyAgICBzdGF0aWMgSW5saW5lTGV2ZWxCb3ggY3JlYXRlQXRvbWljSW5saW5lTGV2 ZWxCb3goY29uc3QgQm94JiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplKTsKKyAgICBzdGF0aWMgSW5saW5lTGV2ZWxCb3gg Y3JlYXRlTGluZUJyZWFrQm94KGNvbnN0IEJveCYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CisgICAgc3RhdGljIElubGluZUxldmVsQm94IGNyZWF0 ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSYsIElu bGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOwogCiAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNl bGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxpbmU7IH0KICAgICBzdGQ6Om9wdGlvbmFsPElu bGluZUxheW91dFVuaXQ+IGRlc2NlbnQoKSBjb25zdCB7IHJldHVybiBtX2Rlc2NlbnQ7IH0KQEAg LTY5LDkgKzY5LDkgQEAgcHVibGljOgogICAgIH07CiAgICAgVmVydGljYWxBbGlnbm1lbnQgdmVy dGljYWxBbGlnbigpIGNvbnN0OwogICAgIElubGluZUxheW91dFVuaXQgcHJlZmVycmVkTGluZUhl aWdodCgpIGNvbnN0OwotICAgIGJvb2wgaXNQcmVmZXJyZWRMaW5lSGVpZ2h0Rm9udE1ldHJpY3NC YXNlZCgpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCkubGluZUhlaWdodCgpLmlz TmVnYXRpdmUoKTsgfQotICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBwcmltYXJ5Rm9udE1ldHJpY3Mo KSBjb25zdCB7IHJldHVybiBsYXlvdXRCb3goKS5zdHlsZSgpLmZvbnRDYXNjYWRlKCkucHJpbWFy eUZvbnQoKS5mb250TWV0cmljcygpOyB9Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBmb250U2l6ZSgp IGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCkuZm9udENhc2NhZGUoKS5mb250RGVz Y3JpcHRpb24oKS5jb21wdXRlZFBpeGVsU2l6ZSgpOyB9CisgICAgYm9vbCBpc1ByZWZlcnJlZExp bmVIZWlnaHRGb250TWV0cmljc0Jhc2VkKCkgY29uc3Q7CisgICAgY29uc3QgRm9udE1ldHJpY3Mm IHByaW1hcnlGb250TWV0cmljcygpIGNvbnN0OworICAgIElubGluZUxheW91dFVuaXQgZm9udFNp emUoKSBjb25zdDsKIAogICAgIGJvb2wgaXNJbmxpbmVCb3goKSBjb25zdCB7IHJldHVybiBtX3R5 cGUgPT0gVHlwZTo6SW5saW5lQm94IHx8IGlzUm9vdElubGluZUJveCgpIHx8IGlzTGluZVNwYW5u aW5nSW5saW5lQm94KCk7IH0KICAgICBib29sIGlzUm9vdElubGluZUJveCgpIGNvbnN0IHsgcmV0 dXJuIG1fdHlwZSA9PSBUeXBlOjpSb290SW5saW5lQm94OyB9CkBAIC05Miw4ICs5Miw3IEBAIHB1 YmxpYzoKIAogICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5 b3V0Qm94OyB9CiAKLSAgICBJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplLCBUeXBlKTsKLSAgICBJbmxpbmVMZXZl bEJveCgpID0gZGVmYXVsdDsKKyAgICBJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBjb25zdCBS ZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNp emUsIFR5cGUpOwogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBMaW5lQm94OwpAQCAtMTI0 LDEzICsxMjMsMjYgQEAgcHJpdmF0ZToKICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVu aXQ+IG1fZGVzY2VudDsKICAgICBib29sIG1faGFzQ29udGVudCB7IGZhbHNlIH07CiAgICAgVHlw ZSBtX3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKKworICAgIHN0cnVjdCBTdHlsZSB7CisgICAg ICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBwcmltYXJ5Rm9udE1ldHJpY3M7CisgICAgICAgIGNvbnN0 IExlbmd0aCYgbGluZUhlaWdodDsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBwcmltYXJ5Rm9u dFNpemUgeyAwIH07CisgICAgICAgIFZlcnRpY2FsQWxpZ25tZW50IHZlcnRpY2FsQWxpZ25tZW50 IHsgfTsKKyAgICB9OworICAgIFN0eWxlIG1fc3R5bGU7CiB9OwogCi1pbmxpbmUgSW5saW5lTGV2 ZWxCb3g6OklubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplLCBUeXBlIHR5cGUp CitpbmxpbmUgSW5saW5lTGV2ZWxCb3g6OklubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExl ZnQsIElubGluZUxheW91dFNpemUgbG9naWNhbFNpemUsIFR5cGUgdHlwZSkKICAgICA6IG1fbGF5 b3V0Qm94KG1ha2VXZWFrUHRyKGxheW91dEJveCkpCiAgICAgLCBtX2xvZ2ljYWxSZWN0KHsgfSwg bG9naWNhbExlZnQsIGxvZ2ljYWxTaXplLndpZHRoKCksIGxvZ2ljYWxTaXplLmhlaWdodCgpKQog ICAgICwgbV90eXBlKHR5cGUpCisgICAgLCBtX3N0eWxlKHsgc3R5bGUuZm9udENhc2NhZGUoKS5w cmltYXJ5Rm9udCgpLmZvbnRNZXRyaWNzKCksIHN0eWxlLmxpbmVIZWlnaHQoKSwgSW5saW5lTGF5 b3V0VW5pdChzdHlsZS5mb250Q2FzY2FkZSgpLmZvbnREZXNjcmlwdGlvbigpLmNvbXB1dGVkUGl4 ZWxTaXplKCkpLCB7IH0gfSkKIHsKKyAgICBtX3N0eWxlLnZlcnRpY2FsQWxpZ25tZW50LnR5cGUg PSBzdHlsZS52ZXJ0aWNhbEFsaWduKCk7CisgICAgaWYgKG1fc3R5bGUudmVydGljYWxBbGlnbm1l bnQudHlwZSA9PSBWZXJ0aWNhbEFsaWduOjpMZW5ndGgpCisgICAgICAgIG1fc3R5bGUudmVydGlj YWxBbGlnbm1lbnQuYmFzZWxpbmVPZmZzZXQgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKHN0eWxlLnZl cnRpY2FsQWxpZ25MZW5ndGgoKSwgcHJlZmVycmVkTGluZUhlaWdodCgpKTsKKwogfQogCiBpbmxp bmUgdm9pZCBJbmxpbmVMZXZlbEJveDo6c2V0SGFzQ29udGVudCgpCkBAIC0xNDUsNDUgKzE1Nyw1 NSBAQCBpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBJbmxpbmVMZXZlbEJveDo6cHJlZmVycmVkTGlu ZUhlaWdodCgpIGNvbnN0CiAgICAgaWYgKGlzUHJlZmVycmVkTGluZUhlaWdodEZvbnRNZXRyaWNz QmFzZWQoKSkKICAgICAgICAgcmV0dXJuIHByaW1hcnlGb250TWV0cmljcygpLmxpbmVTcGFjaW5n KCk7CiAKLSAgICBhdXRvJiBsaW5lSGVpZ2h0ID0gbGF5b3V0Qm94KCkuc3R5bGUoKS5saW5lSGVp Z2h0KCk7Ci0gICAgaWYgKGxpbmVIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpCi0gICAg ICAgIHJldHVybiBmbG9vcmYobWluaW11bVZhbHVlRm9yTGVuZ3RoKGxpbmVIZWlnaHQsIGZvbnRT aXplKCkpKTsKLSAgICByZXR1cm4gZmxvb3JmKGxpbmVIZWlnaHQudmFsdWUoKSk7CisgICAgaWYg KG1fc3R5bGUubGluZUhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkKKyAgICAgICAgcmV0 dXJuIGZsb29yZihtaW5pbXVtVmFsdWVGb3JMZW5ndGgobV9zdHlsZS5saW5lSGVpZ2h0LCBmb250 U2l6ZSgpKSk7CisgICAgcmV0dXJuIGZsb29yZihtX3N0eWxlLmxpbmVIZWlnaHQudmFsdWUoKSk7 CiB9CiAKIGlubGluZSBJbmxpbmVMZXZlbEJveDo6VmVydGljYWxBbGlnbm1lbnQgSW5saW5lTGV2 ZWxCb3g6OnZlcnRpY2FsQWxpZ24oKSBjb25zdAogewotICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0 Qm94KCkuc3R5bGUoKTsKLSAgICBhdXRvIHZlcnRpY2FsQWxpZ24gPSBzdHlsZS52ZXJ0aWNhbEFs aWduKCk7Ci0gICAgaWYgKHZlcnRpY2FsQWxpZ24gIT0gVmVydGljYWxBbGlnbjo6TGVuZ3RoKQot ICAgICAgICByZXR1cm4geyB2ZXJ0aWNhbEFsaWduLCB7IH0gfTsKLSAgICByZXR1cm4geyB2ZXJ0 aWNhbEFsaWduLCBmbG9hdFZhbHVlRm9yTGVuZ3RoKHN0eWxlLnZlcnRpY2FsQWxpZ25MZW5ndGgo KSwgcHJlZmVycmVkTGluZUhlaWdodCgpKSB9OworICAgIHJldHVybiBtX3N0eWxlLnZlcnRpY2Fs QWxpZ25tZW50OwogfQogCiBpbmxpbmUgYm9vbCBJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJveFJl bGF0aXZlQWxpZ25tZW50KCkgY29uc3QKIHsKLSAgICBhdXRvIHZlcnRpY2FsQWxpZ25tZW50ID0g bGF5b3V0Qm94KCkuc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCk7CisgICAgYXV0byB2ZXJ0aWNhbEFs aWdubWVudCA9IHZlcnRpY2FsQWxpZ24oKS50eXBlOwogICAgIHJldHVybiB2ZXJ0aWNhbEFsaWdu bWVudCA9PSBWZXJ0aWNhbEFsaWduOjpUb3AgfHwgdmVydGljYWxBbGlnbm1lbnQgPT0gVmVydGlj YWxBbGlnbjo6Qm90dG9tOwogfQogCi1pbmxpbmUgSW5saW5lTGV2ZWxCb3ggSW5saW5lTGV2ZWxC b3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplKQor aW5saW5lIGJvb2wgSW5saW5lTGV2ZWxCb3g6OmlzUHJlZmVycmVkTGluZUhlaWdodEZvbnRNZXRy aWNzQmFzZWQoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0eWxlLmxpbmVIZWlnaHQuaXNOZWdh dGl2ZSgpOworfQorCitpbmxpbmUgY29uc3QgRm9udE1ldHJpY3MmIElubGluZUxldmVsQm94Ojpw cmltYXJ5Rm9udE1ldHJpY3MoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0eWxlLnByaW1hcnlG b250TWV0cmljczsKK30KKworaW5saW5lIElubGluZUxheW91dFVuaXQgSW5saW5lTGV2ZWxCb3g6 OmZvbnRTaXplKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9zdHlsZS5wcmltYXJ5Rm9udFNpemU7 Cit9CisKK2lubGluZSBJbmxpbmVMZXZlbEJveCBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWlj SW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSBsb2dp Y2FsU2l6ZSkKIHsKLSAgICByZXR1cm4gSW5saW5lTGV2ZWxCb3ggeyBsYXlvdXRCb3gsIGxvZ2lj YWxMZWZ0LCBsb2dpY2FsU2l6ZSwgVHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3ggfTsKKyAgICBy ZXR1cm4gSW5saW5lTGV2ZWxCb3ggeyBsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgbG9n aWNhbFNpemUsIFR5cGU6OkF0b21pY0lubGluZUxldmVsQm94IH07CiB9CiAKLWlubGluZSBJbmxp bmVMZXZlbEJveCBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxXaWR0aCwgTGluZVNwYW5uaW5nSW5saW5lQm94IGlzTGluZVNwYW5uaW5nKQoraW5saW5l IElubGluZUxldmVsQm94IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3goY29uc3QgQm94 JiBsYXlvdXRCb3gsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBs b2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIExpbmVTcGFubmluZ0lu bGluZUJveCBpc0xpbmVTcGFubmluZykKIHsKLSAgICByZXR1cm4gSW5saW5lTGV2ZWxCb3ggeyBs YXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgbG9naWNhbFdpZHRoLCB7 IH0gfSwgaXNMaW5lU3Bhbm5pbmcgPT0gTGluZVNwYW5uaW5nSW5saW5lQm94OjpZZXMgPyBUeXBl OjpMaW5lU3Bhbm5pbmdJbmxpbmVCb3ggOiBUeXBlOjpJbmxpbmVCb3ggfTsKKyAgICByZXR1cm4g SW5saW5lTGV2ZWxCb3ggeyBsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5 b3V0U2l6ZSB7IGxvZ2ljYWxXaWR0aCwgeyB9IH0sIGlzTGluZVNwYW5uaW5nID09IExpbmVTcGFu bmluZ0lubGluZUJveDo6WWVzID8gVHlwZTo6TGluZVNwYW5uaW5nSW5saW5lQm94IDogVHlwZTo6 SW5saW5lQm94IH07CiB9CiAKLWlubGluZSBJbmxpbmVMZXZlbEJveCBJbmxpbmVMZXZlbEJveDo6 Y3JlYXRlTGluZUJyZWFrQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0KQoraW5saW5lIElubGluZUxldmVsQm94IElubGluZUxldmVsQm94OjpjcmVh dGVMaW5lQnJlYWtCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCkKIHsKLSAgICByZXR1cm4gSW5saW5l TGV2ZWxCb3ggeyBsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgfSwg VHlwZTo6TGluZUJyZWFrQm94IH07CisgICAgcmV0dXJuIElubGluZUxldmVsQm94IHsgbGF5b3V0 Qm94LCBzdHlsZSwgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyB9LCBUeXBlOjpMaW5l QnJlYWtCb3ggfTsKIH0KIAotaW5saW5lIElubGluZUxldmVsQm94IElubGluZUxldmVsQm94Ojpj cmVhdGVHZW5lcmljSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIElubGluZUxh eW91dFVuaXQgbG9naWNhbExlZnQpCitpbmxpbmUgSW5saW5lTGV2ZWxCb3ggSW5saW5lTGV2ZWxC b3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJveCwgY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KQogewot ICAgIHJldHVybiBJbmxpbmVMZXZlbEJveCB7IGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGlu ZUxheW91dFNpemUgeyB9LCBUeXBlOjpHZW5lcmljSW5saW5lTGV2ZWxCb3ggfTsKKyAgICByZXR1 cm4gSW5saW5lTGV2ZWxCb3ggeyBsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCwgSW5saW5l TGF5b3V0U2l6ZSB7IH0sIFR5cGU6OkdlbmVyaWNJbmxpbmVMZXZlbEJveCB9OwogfQogCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGQwNWVmNzcwZGJiZTBhNTgwNmI3 MzMzNGZhZjE0ZDlmOTU0ZjRlYmEuLmNjZjhiZGUyZTA2ZmM1NjAzYjRkY2VlYjE5NDFhNDNjOTNl OTlhNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwCkBAIC0zNSw3ICszNSw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCiBMaW5lQm94OjpM aW5lQm94KGNvbnN0IEJveCYgcm9vdExheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90 IG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCkKLSAgICA6IG1fcm9vdElubGluZUJveChy b290TGF5b3V0Qm94LCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyBjb250 ZW50TG9naWNhbFdpZHRoLCB7IH0gfSwgSW5saW5lTGV2ZWxCb3g6OlR5cGU6OlJvb3RJbmxpbmVC b3gpCisgICAgOiBtX3Jvb3RJbmxpbmVCb3gocm9vdExheW91dEJveCwgcm9vdExheW91dEJveC5z dHlsZSgpLCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9n aWNhbFdpZHRoLCB7IH0gfSwgSW5saW5lTGV2ZWxCb3g6OlR5cGU6OlJvb3RJbmxpbmVCb3gpCiB7 CiAgICAgbV9ub25Sb290SW5saW5lTGV2ZWxCb3hMaXN0LnJlc2VydmVJbml0aWFsQ2FwYWNpdHko bm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50KTsKICAgICBtX25vblJvb3RJbmxpbmVMZXZl bEJveE1hcC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hD b3VudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5k ZXggM2EzYmJlYzIyZTE5ZDRjOWM4YmRlOTc0MmUxNTA0NmMxMTNjZjAwMi4uZmE0MjZmYTIxMmQz MDAxZTAzNDVkODIxYzhjZmJmMjlkNWM4MmQzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMjY1LDcgKzI2NSw3IEBAIElubGluZUxheW91dFVu aXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5l Qm94JiBsaW5lCiAgICAgICAgIH0KICAgICAgICAgLy8gQ29uc3RydWN0IHRoZSBtaXNzaW5nIExp bmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGggdGhlIHRvcG1vc3QgbGF5b3V0IGJveC4K ICAgICAgICAgZm9yIChhdXRvKiBsYXlvdXRCb3ggOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKGxh eW91dEJveGVzV2l0aG91dElubGluZUJveGVzKSkgewotICAgICAgICAgICAgYXV0byBpbmxpbmVC b3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KCpsYXlvdXRCb3gsIHJvb3RJbmxp bmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgoKSwgSW5saW5l TGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJveDo6WWVzKTsKKyAgICAgICAgICAgIGF1dG8g aW5saW5lQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveCgqbGF5b3V0Qm94LCBs YXlvdXRCb3gtPnN0eWxlKCksIHJvb3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElubGlu ZUJveC5sb2dpY2FsV2lkdGgoKSwgSW5saW5lTGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJv eDo6WWVzKTsKICAgICAgICAgICAgIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5l Qm94KGlubGluZUJveCk7CiAgICAgICAgICAgICB1cGRhdGVDYW5Vc2VTaW1wbGlmaWVkQWxpZ25t ZW50KGlubGluZUJveCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdU Rk1vdmUoaW5saW5lQm94KSk7CkBAIC0yNzYsNiArMjc2LDggQEAgSW5saW5lTGF5b3V0VW5pdCBM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gm IGxpbmUKICAgICBhdXRvIGxpbmVIYXNDb250ZW50ID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBy dW4gOiBydW5zKSB7CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsK KyAgICAgICAgLy8gRklYTUU6IE1ha2UgdGhpcyBsaW5lIGluZGV4IGRlcGVuZGVudCB0byBzdXBw b3J0IGZpcnN0LWxpbmUgc3R5bGUuCisgICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0 eWxlKCk7CiAgICAgICAgIGF1dG8gcnVuSGFzQ29udGVudCA9IFsmXSAoKSAtPiBib29sIHsKICAg ICAgICAgICAgIEFTU0VSVCghbGluZUhhc0NvbnRlbnQpOwogICAgICAgICAgICAgaWYgKHJ1bi5p c1RleHQoKSB8fCBydW4uaXNCb3goKSB8fCBydW4uaXNTb2Z0TGluZUJyZWFrKCkgfHwgcnVuLmlz SGFyZExpbmVCcmVhaygpKQpAQCAtMzA0LDcgKzMwNiw3IEBAIElubGluZUxheW91dFVuaXQgTGlu ZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBs aW5lCiAgICAgICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkp IHsKICAgICAgICAgICAgICAgICAvLyBUaGUgYmFzZWxpbmUgb2YgYW4gJ2lubGluZS1ibG9jaycg aXMgdGhlIGJhc2VsaW5lIG9mIGl0cyBsYXN0IGxpbmUgYm94IGluIHRoZSBub3JtYWwgZmxvdywg dW5sZXNzIGl0IGhhcyBlaXRoZXIgbm8gaW4tZmxvdyBsaW5lIGJveGVzIG9yCiAgICAgICAgICAg ICAgICAgLy8gaWYgaXRzICdvdmVyZmxvdycgcHJvcGVydHkgaGFzIGEgY29tcHV0ZWQgdmFsdWUg b3RoZXIgdGhhbiAndmlzaWJsZScsIGluIHdoaWNoIGNhc2UgdGhlIGJhc2VsaW5lIGlzIHRoZSBi b3R0b20gbWFyZ2luIGVkZ2UuCi0gICAgICAgICAgICAgICAgYXV0byBzeW50aGVzaXplQmFzZWxp bmUgPSAhbGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSB8fCAh bGF5b3V0Qm94LnN0eWxlKCkuaXNPdmVyZmxvd1Zpc2libGUoKTsKKyAgICAgICAgICAgICAgICBh dXRvIHN5bnRoZXNpemVCYXNlbGluZSA9ICFsYXlvdXRCb3guZXN0YWJsaXNoZXNJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCgpIHx8ICFzdHlsZS5pc092ZXJmbG93VmlzaWJsZSgpOwogICAgICAgICAg ICAgICAgIGlmIChzeW50aGVzaXplQmFzZWxpbmUpCiAgICAgICAgICAgICAgICAgICAgIGFzY2Vu dCA9IG1hcmdpbkJveEhlaWdodDsKICAgICAgICAgICAgICAgICBlbHNlIHsKQEAgLTMxOCw3ICsz MjAsNyBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGln bklubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZQogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIGFzY2VudCA9IG1hcmdpbkJveEhlaWdodDsKICAgICAgICAgICAgIGxvZ2ljYWxM ZWZ0ICs9IHN0ZDo6bWF4KDBfbHUsIGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luU3RhcnQo KSk7Ci0gICAgICAgICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gSW5saW5lTGV2ZWxC b3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQsIHsg aW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJCb3hXaWR0aCgpLCBtYXJnaW5Cb3hIZWlnaHQg fSk7CisgICAgICAgICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gSW5saW5lTGV2ZWxC b3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxM ZWZ0LCB7IGlubGluZUxldmVsQm94R2VvbWV0cnkuYm9yZGVyQm94V2lkdGgoKSwgbWFyZ2luQm94 SGVpZ2h0IH0pOwogICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3guc2V0QmFzZWxpbmUo YXNjZW50KTsKICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LnNldExheW91dEJvdW5k cyhJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsgYXNjZW50LCBtYXJnaW5Cb3hIZWlnaHQg LSBhc2NlbnQgfSk7CiAgICAgICAgICAgICB1cGRhdGVDYW5Vc2VTaW1wbGlmaWVkQWxpZ25tZW50 KGF0b21pY0lubGluZUxldmVsQm94LCBpbmxpbmVMZXZlbEJveEdlb21ldHJ5KTsKQEAgLTMzMiw3 ICszMzQsNyBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRB bGlnbklubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZQogICAgICAgICAgICAgYXV0byBtYXJn aW5TdGFydCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KS5t YXJnaW5TdGFydCgpOwogICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gcm9v dElubGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIChydW4ubG9naWNhbExlZnQoKSArIG1hcmdpblN0 YXJ0KTsKICAgICAgICAgICAgIEFTU0VSVChpbml0aWFsTG9naWNhbFdpZHRoID49IDApOwotICAg ICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94 KGxheW91dEJveCwgbG9naWNhbExlZnQgKyBtYXJnaW5TdGFydCwgaW5pdGlhbExvZ2ljYWxXaWR0 aCk7CisgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJ bmxpbmVCb3gobGF5b3V0Qm94LCBzdHlsZSwgbG9naWNhbExlZnQgKyBtYXJnaW5TdGFydCwgaW5p dGlhbExvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAgICBzZXRJbml0aWFsVmVydGljYWxHZW9tZXRy eUZvcklubGluZUJveChpbmxpbmVCb3gpOwogICAgICAgICAgICAgdXBkYXRlQ2FuVXNlU2ltcGxp ZmllZEFsaWdubWVudChpbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVM ZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwpAQCAtMzcwLDE0ICszNzIsMTQgQEAgSW5saW5l TGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJv eGVzKExpbmVCb3gmIGxpbmUKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAg ICAgIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIGF1dG8gbGluZUJy ZWFrQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIGxv Z2ljYWxMZWZ0KTsKKyAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrQm94ID0gSW5saW5lTGV2ZWxC b3g6OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIHN0eWxlLCBsb2dpY2FsTGVmdCk7CiAg ICAgICAgICAgICBzZXRJbml0aWFsVmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChsaW5lQnJl YWtCb3gpOwogICAgICAgICAgICAgdXBkYXRlQ2FuVXNlU2ltcGxpZmllZEFsaWdubWVudChsaW5l QnJlYWtCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3Zl KGxpbmVCcmVha0JveCkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAg ICAgaWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpIHsKLSAgICAgICAgICAgIGxpbmVC b3guYWRkSW5saW5lTGV2ZWxCb3goSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVM ZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KSk7CisgICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KElubGluZUxldmVsQm94OjpjcmVhdGVHZW5lcmljSW5saW5lTGV2ZWxC b3gobGF5b3V0Qm94LCBzdHlsZSwgbG9naWNhbExlZnQpKTsKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICB9CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwo=