234729 2021-12-28 10:54:12 -0800 [LFC][IFC] Do not let Layout geometry types leak into InlineDisplay::Line 2021-12-28 13:45:18 -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 1827109 0 zalan 2021-12-28 10:54:12 -0800 ssia 1827110 1 448053 zalan 2021-12-28 10:56:04 -0800 Created attachment 448053 Patch 1827120 2 ews-feeder 2021-12-28 13:44:50 -0800 Committed r287476 (245611@main): <https://commits.webkit.org/245611@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448053. 1827121 3 webkit-bug-importer 2021-12-28 13:45:18 -0800 <rdar://problem/86964808> 448053 2021-12-28 10:56:04 -0800 2021-12-28 13:44:51 -0800 Patch bug-234729-20211228105603.patch text/plain 18040 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjFjNmRiZjdiMmM4MTI3 MTU3MTRkNWYwNTNiYTQ3YmVjYmQ0M2ViMS4uMDQxOTcxYzMwOWU4ZjMwMWUxMmI5OTE0MTU1ZTRm YjA3ZDY1MzdhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIxLTEyLTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERvIG5vdCBs ZXQgTGF5b3V0IGdlb21ldHJ5IHR5cGVzIGxlYWsgaW50byBJbmxpbmVEaXNwbGF5OjpMaW5lCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ3MjkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmxpbmVMYXlv dXRVbml0IC0+IGZsb2F0CisgICAgICAgIElubGluZVJlY3QgLT4gRmxvYXRSZWN0CisgICAgICAg IChUaGlzIGlzIGFsc28gd2hlcmUgd2Ugd2lsbCBldmVudHVhbGx5IGRvIHNvbWUgcGl4ZWwgc25h cHBpbmcpCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Jsb2Nr Rm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tG b3JtYXR0aW5nR2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkQ29udGVudEhlaWdodEFuZE1hcmdp biBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6dXNlZENvbnRlbnRIZWlnaHQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1Bv c2l0aW9uRm9yT3V0T2ZGbG93Q29udGVudCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJv eGVzKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5 L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29u dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmxpbmVEaXNwbGF5OjpMaW5lOjpsZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OklubGluZURpc3BsYXk6OkxpbmU6OnJpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Oklu bGluZURpc3BsYXk6OkxpbmU6OnRvcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVE aXNwbGF5OjpMaW5lOjpib3R0b20gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRGlz cGxheTo6TGluZTo6dG9wTGVmdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNw bGF5OjpMaW5lOjpsaW5lQm94UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVE aXNwbGF5OjpMaW5lOjpzY3JvbGxhYmxlT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6SW5saW5lRGlzcGxheTo6TGluZTo6YmFzZWxpbmUgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29udGVudExlZnQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29udGVudFdpZHRoIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6Om1vdmVWZXJ0aWNhbGx5KToKKyAgICAgICAg KFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OkxpbmUpOgorICAgICAgICAqIGxheW91dC9s YXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6c2hvd0lubGluZVRyZWVBbmRSdW5zKToKKwogMjAyMS0xMi0yOCAgQWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEbyBub3QgbGV0IExheW91dCBn ZW9tZXRyeSB0eXBlcyBsZWFrIGludG8gSW5saW5lRGlzcGxheTo6Qm94CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Jsb2NrRm9ybWF0 dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmluZGV4IGI0MmMzZTEzODNkODM1 MmRmMzMxYzZiMDNkYjRiYjM5MWRjMTg2MGQuLjhhYTAxNGQ0NzJjMTUzODFlOTdhY2Q5ZjIwYmNh ZjUyYzgxOGQ3NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5nR2Vv bWV0cnkuY3BwCkBAIC04Nyw3ICs4Nyw3IEBAIENvbnRlbnRIZWlnaHRBbmRNYXJnaW4gQmxvY2tG b3JtYXR0aW5nR2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkQ29udGVudEhlaWdodEFuCiAgICAg ICAgICAgICBhdXRvJiBsaW5lcyA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5saW5lcygpOwogICAg ICAgICAgICAgLy8gRXZlbiBlbXB0eSBjb250YWluZXJzIGdlbmVyYXRlIG9uZSBsaW5lLiAKICAg ICAgICAgICAgIEFTU0VSVCghbGluZXMuaXNFbXB0eSgpKTsKLSAgICAgICAgICAgIHJldHVybiB7 IHRvTGF5b3V0VW5pdChsaW5lcy5sYXN0KCkubGluZUJveFJlY3QoKS5ib3R0b20oKSArIGlubGlu ZUZvcm1hdHRpbmdTdGF0ZS5jbGVhckdhcEFmdGVyTGFzdExpbmUoKSkgLSBib3JkZXJBbmRQYWRk aW5nVG9wLCBub25Db2xsYXBzZWRNYXJnaW4gfTsKKyAgICAgICAgICAgIHJldHVybiB7IHRvTGF5 b3V0VW5pdChsaW5lcy5sYXN0KCkuYm90dG9tKCkgKyBpbmxpbmVGb3JtYXR0aW5nU3RhdGUuY2xl YXJHYXBBZnRlckxhc3RMaW5lKCkpIC0gYm9yZGVyQW5kUGFkZGluZ1RvcCwgbm9uQ29sbGFwc2Vk TWFyZ2luIH07CiAgICAgICAgIH0KIAogICAgICAgICAvLyAyLiB0aGUgYm90dG9tIGVkZ2Ugb2Yg dGhlIGJvdHRvbSAocG9zc2libHkgY29sbGFwc2VkKSBtYXJnaW4gb2YgaXRzIGxhc3QgaW4tZmxv dyBjaGlsZCwgaWYgdGhlIGNoaWxkJ3MgYm90dG9tIG1hcmdpbi4uLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDk2ZTUzMjIzOTJjMWQ5 Y2IxMGNjN2IwYzZkYTY1NTFmM2MyYzNkODcuLjdhYTEzYjVlMWUwMjgyZTI4NTRhMmE3Y2FhYThk NzlkNjI3NjI5ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTE4Niw4ICsxODYsOCBAQCBMYXlvdXRVbml0IElubGluZUZvcm1hdHRp bmdDb250ZXh0Ojp1c2VkQ29udGVudEhlaWdodCgpIGNvbnN0CiAgICAgYXV0byYgbGluZXMgPSBm b3JtYXR0aW5nU3RhdGUoKS5saW5lcygpOwogICAgIC8vIEV2ZW4gZW1wdHkgY29udGVudCBnZW5l cmF0ZXMgYSBsaW5lLgogICAgIEFTU0VSVCghbGluZXMuaXNFbXB0eSgpKTsKLSAgICBhdXRvIHRv cCA9IExheW91dFVuaXQgeyBsaW5lcy5maXJzdCgpLmxpbmVCb3hSZWN0KCkudG9wKCkgfTsKLSAg ICBhdXRvIGJvdHRvbSA9IExheW91dFVuaXQgeyBsaW5lcy5sYXN0KCkubGluZUJveFJlY3QoKS5i b3R0b20oKSArIGZvcm1hdHRpbmdTdGF0ZSgpLmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSgpIH07Cisg ICAgYXV0byB0b3AgPSBMYXlvdXRVbml0IHsgbGluZXMuZmlyc3QoKS50b3AoKSB9OworICAgIGF1 dG8gYm90dG9tID0gTGF5b3V0VW5pdCB7IGxpbmVzLmxhc3QoKS5ib3R0b20oKSArIGZvcm1hdHRp bmdTdGF0ZSgpLmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSgpIH07CiAKICAgICBhdXRvIGZsb2F0aW5n Q29udGV4dCA9IEZsb2F0aW5nQ29udGV4dCB7ICp0aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS5mbG9h dGluZ1N0YXRlKCkgfTsKICAgICBpZiAoYXV0byBmbG9hdEJvdHRvbSA9IGZsb2F0aW5nQ29udGV4 dC5ib3R0b20oKSkgewpAQCAtMzA2LDcgKzMwNiw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVTdGF0aWNQb3NpdGlvbkZvck91dE9mRmxvd0NvbnRlbnQoY29uc3QgRm9y CiAgICAgICAgICAgICAvLyBUaGlzIGlzIHRoZSBmaXJzdCAobm9uLWZsb2F0KWNoaWxkLiBMZXQn cyBwbGFjZSBpdCB0byB0aGUgbGVmdCBvZiB0aGUgZmlyc3QgYm94LgogICAgICAgICAgICAgLy8g PGRpdj48aW1nIHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGUiPnRleHQgY29udGVudDwvZGl2Pgog ICAgICAgICAgICAgQVNTRVJUKGJveGVzLnNpemUoKSk7Ci0gICAgICAgICAgICBvdXRPZkZsb3dH ZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh7IGJveGVzWzBdLmxlZnQoKSwgbGluZXNbMF0ubGlu ZUJveFJlY3QoKS50b3AoKSB9KTsKKyAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExv Z2ljYWxUb3BMZWZ0KHsgYm94ZXNbMF0ubGVmdCgpLCBsaW5lc1swXS50b3AoKSB9KTsKICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKQEAgLTM0NywyNyArMzQ3LDI3IEBAIHZvaWQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVTdGF0aWNQb3NpdGlvbkZvck91dE9mRmxv d0NvbnRlbnQoY29uc3QgRm9yCiAgICAgICAgICAgICAgICAgICAgICAgICA/IEJveEdlb21ldHJ5 Ojpib3JkZXJCb3hMZWZ0KGlubGluZUJveEJveEdlb21ldHJ5KSArIGlubGluZUJveEJveEdlb21l dHJ5LmNvbnRlbnRCb3hMZWZ0KCkKICAgICAgICAgICAgICAgICAgICAgICAgIDogQm94R2VvbWV0 cnk6OmJvcmRlckJveFJlY3QoaW5saW5lQm94Qm94R2VvbWV0cnkpLnJpZ2h0KCk7CiAgICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExvZ2ljYWxU b3BMZWZ0KHsgbGVmdCwgbGluZXNbcHJldmlvdXNCb3gubGluZUluZGV4KCldLmxpbmVCb3hSZWN0 KCkudG9wKCkgfSk7CisgICAgICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0cnkuc2V0TG9naWNh bFRvcExlZnQoeyBsZWZ0LCBsaW5lc1twcmV2aW91c0JveC5saW5lSW5kZXgoKV0udG9wKCkgfSk7 CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBp ZiAobmV4dEJveCkgewogICAgICAgICAgICAgICAgIC8vIFRoZSBvdXQgb2YgZmxvdyBib3ggaXMg cGxhY2VkIGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIG5leHQgbGluZSAod2hlcmUgdGhlIGZpcnN0 IGJveCBvbiB0aGUgbGluZSBpcykuCiAgICAgICAgICAgICAgICAgLy8gPGRpdj50ZXh0PGJyPjxp bWcgc3R5bGU9InBvc2l0aW9uOiBhYnNvbHV0ZSI+PGltZyBzdHlsZT0icG9zaXRpb246IGFic29s dXRlIj5jb250ZW50PC9kaXY+Ci0gICAgICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQoeyBuZXh0Qm94LT5sZWZ0KCksIGxpbmVzW25leHRCb3gtPmxpbmVJbmRl eCgpXS5saW5lQm94UmVjdCgpLnRvcCgpIH0pOworICAgICAgICAgICAgICAgIG91dE9mRmxvd0dl b21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHsgbmV4dEJveC0+bGVmdCgpLCBsaW5lc1tuZXh0Qm94 LT5saW5lSW5kZXgoKV0udG9wKCkgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBhdXRvJiBsYXN0TGluZUxvZ2ljYWxSZWN0ID0gbGluZXNb cHJldmlvdXNCb3gubGluZUluZGV4KCldLmxpbmVCb3hSZWN0KCk7CisgICAgICAgICAgICBhdXRv JiBsYXN0TGluZSA9IGxpbmVzW3ByZXZpb3VzQm94LmxpbmVJbmRleCgpXTsKICAgICAgICAgICAg IC8vIFRoaXMgb3V0LW9mLWZsb3cgYm94IGlzIHRoZSBsYXN0IGJveC4KICAgICAgICAgICAgIC8v IEZJWE1FOiBVc2UgaXNMaW5lQnJlYWsgaW5zdGVhZCB0byBjb3ZlciBwcmVzZXJ2ZWQgbmV3IGxp bmVzIHRvby4KICAgICAgICAgICAgIGlmIChwcmV2aW91c0JveC5sYXlvdXRCb3goKS5pc0xpbmVC cmVha0JveCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gPGRpdj50ZXh0PGJyPjxpbWcgc3R5bGU9 InBvc2l0aW9uOiBhYnNvbHV0ZSI+PGltZyBzdHlsZT0icG9zaXRpb246IGFic29sdXRlIj48L2Rp dj4KLSAgICAgICAgICAgICAgICBvdXRPZkZsb3dHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh7 IGxhc3RMaW5lTG9naWNhbFJlY3QubGVmdCgpLCBsYXN0TGluZUxvZ2ljYWxSZWN0LmJvdHRvbSgp IH0pOworICAgICAgICAgICAgICAgIG91dE9mRmxvd0dlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0 KHsgbGFzdExpbmUubGVmdCgpLCBsYXN0TGluZS5ib3R0b20oKSB9KTsKICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBGSVhNRTogV2UgbWF5IG5l ZWQgdG8gY2hlY2sgaWYgdGhpcyBib3ggYWN0dWFsbHkgZml0cyB0aGUgbGFzdCBsaW5lIGFuZCBt b3ZlIGl0IG92ZXIgdG8gdGhlICJuZXh0IiBsaW5lLgotICAgICAgICAgICAgb3V0T2ZGbG93R2Vv bWV0cnkuc2V0TG9naWNhbFRvcExlZnQoeyBwcmV2aW91c0JveC5yaWdodCgpLCBsYXN0TGluZUxv Z2ljYWxSZWN0LnRvcCgpIH0pOworICAgICAgICAgICAgb3V0T2ZGbG93R2VvbWV0cnkuc2V0TG9n aWNhbFRvcExlZnQoeyBwcmV2aW91c0JveC5yaWdodCgpLCBsYXN0TGluZS50b3AoKSB9KTsKICAg ICAgICAgfTsKICAgICAgICAgcGxhY2VPdXRPZkZsb3dCb3hBZnRlclByZXZpb3VzSW5GbG93Qm94 KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3Bw CmluZGV4IDRiMDhjNzBkM2JhZjU5ZGY3ODRmYjVkYzJlYjM2NWY5ZGJmMzEwNGIuLjI5ZmE2NGFk YjdhZDc4MmQ0ODhlODBiZmFhN2Y1YzY4YzJmZjQ4ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKQEAgLTI2Miw3ICsyNjIsNyBAQCBJbmxpbmVMYXlv dXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMo TGluZUJveCYgbGluZQogICAgICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgICAg ICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBsYXlvdXRTdGF0ZSgpLmZvcm1hdHRpbmdTdGF0ZUZv cklubGluZUZvcm1hdHRpbmdDb250ZXh0KGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94 KSk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8mIGxhc3RMaW5lID0gZm9ybWF0dGluZ1N0YXRl LmxpbmVzKCkubGFzdCgpOwotICAgICAgICAgICAgICAgICAgICBhdXRvIGlubGluZUJsb2NrQmFz ZWxpbmUgPSBsYXN0TGluZS5saW5lQm94UmVjdCgpLnRvcCgpICsgbGFzdExpbmUuYmFzZWxpbmUo KTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCbG9ja0Jhc2VsaW5lID0gbGFzdExp bmUudG9wKCkgKyBsYXN0TGluZS5iYXNlbGluZSgpOwogICAgICAgICAgICAgICAgICAgICBhc2Nl bnQgPSBpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpICsgaW5saW5lTGV2ZWxC b3hHZW9tZXRyeS5ib3JkZXJCZWZvcmUoKSArIGlubGluZUxldmVsQm94R2VvbWV0cnkucGFkZGlu Z0JlZm9yZSgpLnZhbHVlX29yKDApICsgaW5saW5lQmxvY2tCYXNlbGluZTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkQm94KCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggYTE3Yzk2MzIyODEzMjY4NTVhOTFiMzY4ZDEyNDZm NDBlMjhhYzFlMS4uZjg5ODMyNTY5NGI3NDZjMzVkMmVmYTc1OGZmZmFkZDU0NTliYTZiNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv ZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtOTMsMTAgKzkzLDkgQEAgRGlzcGxheUJveGVzIElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250 ZW50JgogICAgIGJveGVzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobGluZUNvbnRlbnQucnVucy5z aXplKCkgKyBsaW5lQm94Lm5vblJvb3RJbmxpbmVMZXZlbEJveGVzKCkuc2l6ZSgpICsgMSk7CiAK ICAgICBtX2xpbmVJbmRleCA9IGxpbmVJbmRleDsKLSAgICBhdXRvIGxpbmVCb3hSZWN0ID0gZGlz cGxheUxpbmUubGluZUJveFJlY3QoKTsKICAgICAvLyBFdmVyeSBsaW5lIHN0YXJ0cyB3aXRoIGEg cm9vdCBib3gsIGV2ZW4gdGhlIGVtcHR5IG9uZXMuCiAgICAgYXV0byByb290SW5saW5lQm94UmVj dCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JSb290SW5saW5lQm94KCk7Ci0gICAgcm9vdElubGlu ZUJveFJlY3QubW92ZUJ5KGxpbmVCb3hSZWN0LnRvcExlZnQoKSk7CisgICAgcm9vdElubGluZUJv eFJlY3QubW92ZUJ5KGRpc3BsYXlMaW5lLnRvcExlZnQoKSk7CiAgICAgYm94ZXMuYXBwZW5kKHsg bV9saW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Um9vdElubGluZUJveCwgcm9v dCgpLCBVQklESV9ERUZBVUxUX0xUUiwgcm9vdElubGluZUJveFJlY3QsIHJvb3RJbmxpbmVCb3hS ZWN0LCB7IH0sIHsgfSwgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpIH0pOwog CiAgICAgYXV0byBjb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZyA9ICFsaW5lQ29udGVudC52aXN1 YWxPcmRlckxpc3QuaXNFbXB0eSgpOwpAQCAtMTA0LDcgKzEwMyw3IEBAIERpc3BsYXlCb3hlcyBJ bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5l Q29udGVudCYKICAgICAgICAgcHJvY2Vzc0JpZGlDb250ZW50KGxpbmVDb250ZW50LCBsaW5lQm94 LCBkaXNwbGF5TGluZSwgYm94ZXMpOwogICAgIGVsc2UKICAgICAgICAgcHJvY2Vzc05vbkJpZGlD b250ZW50KGxpbmVDb250ZW50LCBsaW5lQm94LCBkaXNwbGF5TGluZSwgYm94ZXMpOwotICAgIHBy b2Nlc3NPdmVyZmxvd25SdW5zRm9yRWxsaXBzaXMoYm94ZXMsIGxpbmVCb3hSZWN0LnJpZ2h0KCkp OworICAgIHByb2Nlc3NPdmVyZmxvd25SdW5zRm9yRWxsaXBzaXMoYm94ZXMsIGRpc3BsYXlMaW5l LnJpZ2h0KCkpOwogICAgIGNvbGxlY3RJbmtPdmVyZmxvd0ZvcklubGluZUJveGVzKGJveGVzKTsK ICAgICByZXR1cm4gYm94ZXM7CiB9CkBAIC0zMjUsMTQgKzMyNCwxMyBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWls ZGVyOjpMaW5lQwogICAgICAgICBoYXNDb250ZW50ID0gaGFzQ29udGVudCB8fCBsaW5lUnVuLmlz VGV4dCgpIHx8IGxpbmVSdW4uaXNCb3goKTsKICAgICBBU1NFUlQocm9vdCgpLnN0eWxlKCkuaXNM ZWZ0VG9SaWdodERpcmVjdGlvbigpIHx8ICFoYXNDb250ZW50KTsKICNlbmRpZgotICAgIGF1dG8g bGluZUJveFJlY3QgPSBkaXNwbGF5TGluZS5saW5lQm94UmVjdCgpOwotICAgIGF1dG8gY29udGVu dFN0YXJ0SW5WaXN1YWxPcmRlciA9IGxpbmVCb3hSZWN0LmxlZnQoKSArIGRpc3BsYXlMaW5lLmNv bnRlbnRMZWZ0KCk7CisgICAgYXV0byBjb250ZW50U3RhcnRJblZpc3VhbE9yZGVyID0gZGlzcGxh eUxpbmUubGVmdCgpICsgZGlzcGxheUxpbmUuY29udGVudExlZnQoKTsKIAogICAgIGZvciAoYXV0 byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94 ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKIAogICAgICAgICBhdXRvIHZpc3VhbFJlY3RSZWxhdGl2 ZVRvUm9vdCA9IFsmXShhdXRvIGxvZ2ljYWxSZWN0KSB7Ci0gICAgICAgICAgICBsb2dpY2FsUmVj dC5tb3ZlQnkoeyBjb250ZW50U3RhcnRJblZpc3VhbE9yZGVyLCBsaW5lQm94UmVjdC50b3AoKSB9 KTsKKyAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVCeSh7IGNvbnRlbnRTdGFydEluVmlzdWFs T3JkZXIsIGRpc3BsYXlMaW5lLnRvcCgpIH0pOwogICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxS ZWN0OwogICAgICAgICB9OwogCkBAIC01NDIsOCArNTQwLDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGlu ZUNvbnQKICAgICBhdXRvIGRpc3BsYXlCb3hUcmVlID0gRGlzcGxheUJveFRyZWUgeyB9OwogICAg IGFuY2VzdG9yU3RhY2sucHVzaCh7IH0sIHJvb3QoKSk7CiAKLSAgICBhdXRvIGxpbmVCb3hSZWN0 ID0gZGlzcGxheUxpbmUubGluZUJveFJlY3QoKTsKLSAgICBhdXRvIGNvbnRlbnRTdGFydEluVmlz dWFsT3JkZXIgPSBsaW5lQm94UmVjdC5sZWZ0KCkgKyBkaXNwbGF5TGluZS5jb250ZW50TGVmdCgp OworICAgIGF1dG8gY29udGVudFN0YXJ0SW5WaXN1YWxPcmRlciA9IGRpc3BsYXlMaW5lLmxlZnQo KSArIGRpc3BsYXlMaW5lLmNvbnRlbnRMZWZ0KCk7CiAgICAgYXV0byBjcmVhdGVEaXNwbGF5Qm94 ZXNJblZpc3VhbE9yZGVyID0gWyZdIHsKIAogICAgICAgICBhdXRvIGNvbnRlbnRSaWdodEluVmlz dWFsT3JkZXIgPSBjb250ZW50U3RhcnRJblZpc3VhbE9yZGVyOwpAQCAtNTYwLDcgKzU1Nyw3IEBA IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAKICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdFJl bGF0aXZlVG9Sb290ID0gWyZdKGF1dG8gbG9naWNhbFJlY3QpIHsKICAgICAgICAgICAgICAgICBs b2dpY2FsUmVjdC5zZXRMZWZ0KGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOwotICAgICAgICAg ICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGxpbmVCb3hSZWN0LnRvcCgpKTsKKyAg ICAgICAgICAgICAgICBsb2dpY2FsUmVjdC5tb3ZlVmVydGljYWxseShkaXNwbGF5TGluZS50b3Ao KSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxSZWN0OwogICAgICAgICAgICAgfTsK IApAQCAtNjQ2LDcgKzY0Myw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpw cm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAg ICBhdXRvIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgPSBjb250ZW50U3RhcnRJblZpc3VhbE9y ZGVyOwogCiAgICAgICAgICAgICBmb3IgKGF1dG8gY2hpbGREaXNwbGF5Qm94Tm9kZUluZGV4IDog ZGlzcGxheUJveFRyZWUucm9vdCgpLmNoaWxkcmVuKQotICAgICAgICAgICAgICAgIGFkanVzdFZp c3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChjaGlsZERpc3BsYXlCb3hOb2RlSW5kZXgsIGNvbnRl bnRSaWdodEluVmlzdWFsT3JkZXIsIGxpbmVCb3hSZWN0LnRvcCgpLCBkaXNwbGF5Qm94VHJlZSwg Ym94ZXMsIGxpbmVCb3gsIGlzRmlyc3RMYXN0SW5kZXhlc01hcCk7CisgICAgICAgICAgICAgICAg YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KGNoaWxkRGlzcGxheUJveE5vZGVJbmRl eCwgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgZGlzcGxheUxpbmUudG9wKCksIGRpc3BsYXlC b3hUcmVlLCBib3hlcywgbGluZUJveCwgaXNGaXJzdExhc3RJbmRleGVzTWFwKTsKICAgICAgICAg fTsKICAgICAgICAgYWRqdXN0VmlzdWFsR2VvbWV0cnlXaXRoSW5saW5lQm94ZXMoKTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmgKaW5k ZXggNjU1NzBiOWE4ZjU3ZjI3ZmFjYzNiMzk4YWZiOTlmMzQ1MGI3ODZiYi4uYTM2NTE4ODMxODhh MWU3ZjI0OWMzY2NmYjVhMGQ5ZjVlODFlYTBiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGlu ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaApAQCAtMzcsMzcgKzM3LDQ0IEBAIGNsYXNzIExp bmUgewogcHVibGljOgogICAgIHN0cnVjdCBFbmNsb3NpbmdUb3BBbmRCb3R0b20gewogICAgICAg ICAvLyBUaGlzIHZhbHVlcyBlbmNsb3NlcyB0aGUgcm9vdCBpbmxpbmUgYm94IGFuZCBhbnkgb3Ro ZXIgaW5saW5lIGxldmVsIGJveCdzIGJvcmRlciBib3guCi0gICAgICAgIExheW91dDo6SW5saW5l TGF5b3V0VW5pdCB0b3AgeyAwIH07Ci0gICAgICAgIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBi b3R0b20geyAwIH07CisgICAgICAgIGZsb2F0IHRvcCB7IDAgfTsKKyAgICAgICAgZmxvYXQgYm90 dG9tIHsgMCB9OwogICAgIH07Ci0gICAgTGluZShjb25zdCBMYXlvdXQ6OklubGluZVJlY3QmIGxp bmVCb3hSZWN0LCBjb25zdCBMYXlvdXQ6OklubGluZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywg RW5jbG9zaW5nVG9wQW5kQm90dG9tLCBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgYWxpZ21lbnRC YXNlbGluZSwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMZWZ0LCBMYXlvdXQ6Oklu bGluZUxheW91dFVuaXQgY29udGVudFdpZHRoKTsKKyAgICBMaW5lKGNvbnN0IEZsb2F0UmVjdCYg bGluZUJveFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3Np bmdUb3BBbmRCb3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0 LCBmbG9hdCBjb250ZW50V2lkdGgpOwogCi0gICAgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBs aW5lQm94UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3Q7IH0KLSAgICBjb25zdCBM YXlvdXQ6OklubGluZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1f c2Nyb2xsYWJsZU92ZXJmbG93OyB9CisgICAgZmxvYXQgbGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1f bGluZUJveFJlY3QueCgpOyB9CisgICAgZmxvYXQgcmlnaHQoKSBjb25zdCB7IHJldHVybiBtX2xp bmVCb3hSZWN0Lm1heFgoKTsgfQorICAgIGZsb2F0IHRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlu ZUJveFJlY3QueSgpOyB9CisgICAgZmxvYXQgYm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9saW5l Qm94UmVjdC5tYXhZKCk7IH0KKworICAgIEZsb2F0UG9pbnQgdG9wTGVmdCgpIGNvbnN0IHsgcmV0 dXJuIG1fbGluZUJveFJlY3QubG9jYXRpb24oKTsgfQorCisgICAgY29uc3QgRmxvYXRSZWN0JiBs aW5lQm94UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3Q7IH0KKyAgICBjb25zdCBG bG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJs ZU92ZXJmbG93OyB9CiAKICAgICBFbmNsb3NpbmdUb3BBbmRCb3R0b20gZW5jbG9zaW5nVG9wQW5k Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b207IH0KIAotICAg IExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWxp Z21lbnRCYXNlbGluZTsgfQorICAgIGZsb2F0IGJhc2VsaW5lKCkgY29uc3QgeyByZXR1cm4gbV9h bGlnbWVudEJhc2VsaW5lOyB9CiAKLSAgICBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgY29udGVu dExlZnQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0OyB9Ci0gICAgTGF5b3V0OjpJbmxp bmVMYXlvdXRVbml0IGNvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFdpZHRo OyB9CisgICAgZmxvYXQgY29udGVudExlZnQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0 OyB9CisgICAgZmxvYXQgY29udGVudFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50V2lk dGg7IH0KIAotICAgIHZvaWQgbW92ZVZlcnRpY2FsbHkoTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0 IG9mZnNldCkgeyBtX2xpbmVCb3hSZWN0Lm1vdmVWZXJ0aWNhbGx5KG9mZnNldCk7IH0KKyAgICB2 b2lkIG1vdmVWZXJ0aWNhbGx5KGZsb2F0IG9mZnNldCkgeyBtX2xpbmVCb3hSZWN0Lm1vdmUoeyB7 IH0sIG9mZnNldCB9KTsgfQogCiBwcml2YXRlOgogICAgIC8vIFRoaXMgaXMgbGluZSBib3ggZ2Vv bWV0cnkgKHNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlubGluZS0zLyNsaW5lLWJveCku Ci0gICAgTGF5b3V0OjpJbmxpbmVSZWN0IG1fbGluZUJveFJlY3Q7Ci0gICAgTGF5b3V0OjpJbmxp bmVSZWN0IG1fc2Nyb2xsYWJsZU92ZXJmbG93OworICAgIEZsb2F0UmVjdCBtX2xpbmVCb3hSZWN0 OworICAgIEZsb2F0UmVjdCBtX3Njcm9sbGFibGVPdmVyZmxvdzsKICAgICAvLyBFbmNsb3Npbmcg dG9wIGFuZCBib3R0b20gaW5jbHVkZXMgYWxsIGlubGluZSBsZXZlbCBib3hlcyAoYm9yZGVyIGJv eCkgdmVydGljYWxseS4KICAgICAvLyBXaGlsZSB0aGUgbGluZSBib3ggdXN1YWxseSBlbmNsb3Nl IHRoZW0gYXMgd2VsbCwgaXRzIHZlcnRpY2FsIGdlb21ldHJ5IGlzIGJhc2VkIG9uCiAgICAgLy8g dGhlIGxheW91dCBib3VuZHMgb2YgdGhlIGlubGluZSBsZXZlbCBib3hlcyB3aGljaCBtYXkgYmUg ZGlmZmVyZW50IHdoZW4gbGluZS1oZWlnaHQgaXMgcHJlc2VudC4KICAgICBFbmNsb3NpbmdUb3BB bmRCb3R0b20gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b207Ci0gICAgTGF5b3V0OjpJbmxpbmVMYXlv dXRVbml0IG1fYWxpZ21lbnRCYXNlbGluZSB7IDAgfTsKLSAgICBMYXlvdXQ6OklubGluZUxheW91 dFVuaXQgbV9jb250ZW50TGVmdCB7IDAgfTsKLSAgICBMYXlvdXQ6OklubGluZUxheW91dFVuaXQg bV9jb250ZW50V2lkdGggeyAwIH07CisgICAgZmxvYXQgbV9hbGlnbWVudEJhc2VsaW5lIHsgMCB9 OworICAgIGZsb2F0IG1fY29udGVudExlZnQgeyAwIH07CisgICAgZmxvYXQgbV9jb250ZW50V2lk dGggeyAwIH07CiB9OwogCi1pbmxpbmUgTGluZTo6TGluZShjb25zdCBMYXlvdXQ6OklubGluZVJl Y3QmIGxpbmVCb3hSZWN0LCBjb25zdCBMYXlvdXQ6OklubGluZVJlY3QmIHNjcm9sbGFibGVPdmVy ZmxvdywgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgTGF5b3V0 OjpJbmxpbmVMYXlvdXRVbml0IGFsaWdtZW50QmFzZWxpbmUsIExheW91dDo6SW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TGVmdCwgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRXaWR0aCkK K2lubGluZSBMaW5lOjpMaW5lKGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveFJlY3QsIGNvbnN0IEZs b2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BBbmRCb3R0b20gZW5jbG9z aW5nVG9wQW5kQm90dG9tLCBmbG9hdCBhbGlnbWVudEJhc2VsaW5lLCBmbG9hdCBjb250ZW50TGVm dCwgZmxvYXQgY29udGVudFdpZHRoKQogICAgIDogbV9saW5lQm94UmVjdChsaW5lQm94UmVjdCkK ICAgICAsIG1fc2Nyb2xsYWJsZU92ZXJmbG93KHNjcm9sbGFibGVPdmVyZmxvdykKICAgICAsIG1f ZW5jbG9zaW5nVG9wQW5kQm90dG9tKGVuY2xvc2luZ1RvcEFuZEJvdHRvbSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcApp bmRleCA3YzUzMDFmYzUzMGVhZWYxODNhOGU2ZWI5NTEyMDViMTk5MjQ3MzAxLi4zMzI3MDI0ZmFj MDI1ZjQ1NzU0ODJkOTY4ODBhMDYzMGUwY2RmYWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCkBAIC0zNzYsNyAr Mzc2LDcgQEAgdm9pZCBzaG93SW5saW5lVHJlZUFuZFJ1bnMoVGV4dFN0cmVhbSYgc3RyZWFtLCBj b25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGMKICAgICAgICAgYXV0byYgbGluZSA9IGxp bmVzW2xpbmVJbmRleF07CiAgICAgICAgIGF1dG8mIGxpbmVCb3hSZWN0ID0gbGluZS5saW5lQm94 UmVjdCgpOwogICAgICAgICBhdXRvIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSA9IGxpbmUuZW5jbG9z aW5nVG9wQW5kQm90dG9tKCk7Ci0gICAgICAgIHN0cmVhbSA8PCAibGluZSBhdCAoIiA8PCBsaW5l Qm94UmVjdC5sZWZ0KCkgPDwgIiwiIDw8IGxpbmVCb3hSZWN0LnRvcCgpIDw8ICIpIHNpemUgKCIg PDwgbGluZUJveFJlY3Qud2lkdGgoKSA8PCAieCIgPDwgbGluZUJveFJlY3QuaGVpZ2h0KCkgPDwg IikgYmFzZWxpbmUgKCIgPDwgbGluZS5iYXNlbGluZSgpIDw8ICIpIGVuY2xvc2luZyB0b3AgKCIg PDwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLnRvcCA8PCAiKSBib3R0b20gKCIgPDwgZW5jbG9zaW5n VG9wQW5kQm90dG9tLmJvdHRvbSA8PCAiKSI7CisgICAgICAgIHN0cmVhbSA8PCAibGluZSBhdCAo IiA8PCBsaW5lQm94UmVjdC54KCkgPDwgIiwiIDw8IGxpbmVCb3hSZWN0LnkoKSA8PCAiKSBzaXpl ICgiIDw8IGxpbmVCb3hSZWN0LndpZHRoKCkgPDwgIngiIDw8IGxpbmVCb3hSZWN0LmhlaWdodCgp IDw8ICIpIGJhc2VsaW5lICgiIDw8IGxpbmUuYmFzZWxpbmUoKSA8PCAiKSBlbmNsb3NpbmcgdG9w ICgiIDw8IGVuY2xvc2luZ1RvcEFuZEJvdHRvbS50b3AgPDwgIikgYm90dG9tICgiIDw8IGVuY2xv c2luZ1RvcEFuZEJvdHRvbS5ib3R0b20gPDwgIikiOwogICAgICAgICBzdHJlYW0ubmV4dExpbmUo KTsKIAogICAgICAgICBhZGRTcGFjaW5nKCk7Cg==