236195 2022-02-05 19:29:02 -0800 [LFC][IFC] Logical rect for text run does not require the parent inline box's FontMetrics:ascent 2022-02-06 17:52:17 -0800 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 1837836 0 zalan 2022-02-05 19:29:02 -0800 ssia 1837837 1 451018 zalan 2022-02-05 19:35:58 -0800 Created attachment 451018 Patch 1837965 2 ews-feeder 2022-02-06 17:51:47 -0800 Committed r289191 (246877@main): <https://commits.webkit.org/246877@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451018. 1837966 3 webkit-bug-importer 2022-02-06 17:52:17 -0800 <rdar://problem/88551227> 451018 2022-02-05 19:35:58 -0800 2022-02-06 17:51:48 -0800 Patch bug-236195-20220205193557.patch text/plain 19717 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc4YTJiODU5MTRkMjky OGJiYmExZmFmYzVhMjg4MDYyMTY5OGNlZC4uODdiN2FhNWRmYzBkNTZmZGExYjE0ZGYzOTI4YWFl N2QzNjBlNjlhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAyLTA1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExvZ2ljYWwg cmVjdCBmb3IgdGV4dCBydW4gZG9lcyBub3QgcmVxdWlyZSB0aGUgcGFyZW50IGlubGluZSBib3gn cyBGb250TWV0cmljczphc2NlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNjE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIExldCdzIGNvbXB1dGUgdGhlIHRleHQgcnVuJ3MgbG9naWNhbCB0b3AgdXNp bmcgdGhlIHBhcmVudCBpbmxpbmUgYm94IGdlb21ldHJ5IG9ubHkuCisgICAgICAgIFRoaXMgcGF0 Y2ggYWxzbyByZW5hbWVzIElubGluZUxldmVsQm94OjpiYXNlbGluZSB0byBhc2NlbnQgdG8gaW5k aWNhdGUgdGhhdCBpdCdzIGFuIGFzY2VudCB2YWx1ZS4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxldmVsQm94Lmg6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUxldmVsQm94Ojphc2NlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVMZXZlbEJveDo6c2V0QXNjZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OmJhc2VsaW5lIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGV2ZWxCb3g6OnNldEJhc2VsaW5lKTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6bG9naWNhbFJlY3RG b3JUZXh0UnVuIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCb3hCdWlsZGVyOjpzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZl bEJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHRBbmRBbGlnbiBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OnNp bXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodCBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6 OmNvbXB1dGVSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmFsaWduSW5saW5lTGV2ZWxC b3hlcyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv ZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkIGNvbnN0KToKKwogMjAyMi0w Mi0wNSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBBZGQgaW5pdGlhbCBpZGVvZ3JhcGhpYyBiYXNlbGluZSBzdXBwb3J0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZl bEJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGV2ZWxCb3guaAppbmRleCAxYTNjMGEwYzU2ZmYxNjNlYzJmZTI5OGQ3ZjdiNzI3NjQ2 ZmZiY2NlLi45NmY4MTc5OTk5OGRiN2QxMWNkZTkwNzE1M2UxNzQxNzAxYWI4ZTIzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMZXZlbEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxldmVsQm94LmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogICAg IHN0YXRpYyBJbmxpbmVMZXZlbEJveCBjcmVhdGVMaW5lQnJlYWtCb3goY29uc3QgQm94JiwgY29u c3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KTsKICAgICBzdGF0 aWMgSW5saW5lTGV2ZWxCb3ggY3JlYXRlR2VuZXJpY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYs IGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CiAKLSAg ICBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lKCkgY29uc3QgeyByZXR1cm4gbV9iYXNlbGluZTsg fQorICAgIElubGluZUxheW91dFVuaXQgYXNjZW50KCkgY29uc3QgeyByZXR1cm4gbV9hc2NlbnQ7 IH0KICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGRlc2NlbnQoKSBjb25zdCB7 IHJldHVybiBtX2Rlc2NlbnQ7IH0KICAgICAvLyBTZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nz cy1pbmxpbmUtMy8jbGF5b3V0LWJvdW5kcwogICAgIHN0cnVjdCBMYXlvdXRCb3VuZHMgewpAQCAt MTE4LDcgKzExOCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRMb2dpY2FsV2lkdGgoSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpIHsgbV9sb2dpY2FsUmVjdC5zZXRXaWR0aChsb2dpY2Fs V2lkdGgpOyB9CiAgICAgdm9pZCBzZXRMb2dpY2FsSGVpZ2h0KElubGluZUxheW91dFVuaXQgbG9n aWNhbEhlaWdodCkgeyBtX2xvZ2ljYWxSZWN0LnNldEhlaWdodChyb3VuZFRvSW50KGxvZ2ljYWxI ZWlnaHQpKTsgfQogICAgIHZvaWQgc2V0TG9naWNhbFRvcChJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxUb3ApIHsgbV9sb2dpY2FsUmVjdC5zZXRUb3Aocm91bmRUb0ludChsb2dpY2FsVG9wKSk7IH0K LSAgICB2b2lkIHNldEJhc2VsaW5lKElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpIHsgbV9iYXNl bGluZSA9IHJvdW5kVG9JbnQoYmFzZWxpbmUpOyB9CisgICAgdm9pZCBzZXRBc2NlbnQoSW5saW5l TGF5b3V0VW5pdCBhc2NlbnQpIHsgbV9hc2NlbnQgPSByb3VuZFRvSW50KGFzY2VudCk7IH0KICAg ICB2b2lkIHNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KSB7IG1fZGVzY2VudCA9 IHJvdW5kVG9JbnQoZGVzY2VudCk7IH0KICAgICB2b2lkIHNldExheW91dEJvdW5kcyhjb25zdCBM YXlvdXRCb3VuZHMmIGxheW91dEJvdW5kcykgeyBtX2xheW91dEJvdW5kcyA9IHsgSW5saW5lTGF5 b3V0VW5pdChyb3VuZFRvSW50KGxheW91dEJvdW5kcy5hc2NlbnQpKSwgSW5saW5lTGF5b3V0VW5p dChyb3VuZFRvSW50KGxheW91dEJvdW5kcy5kZXNjZW50KSkgfTsgfQogCkBAIC0xMzAsNyArMTMw LDcgQEAgcHJpdmF0ZToKICAgICAvLyBUaGlzIGlzIHRoZSBjb21iaW5hdGlvbiBvZiBtYXJnaW4g YW5kIGJvcmRlciBib3hlcy4gSW5saW5lIGxldmVsIGJveGVzIGFyZSB2ZXJ0aWNhbGx5IGFsaWdu ZWQgdXNpbmcgdGhlaXIgbWFyZ2luIGJveGVzLgogICAgIElubGluZVJlY3QgbV9sb2dpY2FsUmVj dDsKICAgICBMYXlvdXRCb3VuZHMgbV9sYXlvdXRCb3VuZHM7Ci0gICAgSW5saW5lTGF5b3V0VW5p dCBtX2Jhc2VsaW5lIHsgMCB9OworICAgIElubGluZUxheW91dFVuaXQgbV9hc2NlbnQgeyAwIH07 CiAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2Rlc2NlbnQ7CiAgICAgYm9v bCBtX2hhc0NvbnRlbnQgeyBmYWxzZSB9OwogICAgIC8vIFRoZXNlIGJpdHMgYXJlIGFib3V0IHdo ZXRoZXIgdGhpcyBpbmxpbmUgbGV2ZWwgYm94IGlzIHRoZSBmaXJzdC9sYXN0IGdlbmVyYXRlZCBi b3ggb2YgdGhlIGFzc29jaWF0ZWQgTGF5b3V0OjpCb3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveC5jcHAKaW5kZXggYTExNDkwZTM5MWVkODQ0MjAyN2Y2ZWI5ODA3MDRiYTdhNjdjZjAzOC4u ZDkxNjYzNzdkOGE5N2RhMTk3N2FkNGE5ZWYwMzRjNmUwYzI5YWNiYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJveC5jcHAKQEAgLTU0LDE1ICs1NCwxNCBAQCBJbmxpbmVSZWN0IExpbmVC b3g6OmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihjb25zdCBMaW5lOjpSdW4mIHJ1bikgY29uc3QKICAg ICBBU1NFUlQocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSk7CiAgICAgYXV0 byogcGFyZW50SW5saW5lQm94ID0gJmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KHJ1bi5sYXlv dXRCb3goKS5wYXJlbnQoKSk7CiAgICAgQVNTRVJUKHBhcmVudElubGluZUJveC0+aXNJbmxpbmVC b3goKSk7Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSBwYXJlbnRJbmxpbmVCb3gtPnByaW1hcnlt ZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOwotICAgIGF1dG8gcnVubG9naWNhbFRvcCA9IHBhcmVudElu bGluZUJveC0+bG9naWNhbFRvcCgpICsgcGFyZW50SW5saW5lQm94LT5iYXNlbGluZSgpIC0gZm9u dE1ldHJpY3MuYXNjZW50KCk7CisgICAgYXV0byBydW5sb2dpY2FsVG9wID0gcGFyZW50SW5saW5l Qm94LT5sb2dpY2FsVG9wKCk7CisgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0g cGFyZW50SW5saW5lQm94LT5wcmltYXJ5bWV0cmljc09mUHJpbWFyeUZvbnQoKS5oZWlnaHQoKTsK IAogICAgIHdoaWxlIChwYXJlbnRJbmxpbmVCb3ggIT0gJm1fcm9vdElubGluZUJveCAmJiAhcGFy ZW50SW5saW5lQm94LT5oYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSkgewogICAgICAgICBw YXJlbnRJbmxpbmVCb3ggPSAmaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gocGFyZW50SW5saW5l Qm94LT5sYXlvdXRCb3goKS5wYXJlbnQoKSk7CiAgICAgICAgIEFTU0VSVChwYXJlbnRJbmxpbmVC b3gtPmlzSW5saW5lQm94KCkpOwogICAgICAgICBydW5sb2dpY2FsVG9wICs9IHBhcmVudElubGlu ZUJveC0+bG9naWNhbFRvcCgpOwogICAgIH0KLSAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxI ZWlnaHQgPSBmb250TWV0cmljcy5oZWlnaHQoKTsKICAgICByZXR1cm4geyBydW5sb2dpY2FsVG9w LCBydW4ubG9naWNhbExlZnQoKSwgcnVuLmxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH07 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRl eCBhNmVkNzRkMzc0YTQzNGE0ZWIzZDRkNDJjYjBiMzkwMjVkYjg2YWJmLi43ODJjNjUxMmIzMDIx ZTQ4OWNlYmZkM2VkZjg4ZDEwZmUxNDRhYzhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJveEJ1aWxkZXIuY3BwCkBAIC0xODIsNyArMTgyLDcgQEAgdm9pZCBMaW5lQm94QnVp bGRlcjo6c2V0QmFzZWxpbmVBbmRMYXlvdXRCb3VuZHMoSW5saW5lTGV2ZWxCb3gmIGlubGluZUJv eCwgY29uc3QKICAgICAgICAgaGFsZkxlYWRpbmcgPSAobGF5b3V0Qm91bmRzTWV0cmljcy5saW5l U3BhY2luZyAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKICAgICB9CiAgICAgLy8gV2UgbmVlZCBmbG9v ci9jZWlsIHRvIG1hdGNoIGxlZ2FjeSBsYXlvdXQgaW50ZWdyYWwgcG9zaXRpb25pbmcuCi0gICAg aW5saW5lQm94LnNldEJhc2VsaW5lKGZsb29yZihsYXlvdXRCb3VuZHNNZXRyaWNzLmFzY2VudCkp OworICAgIGlubGluZUJveC5zZXRBc2NlbnQoZmxvb3JmKGxheW91dEJvdW5kc01ldHJpY3MuYXNj ZW50KSk7CiAgICAgaW5saW5lQm94LnNldERlc2NlbnQoY2VpbGYobGF5b3V0Qm91bmRzTWV0cmlj cy5kZXNjZW50KSk7CiAgICAgaW5saW5lQm94LnNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdo dCk7CiAgICAgaW5saW5lQm94LnNldExheW91dEJvdW5kcyh7IGZsb29yZihsYXlvdXRCb3VuZHNN ZXRyaWNzLmFzY2VudCArIGhhbGZMZWFkaW5nKSwgY2VpbGYobGF5b3V0Qm91bmRzTWV0cmljcy5k ZXNjZW50ICsgaGFsZkxlYWRpbmcpIH0pOwpAQCAtMjQ2LDcgKzI0Niw3IEBAIHZvaWQgTGluZUJv eEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29u c3QgTGluZUJ1aWxkCiAgICAgICAgICAgICAgICAgYXNjZW50ID0gbWFyZ2luQm94SGVpZ2h0Owog ICAgICAgICAgICAgbG9naWNhbExlZnQgKz0gc3RkOjptYXgoMF9sdSwgaW5saW5lTGV2ZWxCb3hH ZW9tZXRyeS5tYXJnaW5TdGFydCgpKTsKICAgICAgICAgICAgIGF1dG8gYXRvbWljSW5saW5lTGV2 ZWxCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3gobGF5b3V0 Qm94LCBzdHlsZSwgbG9naWNhbExlZnQsIHsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJC b3hXaWR0aCgpLCBtYXJnaW5Cb3hIZWlnaHQgfSk7Ci0gICAgICAgICAgICBhdG9taWNJbmxpbmVM ZXZlbEJveC5zZXRCYXNlbGluZShhc2NlbnQpOworICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2 ZWxCb3guc2V0QXNjZW50KGFzY2VudCk7CiAgICAgICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJv eC5zZXRMYXlvdXRCb3VuZHMoSW5saW5lTGV2ZWxCb3g6OkxheW91dEJvdW5kcyB7IGFzY2VudCwg bWFyZ2luQm94SGVpZ2h0IC0gYXNjZW50IH0pOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxp bmVMZXZlbEJveChXVEZNb3ZlKGF0b21pY0lubGluZUxldmVsQm94KSk7CiAgICAgICAgICAgICBj b250aW51ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRp Y2FsQWxpZ25lci5jcHAKaW5kZXggM2YwMWE5M2YwNDgxMGE4MTQ1OGVhNTE1ZTYzZTVmZDk4MGQ4 N2I2ZS4uNWU2ZTZjNDgzMzI4MGJkMzY0MDhkMjU1Y2ZmN2M1MzNkMWY2ODNhMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAK QEAgLTU4LDExICs1OCwxMSBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hWZXJ0aWNhbEFsaWdu ZXI6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0QW5kQWxpZ24oTGluZUJveCYgbAogICAgICAgICAgICAg ICAgICAgICBzaG91bGRVc2VTaW1wbGlmaWVkQWxpZ25tZW50ID0gZmFsc2U7CiAgICAgICAgICAg ICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUxldmVsQm94R2Vv bWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7Ci0g ICAgICAgICAgICAgICAgICAgIHNob3VsZFVzZVNpbXBsaWZpZWRBbGlnbm1lbnQgPSAhaW5saW5l TGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSAmJiAhaW5saW5lTGV2ZWxCb3hHZW9tZXRy eS5tYXJnaW5BZnRlcigpICYmIGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0 KCkgPD0gcm9vdElubGluZUJveC5iYXNlbGluZSgpOworICAgICAgICAgICAgICAgICAgICBzaG91 bGRVc2VTaW1wbGlmaWVkQWxpZ25tZW50ID0gIWlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2lu QmVmb3JlKCkgJiYgIWlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQWZ0ZXIoKSAmJiBpbmxp bmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpIDw9IHJvb3RJbmxpbmVCb3guYXNj ZW50KCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmIChpbmxpbmVM ZXZlbEJveC5pc0xpbmVCcmVha0JveCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gQmFzZWxpbmUg YWxpZ25lZCwgbm9uLXN0cmV0Y2h5IGxpbmUgYnJlYWtzIGUuZy4gPGRpdj48c3Bhbj48YnI+PC9z cGFuPjwvZGl2PiBidXQgbm90IDxkaXY+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTAwcHg7Ij48 YnI+PC9zcGFuPjwvZGl2Pi4KLSAgICAgICAgICAgICAgICBzaG91bGRVc2VTaW1wbGlmaWVkQWxp Z25tZW50ID0gaW5saW5lTGV2ZWxCb3gudmVydGljYWxBbGlnbigpLnR5cGUgPT0gVmVydGljYWxB bGlnbjo6QmFzZWxpbmUgJiYgaW5saW5lTGV2ZWxCb3guYmFzZWxpbmUoKSA8PSByb290SW5saW5l Qm94LmJhc2VsaW5lKCk7CisgICAgICAgICAgICAgICAgc2hvdWxkVXNlU2ltcGxpZmllZEFsaWdu bWVudCA9IGlubGluZUxldmVsQm94LnZlcnRpY2FsQWxpZ24oKS50eXBlID09IFZlcnRpY2FsQWxp Z246OkJhc2VsaW5lICYmIGlubGluZUxldmVsQm94LmFzY2VudCgpIDw9IHJvb3RJbmxpbmVCb3gu YXNjZW50KCk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzSW5saW5l Qm94KCkpIHsKICAgICAgICAgICAgICAgICAvLyBCYXNlbGluZSBhbGlnbmVkLCBub24tc3RyZXRj aHkgaW5saW5lIGJveGVzIGUuZy4gPGRpdj48c3Bhbj48L3NwYW4+PC9kaXY+IGJ1dCBub3QgPGRp dj48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxMDBweDsiPjwvc3Bhbj48L2Rpdj4uCiAgICAgICAg ICAgICAgICAgc2hvdWxkVXNlU2ltcGxpZmllZEFsaWdubWVudCA9IGlubGluZUxldmVsQm94LnZl cnRpY2FsQWxpZ24oKS50eXBlID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lICYmIGlubGluZUxl dmVsQm94LmxheW91dEJvdW5kcygpID09IHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCk7CkBA IC05MSwxMCArOTEsMTAgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94VmVydGljYWxBbGlnbmVy Ojpjb21wdXRlTG9naWNhbEhlaWdodEFuZEFsaWduKExpbmVCb3gmIGwKIElubGluZUxheW91dFVu aXQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6c2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KExp bmVCb3gmIGxpbmVCb3gpIGNvbnN0CiB7CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVC b3gucm9vdElubGluZUJveCgpOwotICAgIGF1dG8gcm9vdElubGluZUJveEJhc2VsaW5lID0gcm9v dElubGluZUJveC5iYXNlbGluZSgpOworICAgIGF1dG8gcm9vdElubGluZUJveEFzY2VudCA9IHJv b3RJbmxpbmVCb3guYXNjZW50KCk7CiAKICAgICBpZiAoIWxpbmVCb3guaGFzQ29udGVudCgpKSB7 Ci0gICAgICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcCgtcm9vdElubGluZUJveEJhc2Vs aW5lKTsKKyAgICAgICAgcm9vdElubGluZUJveC5zZXRMb2dpY2FsVG9wKC1yb290SW5saW5lQm94 QXNjZW50KTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKQEAgLTEwMiwxNiArMTAyLDE2 IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6c2ltcGxpZmllZFZl cnRpY2FsQWxpZ25tZW50KExpbmVCb3gmIGxpCiAKICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsVG9w ID0gSW5saW5lTGF5b3V0VW5pdCB7IDAgfTsKICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsQm90dG9t ID0gcm9vdElubGluZUJveExheW91dEJvdW5kcy5oZWlnaHQoKTsKLSAgICBhdXRvIHJvb3RJbmxp bmVCb3hMb2dpY2FsVG9wID0gcm9vdElubGluZUJveExheW91dEJvdW5kcy5hc2NlbnQgLSByb290 SW5saW5lQm94QmFzZWxpbmU7CisgICAgYXV0byByb290SW5saW5lQm94TG9naWNhbFRvcCA9IHJv b3RJbmxpbmVCb3hMYXlvdXRCb3VuZHMuYXNjZW50IC0gcm9vdElubGluZUJveEFzY2VudDsKICAg ICBmb3IgKGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJveC5ub25Sb290SW5saW5lTGV2ZWxC b3hlcygpKSB7CiAgICAgICAgIC8vIE9ubHkgYmFzZWxpbmUgYWxpZ25tZW50IGZvciBub3cuCi0g ICAgICAgIGlubGluZUxldmVsQm94LnNldExvZ2ljYWxUb3Aocm9vdElubGluZUJveEJhc2VsaW5l IC0gaW5saW5lTGV2ZWxCb3guYmFzZWxpbmUoKSk7CisgICAgICAgIGlubGluZUxldmVsQm94LnNl dExvZ2ljYWxUb3Aocm9vdElubGluZUJveEFzY2VudCAtIGlubGluZUxldmVsQm94LmFzY2VudCgp KTsKICAgICAgICAgYXV0byBsYXlvdXRCb3VuZHMgPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3Vu ZHMoKTsKIAogICAgICAgICBhdXRvIGxheW91dEJvdW5kc0xvZ2ljYWxUb3AgPSByb290SW5saW5l Qm94TGF5b3V0Qm91bmRzLmFzY2VudCAtIGxheW91dEJvdW5kcy5hc2NlbnQ7CiAgICAgICAgIGxp bmVCb3hMb2dpY2FsVG9wID0gc3RkOjptaW4obGluZUJveExvZ2ljYWxUb3AsIGxheW91dEJvdW5k c0xvZ2ljYWxUb3ApOwogICAgICAgICBsaW5lQm94TG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4KGxp bmVCb3hMb2dpY2FsQm90dG9tLCBsYXlvdXRCb3VuZHNMb2dpY2FsVG9wICsgbGF5b3V0Qm91bmRz LmhlaWdodCgpKTsKLSAgICAgICAgcm9vdElubGluZUJveExvZ2ljYWxUb3AgPSBzdGQ6Om1heChy b290SW5saW5lQm94TG9naWNhbFRvcCwgbGF5b3V0Qm91bmRzLmFzY2VudCAtIHJvb3RJbmxpbmVC b3hCYXNlbGluZSk7CisgICAgICAgIHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wID0gc3RkOjptYXgo cm9vdElubGluZUJveExvZ2ljYWxUb3AsIGxheW91dEJvdW5kcy5hc2NlbnQgLSByb290SW5saW5l Qm94QXNjZW50KTsKICAgICB9CiAgICAgcm9vdElubGluZUJveC5zZXRMb2dpY2FsVG9wKHJvb3RJ bmxpbmVCb3hMb2dpY2FsVG9wKTsKICAgICByZXR1cm4gbGluZUJveExvZ2ljYWxCb3R0b20gLSBs aW5lQm94TG9naWNhbFRvcDsKQEAgLTE4MCw3ICsxODAsNyBAQCBJbmxpbmVMYXlvdXRVbml0IExp bmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodChMaW5lQm94 JiBsaQogICAgICAgICB9CiAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6VGV4dFRvcDogewog ICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHRleHQtdG9wIGFsaWducyB3aXRoIHRoZSBpbmxpbmUg Ym94J3MgZm9udCBtZXRyaWNzIHRvcCAoYXNjZW50KSBhbmQgbm90IHRoZSBsYXlvdXQgYm91bmRz IHRvcC4KLSAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3gubGF5b3V0Qm91 bmRzKCkuYXNjZW50IC0gcGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCk7CisgICAgICAgICAgICBs b2dpY2FsVG9wID0gcGFyZW50SW5saW5lQm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIHBhcmVu dElubGluZUJveC5hc2NlbnQoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAg ICAgIGNhc2UgVmVydGljYWxBbGlnbjo6VGV4dEJvdHRvbTogewpAQCAtMjYxLDEyICsyNjEsMTIg QEAgdm9pZCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRp Y2FsUG9zaXRpb24oTGluZUJveCYgbGluZUIKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6TGVuZ3RoOiB7Ci0gICAg ICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gKnZl cnRpY2FsQWxpZ24uYmFzZWxpbmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC5iYXNlbGluZSgpOwot ICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNh bFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSAtIGlubGluZUxldmVsQm94LmJhc2VsaW5lKCk7 CisgICAgICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5l ID0gKnZlcnRpY2FsQWxpZ24uYmFzZWxpbmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC5hc2NlbnQo KTsKKyAgICAgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGxv Z2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgLSBpbmxpbmVMZXZlbEJveC5hc2NlbnQo KTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNh c2UgVmVydGljYWxBbGlnbjo6VGV4dFRvcDoKLSAgICAgICAgICAgICAgICBiYXNlbGluZU9mZnNl dEZyb21QYXJlbnRCYXNlbGluZSA9IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpIC0gaW5saW5l TGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OworICAgICAgICAgICAgICAgIGJhc2VsaW5l T2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gcGFyZW50SW5saW5lQm94LmFzY2VudCgpIC0gaW5s aW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OwogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUZXh0Qm90dG9tOgogICAgICAgICAg ICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gaW5saW5lTGV2ZWxCb3gu bGF5b3V0Qm91bmRzKCkuZGVzY2VudCAtICpwYXJlbnRJbmxpbmVCb3guZGVzY2VudCgpOwpAQCAt MzAwLDcgKzMwMCw3IEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJ bmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVCCiAgICAgICAgIGlubGluZUxl dmVsQm94QWJzb2x1dGVCYXNlbGluZU9mZnNldE1hcC5hZGQoJmlubGluZUxldmVsQm94LCBhYnNv bHV0ZUJhc2VsaW5lT2Zmc2V0KTsKIAogICAgICAgICBhdXRvIGlubGluZUxldmVsQm94U3RyZWNo ZXNMaW5lQm94ID0gZm9ybWF0dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVC b3goaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpOwotICAgICAgICBhdXRvIGFmZmVjdHNSb290SW5s aW5lQm94VmVydGljYWxQb3NpdGlvbiA9IGlubGluZUxldmVsQm94U3RyZWNoZXNMaW5lQm94IHx8 IChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkgJiYgaW5saW5lTGV2ZWxC b3guYmFzZWxpbmUoKSk7CisgICAgICAgIGF1dG8gYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNh bFBvc2l0aW9uID0gaW5saW5lTGV2ZWxCb3hTdHJlY2hlc0xpbmVCb3ggfHwgKGlubGluZUxldmVs Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSAmJiBpbmxpbmVMZXZlbEJveC5hc2NlbnQoKSk7 CiAgICAgICAgIGlmIChhZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24pIHsKICAg ICAgICAgICAgIGF1dG8gdG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IGFic29s dXRlQmFzZWxpbmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7 CiAgICAgICAgICAgICBpZiAobWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxp bmUpCkBAIC0zMTQsNyArMzE0LDcgQEAgdm9pZCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21w dXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYgbGluZUIKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogICAgIH0KLSAgICBhdXRvIHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9w ID0gbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUudmFsdWVfb3IoMC5m KSAtIHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKTsKKyAgICBhdXRvIHJvb3RJbmxpbmVCb3hMb2dp Y2FsVG9wID0gbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUudmFsdWVf b3IoMC5mKSAtIHJvb3RJbmxpbmVCb3guYXNjZW50KCk7CiAgICAgcm9vdElubGluZUJveC5zZXRM b2dpY2FsVG9wKHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wKTsKIH0KIApAQCAtMzI3LDQ3ICszMjcs NDcgQEAgdm9pZCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjphbGlnbklubGluZUxldmVsQm94ZXMo TGluZUJveCYgbGluZUJveCwgSW5saW5lTGF5b3UKICAgICAgICAgYXV0byB2ZXJ0aWNhbEFsaWdu ID0gaW5saW5lTGV2ZWxCb3gudmVydGljYWxBbGlnbigpOwogICAgICAgICBzd2l0Y2ggKHZlcnRp Y2FsQWxpZ24udHlwZSkgewogICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lOgot ICAgICAgICAgICAgbG9naWNhbFRvcCA9IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpIC0gaW5s aW5lTGV2ZWxCb3guYmFzZWxpbmUoKTsKKyAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJ bmxpbmVCb3guYXNjZW50KCkgLSBpbmxpbmVMZXZlbEJveC5hc2NlbnQoKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246Ok1pZGRsZTogewogICAgICAgICAg ICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gKGlubGluZUxldmVs Qm94LmxvZ2ljYWxIZWlnaHQoKSAvIDIgKyBwYXJlbnRJbmxpbmVCb3gucHJpbWFyeW1ldHJpY3NP ZlByaW1hcnlGb250KCkueEhlaWdodCgpIC8gMik7Ci0gICAgICAgICAgICBsb2dpY2FsVG9wID0g cGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJh c2VsaW5lOworICAgICAgICAgICAgbG9naWNhbFRvcCA9IHBhcmVudElubGluZUJveC5hc2NlbnQo KSAtIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmU7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgfQogICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lTWlkZGxl OiB7CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUg PSBpbmxpbmVMZXZlbEJveC5sb2dpY2FsSGVpZ2h0KCkgLyAyOwotICAgICAgICAgICAgbG9naWNh bFRvcCA9IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpIC0gbG9naWNhbFRvcE9mZnNldEZyb21Q YXJlbnRCYXNlbGluZTsKKyAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3gu YXNjZW50KCkgLSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpMZW5ndGg6 IHsKLSAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9 ICp2ZXJ0aWNhbEFsaWduLmJhc2VsaW5lT2Zmc2V0ICsgaW5saW5lTGV2ZWxCb3guYmFzZWxpbmUo KTsKLSAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3guYmFzZWxpbmUoKSAt IGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmU7CisgICAgICAgICAgICBhdXRvIGxv Z2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSAqdmVydGljYWxBbGlnbi5iYXNlbGlu ZU9mZnNldCArIGlubGluZUxldmVsQm94LmFzY2VudCgpOworICAgICAgICAgICAgbG9naWNhbFRv cCA9IHBhcmVudElubGluZUJveC5hc2NlbnQoKSAtIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50 QmFzZWxpbmU7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFZl cnRpY2FsQWxpZ246OlN1YjogewotICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJv bVBhcmVudEJhc2VsaW5lID0gaW5saW5lTGV2ZWxCb3guYmFzZWxpbmUoKSAtIChwYXJlbnRJbmxp bmVCb3guZm9udFNpemUoKSAvIDUgKyAxKTsKLSAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJl bnRJbmxpbmVCb3guYmFzZWxpbmUoKSAtIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxp bmU7CisgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUg PSBpbmxpbmVMZXZlbEJveC5hc2NlbnQoKSAtIChwYXJlbnRJbmxpbmVCb3guZm9udFNpemUoKSAv IDUgKyAxKTsKKyAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3guYXNjZW50 KCkgLSBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpTdXBlcjogewotICAg ICAgICAgICAgYXV0byBsb2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gaW5saW5l TGV2ZWxCb3guYmFzZWxpbmUoKSArIHBhcmVudElubGluZUJveC5mb250U2l6ZSgpIC8gMyArIDE7 Ci0gICAgICAgICAgICBsb2dpY2FsVG9wID0gcGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSBs b2dpY2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lOworICAgICAgICAgICAgYXV0byBsb2dp Y2FsVG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lID0gaW5saW5lTGV2ZWxCb3guYXNjZW50KCkg KyBwYXJlbnRJbmxpbmVCb3guZm9udFNpemUoKSAvIDMgKyAxOworICAgICAgICAgICAgbG9naWNh bFRvcCA9IHBhcmVudElubGluZUJveC5hc2NlbnQoKSAtIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFy ZW50QmFzZWxpbmU7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAvLyBO b3RlIHRoYXQgKHRleHQpdG9wL2JvdHRvbSBhbGlnbiB0aGVpciBsYXlvdXQgYm91bmRzLgogICAg ICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRUb3A6Ci0gICAgICAgICAgICBsb2dpY2FsVG9w ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gaW5saW5lTGV2ZWxCb3gu YmFzZWxpbmUoKTsKKyAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBpbmxpbmVMZXZlbEJveC5sYXlv dXRCb3VuZHMoKS5hc2NlbnQgLSBpbmxpbmVMZXZlbEJveC5hc2NlbnQoKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRleHRCb3R0b206Ci0gICAgICAg ICAgICBsb2dpY2FsVG9wID0gcGFyZW50SW5saW5lQm94LmxvZ2ljYWxIZWlnaHQoKSAtIGlubGlu ZUxldmVsQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQgLSBpbmxpbmVMZXZlbEJveC5iYXNlbGlu ZSgpOworICAgICAgICAgICAgbG9naWNhbFRvcCA9IHBhcmVudElubGluZUJveC5sb2dpY2FsSGVp Z2h0KCkgLSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50IC0gaW5saW5lTGV2 ZWxCb3guYXNjZW50KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBWZXJ0aWNh bEFsaWduOjpUb3A6CiAgICAgICAgICAgICAvLyBOb3RlIHRoYXQgdGhpcyBsb2dpY2FsIHRvcCBp cyBub3QgcmVsYXRpdmUgdG8gdGhlIHBhcmVudCBpbmxpbmUgYm94LgotICAgICAgICAgICAgbG9n aWNhbFRvcCA9IGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIGlubGluZUxl dmVsQm94LmJhc2VsaW5lKCk7CisgICAgICAgICAgICBsb2dpY2FsVG9wID0gaW5saW5lTGV2ZWxC b3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gaW5saW5lTGV2ZWxCb3guYXNjZW50KCk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpCb3R0b206CiAgICAg ICAgICAgICAvLyBOb3RlIHRoYXQgdGhpcyBsb2dpY2FsIHRvcCBpcyBub3QgcmVsYXRpdmUgdG8g dGhlIHBhcmVudCBpbmxpbmUgYm94LgotICAgICAgICAgICAgbG9naWNhbFRvcCA9IGxpbmVCb3hM b2dpY2FsSGVpZ2h0IC0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudCAtIGlu bGluZUxldmVsQm94LmJhc2VsaW5lKCk7CisgICAgICAgICAgICBsb2dpY2FsVG9wID0gbGluZUJv eExvZ2ljYWxIZWlnaHQgLSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50IC0g aW5saW5lTGV2ZWxCb3guYXNjZW50KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVm YXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNw bGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRl ci5jcHAKaW5kZXggMmRiZWUyNTNmZDgzZTQ3NGU2NjM1ZmYyOWM4MTQ0ZjM4ZmQyYjAzMC4uMGMz MDY0MjZiMTg4MGU0NWYwOGJmMzdiZTZiYTQ3YzVmYThkMTE0MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcApA QCAtOTksNyArOTksNyBAQCBJbmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVp bGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZQogICAgIHJldHVybiBJbmxp bmVEaXNwbGF5OjpMaW5lIHsgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNh bFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKGxpbmVCb3hSZWN0LCB3cml0aW5nTW9kZSkKICAg ICAgICAgLCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlz dWFsRm9yV3JpdGluZ01vZGUoZW5jbG9zaW5nTGluZUdlb21ldHJ5LnNjcm9sbGFibGVPdmVyZmxv d1JlY3QsIHdyaXRpbmdNb2RlKQogICAgICAgICAsIGVuY2xvc2luZ0xpbmVHZW9tZXRyeS5lbmNs b3NpbmdUb3BBbmRCb3R0b20KLSAgICAgICAgLCByb290SW5saW5lQm94LmxvZ2ljYWxUb3AoKSAr IHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKQorICAgICAgICAsIHJvb3RJbmxpbmVCb3gubG9naWNh bFRvcCgpICsgcm9vdElubGluZUJveC5hc2NlbnQoKQogICAgICAgICAsIGNvbnRlbnRWaXN1YWxM ZWZ0CiAgICAgICAgICwgcm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgoKQogICAgIH07Cg==