275401 2024-06-12 08:14:57 -0700 Combining mark is not drawn with CSS position:absolute 2024-06-15 17:37:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering Safari 17 Unspecified macOS 14 RESOLVED FIXED InRadar P2 Normal --- 1 leon zalan ap bfulgham fantasai.bugs koivisto simon.fraser vitor.roriz webkit-bug-importer zalan oldest_to_newest 2040980 0 471660 leon 2024-06-12 08:14:57 -0700 Created attachment 471660 demonstration of combining mark not being drawn Safari is not drawing the Combining Long Solidus Overlay character in this font in some situations, such as in the attached demo. It is drawn in other browsers. 2041109 1 ap 2024-06-12 19:27:51 -0700 Disabling IFC feature fixes this. 2041120 2 zalan 2024-06-12 20:42:05 -0700 This is caused by a paint optimization we have in IFC. The character is measured to be 0px wide (glyph has 0 advance width) and since it's the only content of the out-of-flow box, the box itself ends up being 0px wide too (see shrink-to-fit sizing) and we (erroneously) decide to not paint it -even though there's glyph overflow. (among other things, decoration (e.g. border) throws us off of this "fast" codepath) 2041121 3 webkit-bug-importer 2024-06-12 20:42:32 -0700 <rdar://problem/129732893> 2041499 4 471682 zalan 2024-06-14 21:29:15 -0700 Created attachment 471682 Patch 2041517 5 471685 zalan 2024-06-15 06:03:10 -0700 Created attachment 471685 Patch 2041550 6 ews-feeder 2024-06-15 17:37:05 -0700 Committed 280057@main (8789afc340e4): <https://commits.webkit.org/280057@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 471685. 471660 2024-06-12 08:14:57 -0700 2024-06-12 08:14:57 -0700 demonstration of combining mark not being drawn bug-report.zip application/zip 1903 leon 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 UEsFBgAAAAACAAIAtwAAAKIGAAAAAA== 471682 2024-06-14 21:29:15 -0700 2024-06-15 06:03:07 -0700 Patch bug-275401-20240614212914.patch text/plain 5326 zalan RnJvbSBlZTJjNjRjZGE0ZTlkMWQxM2I2YmU3MmMyMmE0YTY5NmY4YWM4YmRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgMTQgSnVuIDIwMjQgMjE6MjA6MTggLTA3MDAKU3ViamVjdDogW1BBVENIXSBDb21iaW5p bmcgbWFyayBpcyBub3QgZHJhd24gd2l0aCBDU1MgcG9zaXRpb246YWJzb2x1dGUKIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzU0MDEgPHJkYXI6Ly9wcm9ibGVtLzEy OTczMjg5Mz4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBjaGFuZ2UgY29tcHV0 ZXMgbGVhZGluZy90cmFpbGluZyBnbHlwaCBvdmVyZmxvdyBpbiBpbmxpbmUgZGlyZWN0aW9uIHRh a2luZwpmaXJzdC9sYXN0IHRleHQgYm94ZXMgaW50byBhY2NvdW50LgpUaGVyZSBjb3VsZCBiZSBz b21lIHJhcmUgY2FzZXMgd2hlcmUgaW4tYmV0d2VlbiBib3hlcyBtYXkgaGF2ZSBsYXJnZXIgb3Zl cmZsb3cgdGhvdWdoLCBzZWUgRklYTUUgaW4gZ2x5cGhPdmVyZmxvd0luSW5saW5lRGlyZWN0aW9u LgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVn cmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OmdseXBoT3ZlcmZsb3dJbklubGluZURpcmVjdGlvbik6CihXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmFkanVzdERpc3BsYXlMaW5lcyBjb25zdCk6 Ci0tLQogLi4uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIHwgNDEg KysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKykKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWls ZGVyLmNwcAppbmRleCAyNmJkZWYyOGQxNjQuLjlhOWM2MTRmNDgwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBA IC01MSw2ICs1MSwzNiBAQCBpbmxpbmUgc3RhdGljIGZsb2F0IGVuZFBhZGRpbmdRdWlya1ZhbHVl KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICByZXR1cm4gZW5kUGFkZGluZzsKIH0K IAorc3RhdGljIHN0ZDo6dHVwbGU8ZmxvYXQsIGZsb2F0PiBnbHlwaE92ZXJmbG93SW5JbmxpbmVE aXJlY3Rpb24oc2l6ZV90IGZpcnN0VGV4dEJveEluZGV4LCBzaXplX3QgbGFzdFRleHRCb3hJbmRl eCwgY29uc3QgSW5saW5lRGlzcGxheTo6Qm94ZXMmIGJveGVzLCBjb25zdCBGbG9hdFJlY3QmIGlu a092ZXJmbG93UmVjdCwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQoreworICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSBiZSBvbiB0aGUgdGV4dCBib3ggbGV2ZWwgYW5kIHRh a2luZyBhbGwgY2hhcmFjdGVycyBpbnRvIGFjY291bnQgKG1heWJlIGNvbnNpZGVyIHV0aWxpemlu ZyB0aGUgbWVhc3VyaW5nIHBhc3MgaWYgdHVybnMgb3V0IHRvIGJlIGEgcGVyZiBoaXQpCisgICAg aWYgKGZpcnN0VGV4dEJveEluZGV4ID49IGJveGVzLnNpemUoKSB8fCBsYXN0VGV4dEJveEluZGV4 ID49IGJveGVzLnNpemUoKSkgeworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAg ICAgcmV0dXJuIHsgfTsKKyAgICB9CisKKyAgICBhdXRvIGJvdW5kcyA9IFsmXShhdXRvJiBmb250 Q2FzY2FkZSwgYXV0byBjaGFyYWN0ZXIpIHsKKyAgICAgICAgYXV0byBnbHlwaERhdGEgPSBmb250 Q2FzY2FkZS5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCAhaXNMZWZ0VG9SaWdodERp cmVjdGlvbik7CisgICAgICAgIHJldHVybiAoZ2x5cGhEYXRhLmZvbnQgPyAqZ2x5cGhEYXRhLmZv bnQgOiBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgpKS5ib3VuZHNGb3JHbHlwaChnbHlwaERhdGEu Z2x5cGgpOworICAgIH07CisKKyAgICBhdXRvJiBmaXJzdFRleHRCb3ggPSBib3hlc1tmaXJzdFRl eHRCb3hJbmRleF07CisgICAgYXV0byBmaXJzdFRleHRDb250ZW50ID0gZmlyc3RUZXh0Qm94LnRl eHQoKS5yZW5kZXJlZENvbnRlbnQoKTsKKyAgICBBU1NFUlQoZmlyc3RUZXh0Q29udGVudC5sZW5n dGgoKSk7CisgICAgYXV0byBsZWFkaW5nT3ZlcmZsb3cgPSAwLmY7CisgICAgaWYgKGF1dG8gbGVh ZGluZ0dseXBoT3ZlcmZsb3cgPSAtYm91bmRzKGZpcnN0VGV4dEJveC5zdHlsZSgpLmZvbnRDYXNj YWRlKCksIGZpcnN0VGV4dENvbnRlbnRbMF0pLngoKTsgbGVhZGluZ0dseXBoT3ZlcmZsb3cgPiAw KQorICAgICAgICBsZWFkaW5nT3ZlcmZsb3cgPSBzdGQ6Om1heCgwLmYsIGlua092ZXJmbG93UmVj dC54KCkgLSAoZmlyc3RUZXh0Qm94LmxlZnQoKSAtIGxlYWRpbmdHbHlwaE92ZXJmbG93KSk7CisK KyAgICBhdXRvJiBsYXN0VGV4dEJveCA9IGJveGVzW2xhc3RUZXh0Qm94SW5kZXhdOworICAgIGF1 dG8gbGFzdFRleHRDb250ZW50ID0gbGFzdFRleHRCb3gudGV4dCgpLnJlbmRlcmVkQ29udGVudCgp OworICAgIEFTU0VSVChsYXN0VGV4dENvbnRlbnQubGVuZ3RoKCkpOworICAgIGF1dG8gdHJhaWxp bmdPdmVyZmxvdyA9IDAuZjsKKyAgICBpZiAoYXV0byB0cmFpbGluZ0dseXBoT3ZlcmZsb3cgPSBi b3VuZHMobGFzdFRleHRCb3guc3R5bGUoKS5mb250Q2FzY2FkZSgpLCBsYXN0VGV4dENvbnRlbnRb bGFzdFRleHRDb250ZW50Lmxlbmd0aCgpIC0gMV0pLm1heFgoKTsgdHJhaWxpbmdHbHlwaE92ZXJm bG93ID4gbGFzdFRleHRCb3gud2lkdGgoKSkKKyAgICAgICAgdHJhaWxpbmdPdmVyZmxvdyA9IHN0 ZDo6bWF4KDkuZiwgKGxhc3RUZXh0Qm94LmxlZnQoKSArIHRyYWlsaW5nR2x5cGhPdmVyZmxvdykg LSBpbmtPdmVyZmxvd1JlY3QubWF4WCgpKTsKKworICAgIHJldHVybiB7IGxlYWRpbmdPdmVyZmxv dywgdHJhaWxpbmdPdmVyZmxvdyB9OworfQorCiBJbmxpbmVDb250ZW50QnVpbGRlcjo6SW5saW5l Q29udGVudEJ1aWxkZXIoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0Zsb3csIEJveFRyZWUm IGJveFRyZWUpCiAgICAgOiBtX2Jsb2NrRmxvdyhibG9ja0Zsb3cpCiAgICAgLCBtX2JveFRyZWUo Ym94VHJlZSkKQEAgLTIyNSw2ICsyNTUsOCBAQCB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjph ZGp1c3REaXNwbGF5TGluZXMoSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCwgc2l6ZQogICAg ICAgICAvLyBWaXN1YWwgb3ZlcmZsb3cgcHJvcGFnYXRpb24gaXMgc2xpZ2h0bHkgZGlmZmVyZW50 IGZyb20gaW5rIG92ZXJmbG93IHdoZW4gaXQgY29tZXMgdG8gcmVuZGVyZXJzIHdpdGggc2VsZiBw YWludGluZyBsYXllcnMuCiAgICAgICAgIC8vIC1hbmQgZm9yIG5vdyB3ZSBjb25zdWx0IGF0b21p YyByZW5kZXJlcnMgZm9yIHN1Y2ggdmlzdWFsIG92ZXJmbG93IHdoaWNoIGlzIG5vdCBob3cgd2Ug YXJlIHN1cHBvc2VkIHRvIGRvIGluIExGQy4KICAgICAgICAgLy8gKHZpc3VhbCBvdmVyZmxvdyBp cyBjb21wdXRlZCBkdXJpbmcgdGhlaXIgOjpsYXlvdXQoKSBjYWxsIHdoaWNoIHdlIGlzc3VlIHJp Z2h0IGJlZm9yZSBydW5uaW5nIGlubGluZSBsYXlvdXQgaW4gUmVuZGVyQmxvY2tGbG93OjpsYXlv dXRNb2Rlcm5MaW5lcykKKyAgICAgICAgYXV0byBmaXJzdFRleHRCb3hJbmRleCA9IHN0ZDo6b3B0 aW9uYWw8c2l6ZV90PiB7IH07CisgICAgICAgIGF1dG8gbGFzdFRleHRCb3hJbmRleCA9IHN0ZDo6 b3B0aW9uYWw8c2l6ZV90PiB7IH07CiAgICAgICAgIGZvciAoOyBib3hJbmRleCA8IGJveGVzLnNp emUoKSAmJiBib3hlc1tib3hJbmRleF0ubGluZUluZGV4KCkgPT0gbGluZUluZGV4OyArK2JveElu ZGV4KSB7CiAgICAgICAgICAgICBhdXRvJiBib3ggPSBib3hlc1tib3hJbmRleF07CiAgICAgICAg ICAgICBpZiAoYm94LmlzUm9vdElubGluZUJveCgpIHx8IGJveC5pc0VsbGlwc2lzKCkgfHwgYm94 LmlzTGluZUJyZWFrKCkpCkBAIC0yMzIsNiArMjY0LDEwIEBAIHZvaWQgSW5saW5lQ29udGVudEJ1 aWxkZXI6OmFkanVzdERpc3BsYXlMaW5lcyhJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50LCBz aXplCiAKICAgICAgICAgICAgIGlmIChib3guaXNUZXh0KCkpIHsKICAgICAgICAgICAgICAgICBp bmtPdmVyZmxvd1JlY3QudW5pdGUoYm94Lmlua092ZXJmbG93KCkpOworICAgICAgICAgICAgICAg IGlmIChib3guaXNWaXNpYmxlKCkgJiYgYm94LnRleHQoKS5yZW5kZXJlZENvbnRlbnQoKS5sZW5n dGgoKSkgeworICAgICAgICAgICAgICAgICAgICBmaXJzdFRleHRCb3hJbmRleCA9IGZpcnN0VGV4 dEJveEluZGV4LnZhbHVlX29yKGJveEluZGV4KTsKKyAgICAgICAgICAgICAgICAgICAgbGFzdFRl eHRCb3hJbmRleCA9IGJveEluZGV4OworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgIH0KIApAQCAtMjU0LDYgKzI5MCwxMSBAQCB2b2lkIElu bGluZUNvbnRlbnRCdWlsZGVyOjphZGp1c3REaXNwbGF5TGluZXMoSW5saW5lQ29udGVudCYgaW5s aW5lQ29udGVudCwgc2l6ZQogICAgICAgICAgICAgfQogICAgICAgICB9CiAKKyAgICAgICAgaWYg KGZpcnN0VGV4dEJveEluZGV4ICYmIGxhc3RUZXh0Qm94SW5kZXgpIHsKKyAgICAgICAgICAgIGF1 dG8gW2xlYWRpbmdPdmVyZmxvdywgdHJhaWxpbmdPdmVyZmxvd10gPSBnbHlwaE92ZXJmbG93SW5J bmxpbmVEaXJlY3Rpb24oKmZpcnN0VGV4dEJveEluZGV4LCAqbGFzdFRleHRCb3hJbmRleCwgYm94 ZXMsIGlua092ZXJmbG93UmVjdCwgbGluZS5pc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uKCkp OworICAgICAgICAgICAgaW5rT3ZlcmZsb3dSZWN0LmluZmxhdGUobGVhZGluZ092ZXJmbG93LCB7 IH0sIHRyYWlsaW5nT3ZlcmZsb3csIHsgfSk7CisgICAgICAgIH0KKwogICAgICAgICBsaW5lLnNl dFNjcm9sbGFibGVPdmVyZmxvdyhzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0KTsKICAgICAgICAgbGlu ZS5zZXRJbmtPdmVyZmxvdyhpbmtPdmVyZmxvd1JlY3QpOwogICAgICAgICBsaW5lLnNldEZpcnN0 Qm94SW5kZXgoZmlyc3RCb3hJbmRleCk7Cg== 471685 2024-06-15 06:03:10 -0700 2024-06-15 17:37:06 -0700 Patch bug-275401-20240615060309.patch text/plain 5652 zalan RnJvbSBkMzYwZmU5MDU5ZGY2ZWU2NTNiYTg5MjllZDFkYTMzYzQzNmI4ZDE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgMTQgSnVuIDIwMjQgMjE6MjA6MTggLTA3MDAKU3ViamVjdDogW1BBVENIXSBDb21iaW5p bmcgbWFyayBpcyBub3QgZHJhd24gd2l0aCBDU1MgcG9zaXRpb246YWJzb2x1dGUKIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzU0MDEgPHJkYXI6Ly9wcm9ibGVtLzEy OTczMjg5Mz4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBjaGFuZ2UgY29tcHV0 ZXMgbGVhZGluZy90cmFpbGluZyBnbHlwaCBvdmVyZmxvdyBpbiBpbmxpbmUgZGlyZWN0aW9uIHRh a2luZwpmaXJzdC9sYXN0IHRleHQgYm94ZXMgaW50byBhY2NvdW50LgpUaGVyZSBjb3VsZCBiZSBz b21lIHJhcmUgY2FzZXMgd2hlcmUgaW4tYmV0d2VlbiBib3hlcyBtYXkgaGF2ZSBsYXJnZXIgb3Zl cmZsb3cgdGhvdWdoLCBzZWUgRklYTUUgaW4gZ2x5cGhPdmVyZmxvd0luSW5saW5lRGlyZWN0aW9u LgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVn cmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OmdseXBoT3ZlcmZsb3dJbklubGluZURpcmVjdGlvbik6CihXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmFkanVzdERpc3BsYXlMaW5lcyBjb25zdCk6 Ci0tLQogLi4uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIHwgNTMg KysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKykKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWls ZGVyLmNwcAppbmRleCAyNmJkZWYyOGQxNjQuLmFjNWEyZTNjOGU1YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBA IC01MSw2ICs1MSw0OCBAQCBpbmxpbmUgc3RhdGljIGZsb2F0IGVuZFBhZGRpbmdRdWlya1ZhbHVl KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICByZXR1cm4gZW5kUGFkZGluZzsKIH0K IAorc3RhdGljIHN0ZDo6dHVwbGU8ZmxvYXQsIGZsb2F0PiBnbHlwaE92ZXJmbG93SW5JbmxpbmVE aXJlY3Rpb24oc2l6ZV90IGZpcnN0VGV4dEJveEluZGV4LCBzaXplX3QgbGFzdFRleHRCb3hJbmRl eCwgY29uc3QgSW5saW5lRGlzcGxheTo6Qm94ZXMmIGJveGVzLCBjb25zdCBGbG9hdFJlY3QmIGlu a092ZXJmbG93UmVjdCwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQoreworICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCBiZSBvbiB0aGUgdGV4dCBib3ggbGV2ZWwgYW5kIHRha2luZyBhbGwg Y2hhcmFjdGVycyBpbnRvIGFjY291bnQgKG1heWJlIGNvbnNpZGVyIHV0aWxpemluZyB0aGUgbWVh c3VyaW5nIHBhc3MgaWYgdHVybnMgb3V0IHRvIGJlIGEgcGVyZiBoaXQpCisgICAgaWYgKGZpcnN0 VGV4dEJveEluZGV4ID49IGJveGVzLnNpemUoKSB8fCBsYXN0VGV4dEJveEluZGV4ID49IGJveGVz LnNpemUoKSkgeworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJu IHsgfTsKKyAgICB9CisKKyAgICBhdXRvIGJvdW5kcyA9IFsmXShhdXRvJiB0ZXh0Qm94LCBib29s IGlzTGVhZGluZykgeworICAgICAgICBhdXRvIHRleHRDb250ZW50ID0gdGV4dEJveC50ZXh0KCku cmVuZGVyZWRDb250ZW50KCk7CisgICAgICAgIGlmICghdGV4dENvbnRlbnQubGVuZ3RoKCkpIHsK KyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJuIEZs b2F0UmVjdCB7IH07CisgICAgICAgIH0KKyAgICAgICAgYXV0byBjaGFyYWN0ZXIgPSBpc0xlYWRp bmcgPyB0ZXh0Q29udGVudFswXSA6IHRleHRDb250ZW50W3RleHRDb250ZW50Lmxlbmd0aCgpIC0g MV07CisgICAgICAgIGF1dG8mIGZvbnRDYXNjYWRlID0gdGV4dEJveC5zdHlsZSgpLmZvbnRDYXNj YWRlKCk7CisgICAgICAgIGF1dG8gZ2x5cGhEYXRhID0gZm9udENhc2NhZGUuZ2x5cGhEYXRhRm9y Q2hhcmFjdGVyKGNoYXJhY3RlciwgIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24pOworICAgICAgICBy ZXR1cm4gKGdseXBoRGF0YS5mb250ID8gKmdseXBoRGF0YS5mb250IDogZm9udENhc2NhZGUucHJp bWFyeUZvbnQoKSkuYm91bmRzRm9yR2x5cGgoZ2x5cGhEYXRhLmdseXBoKTsKKyAgICB9OworCisg ICAgYXV0byBsZWFkaW5nT3ZlcmZsb3cgPSBbJl0geworICAgICAgICBhdXRvJiBmaXJzdFRleHRC b3ggPSBib3hlc1tmaXJzdFRleHRCb3hJbmRleF07CisgICAgICAgIEFTU0VSVChmaXJzdFRleHRC b3guaXNUZXh0KCkpOworICAgICAgICBpZiAoZG93bmNhc3Q8TGF5b3V0OjpJbmxpbmVUZXh0Qm94 PihmaXJzdFRleHRCb3gubGF5b3V0Qm94KCkpLmNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgpKQor ICAgICAgICAgICAgcmV0dXJuIDAuZjsKKyAgICAgICAgaWYgKGF1dG8gYm91bmRzWCA9IGJvdW5k cyhmaXJzdFRleHRCb3gsIHRydWUpLngoKTsgYm91bmRzWCA8IDApCisgICAgICAgICAgICByZXR1 cm4gc3RkOjptYXgoMC5mLCBpbmtPdmVyZmxvd1JlY3QueCgpIC0gKGZpcnN0VGV4dEJveC5sZWZ0 KCkgKyBib3VuZHNYKSk7CisgICAgICAgIHJldHVybiAwLmY7CisgICAgfTsKKworICAgIGF1dG8g dHJhaWxpbmdPdmVyZmxvdyA9IFsmXSB7CisgICAgICAgIGF1dG8mIGxhc3RUZXh0Qm94ID0gYm94 ZXNbbGFzdFRleHRCb3hJbmRleF07CisgICAgICAgIEFTU0VSVChsYXN0VGV4dEJveC5pc1RleHQo KSk7CisgICAgICAgIGlmIChkb3duY2FzdDxMYXlvdXQ6OklubGluZVRleHRCb3g+KGxhc3RUZXh0 Qm94LmxheW91dEJveCgpKS5jYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKSkKKyAgICAgICAgICAg IHJldHVybiAwLmY7CisgICAgICAgIGlmIChhdXRvIGJvdW5kc01heFggPSBib3VuZHMobGFzdFRl eHRCb3gsIGZhbHNlKS5tYXhYKCk7IGJvdW5kc01heFggPiBsYXN0VGV4dEJveC53aWR0aCgpKQor ICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KDAuZiwgKGxhc3RUZXh0Qm94LmxlZnQoKSArIGJv dW5kc01heFgpIC0gaW5rT3ZlcmZsb3dSZWN0Lm1heFgoKSk7CisgICAgICAgIHJldHVybiAwLmY7 CisgICAgfTsKKyAgICByZXR1cm4geyBsZWFkaW5nT3ZlcmZsb3coKSwgdHJhaWxpbmdPdmVyZmxv dygpIH07Cit9CisKIElubGluZUNvbnRlbnRCdWlsZGVyOjpJbmxpbmVDb250ZW50QnVpbGRlcihj b25zdCBSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrRmxvdywgQm94VHJlZSYgYm94VHJlZSkKICAgICA6 IG1fYmxvY2tGbG93KGJsb2NrRmxvdykKICAgICAsIG1fYm94VHJlZShib3hUcmVlKQpAQCAtMjI1 LDYgKzI2Nyw4IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmFkanVzdERpc3BsYXlMaW5l cyhJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50LCBzaXplCiAgICAgICAgIC8vIFZpc3VhbCBv dmVyZmxvdyBwcm9wYWdhdGlvbiBpcyBzbGlnaHRseSBkaWZmZXJlbnQgZnJvbSBpbmsgb3ZlcmZs b3cgd2hlbiBpdCBjb21lcyB0byByZW5kZXJlcnMgd2l0aCBzZWxmIHBhaW50aW5nIGxheWVycy4K ICAgICAgICAgLy8gLWFuZCBmb3Igbm93IHdlIGNvbnN1bHQgYXRvbWljIHJlbmRlcmVycyBmb3Ig c3VjaCB2aXN1YWwgb3ZlcmZsb3cgd2hpY2ggaXMgbm90IGhvdyB3ZSBhcmUgc3VwcG9zZWQgdG8g ZG8gaW4gTEZDLgogICAgICAgICAvLyAodmlzdWFsIG92ZXJmbG93IGlzIGNvbXB1dGVkIGR1cmlu ZyB0aGVpciA6OmxheW91dCgpIGNhbGwgd2hpY2ggd2UgaXNzdWUgcmlnaHQgYmVmb3JlIHJ1bm5p bmcgaW5saW5lIGxheW91dCBpbiBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dE1vZGVybkxpbmVzKQor ICAgICAgICBhdXRvIGZpcnN0VGV4dEJveEluZGV4ID0gc3RkOjpvcHRpb25hbDxzaXplX3Q+IHsg fTsKKyAgICAgICAgYXV0byBsYXN0VGV4dEJveEluZGV4ID0gc3RkOjpvcHRpb25hbDxzaXplX3Q+ IHsgfTsKICAgICAgICAgZm9yICg7IGJveEluZGV4IDwgYm94ZXMuc2l6ZSgpICYmIGJveGVzW2Jv eEluZGV4XS5saW5lSW5kZXgoKSA9PSBsaW5lSW5kZXg7ICsrYm94SW5kZXgpIHsKICAgICAgICAg ICAgIGF1dG8mIGJveCA9IGJveGVzW2JveEluZGV4XTsKICAgICAgICAgICAgIGlmIChib3guaXNS b290SW5saW5lQm94KCkgfHwgYm94LmlzRWxsaXBzaXMoKSB8fCBib3guaXNMaW5lQnJlYWsoKSkK QEAgLTIzMiw2ICsyNzYsMTAgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6YWRqdXN0RGlz cGxheUxpbmVzKElubGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQsIHNpemUKIAogICAgICAgICAg ICAgaWYgKGJveC5pc1RleHQoKSkgewogICAgICAgICAgICAgICAgIGlua092ZXJmbG93UmVjdC51 bml0ZShib3guaW5rT3ZlcmZsb3coKSk7CisgICAgICAgICAgICAgICAgaWYgKGJveC5pc1Zpc2li bGUoKSAmJiBib3gudGV4dCgpLnJlbmRlcmVkQ29udGVudCgpLmxlbmd0aCgpKSB7CisgICAgICAg ICAgICAgICAgICAgIGZpcnN0VGV4dEJveEluZGV4ID0gZmlyc3RUZXh0Qm94SW5kZXgudmFsdWVf b3IoYm94SW5kZXgpOworICAgICAgICAgICAgICAgICAgICBsYXN0VGV4dEJveEluZGV4ID0gYm94 SW5kZXg7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAgICAgfQogCkBAIC0yNTQsNiArMzAyLDExIEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxk ZXI6OmFkanVzdERpc3BsYXlMaW5lcyhJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50LCBzaXpl CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICBpZiAoZmlyc3RUZXh0Qm94SW5k ZXggJiYgbGFzdFRleHRCb3hJbmRleCkgeworICAgICAgICAgICAgYXV0byBbbGVhZGluZ092ZXJm bG93LCB0cmFpbGluZ092ZXJmbG93XSA9IGdseXBoT3ZlcmZsb3dJbklubGluZURpcmVjdGlvbigq Zmlyc3RUZXh0Qm94SW5kZXgsICpsYXN0VGV4dEJveEluZGV4LCBib3hlcywgaW5rT3ZlcmZsb3dS ZWN0LCBsaW5lLmlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24oKSk7CisgICAgICAgICAgICBp bmtPdmVyZmxvd1JlY3QuaW5mbGF0ZShsZWFkaW5nT3ZlcmZsb3csIHsgfSwgdHJhaWxpbmdPdmVy ZmxvdywgeyB9KTsKKyAgICAgICAgfQorCiAgICAgICAgIGxpbmUuc2V0U2Nyb2xsYWJsZU92ZXJm bG93KHNjcm9sbGFibGVPdmVyZmxvd1JlY3QpOwogICAgICAgICBsaW5lLnNldElua092ZXJmbG93 KGlua092ZXJmbG93UmVjdCk7CiAgICAgICAgIGxpbmUuc2V0Rmlyc3RCb3hJbmRleChmaXJzdEJv eEluZGV4KTsK