230026 2021-09-07 16:48:13 -0700 [LFC][IFC] Add support for inline box ink overflow 2021-09-08 06:34:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 226812 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1791270 0 zalan 2021-09-07 16:48:13 -0700 a very simple <span><img></span> where the image may visually overflow the <span> inline box. 1791320 1 437578 zalan 2021-09-07 19:08:13 -0700 Created attachment 437578 Patch 1791343 2 437587 zalan 2021-09-07 20:25:21 -0700 Created attachment 437587 Patch 1791444 3 ews-feeder 2021-09-08 06:33:37 -0700 Committed r282141 (241438@main): <https://commits.webkit.org/241438@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437587. 1791445 4 webkit-bug-importer 2021-09-08 06:34:20 -0700 <rdar://problem/82870029> 437578 2021-09-07 19:08:13 -0700 2021-09-07 20:25:20 -0700 Patch bug-230026-20210907190812.patch text/plain 10857 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA2MjljZjQ2NmM0NzY0 YjE1ZjM4M2UzMDg2ZjJiZjRjMDAwNGZhYi4uODIwN2JhYjlmZDUxYWYxZGRjZTQxZmVhMmMwODc5 ZWNiMmRkNmY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA5LTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpbmxpbmUgYm94IGluayBvdmVyZmxvdworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMDI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ29sbGVjdGluZyB0aGUgaW5rIG92ZXJmbG93IGZyb20g dGhlIGRlc2NlbmRhbnQgYm94ZXMgaGFzIDIgcGhhc2VzLgorICAgICAgICAxLiBVcGRhdGUgdGhl IGluayBvdmVyZmxvdyBvbiB0aGUgcGFyZW50IGlubGluZSBib3ggKHVubGVzcyBpdCdzIGEgcm9v dCBpbmxpbmUgYm94KSBhcyB3ZSB3YWxrIHRoZSBsaW5lIGNvbnRlbnQKKyAgICAgICAgYW5kIGZp bmQgdGhlIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgKGUuZy4gPHNwYW4+PGltZz48L3NwYW4+ KQorICAgICAgICAyLiBDb2xsZWN0IHRoZSBpbmsgb3ZlcmZsb3cgb24gbmVzdGVkIGlubGluZSBi b3hlcyAoZS5nLiA8c3Bhbj5zb21lPHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTAwcHgiPnRleHQ8 L3NwYW4+PHNwYW4+KS4gCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OklubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lU3Bhbm5pbmdJbmxpbmVCb3hlcyk6 CisgICAgICAgIEV2ZW4gImVtcHR5IiBsaW5lcyBjYW4gaGF2ZSBuZXN0ZWQgaW5saW5lIGJveGVz IHRoYXQgbmVlZCBpbmsgb3ZlcmZsb3cgdXBkYXRlIChlLmcuIDxkaXY+PHNwYW4+PGJyPjxzcGFu Pjwvc3Bhbj48L3NwYW4+KQorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNvbGxlY3RJbmtPdmVyZmxvd0ZvcklubGluZUJveFJ1bnMpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVSdW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6UnVuOjphZGp1c3RJ bmtPdmVyZmxvdyk6CisKIDIwMjEtMDktMDcgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW0lGQ10gQ29uc3RydWN0IGxpbmUgc3Bhbm5pbmcgaW5saW5lIGJv eGVzIGZpcnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcAppbmRleCBjMWY5NzA0ODU2NmFlZTZiNzZhYWU1MGY5ZmIzM2Q3YTg4NDI2 ZDQ3Li5hOGZlNmEwN2ZjYmUyMDVlZDU1NjE4Y2M1YTMwOGUwMjFjNWY3ZDA4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAg LTQwLDcgKzQwLDYgQEAgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIoY29uc3QgQ29udGFpbmVyQm94JiBmb3IKICAgICA6IG1fZm9ybWF0dGlu Z0NvbnRleHRSb290KGZvcm1hdHRpbmdDb250ZXh0Um9vdCkKICAgICAsIG1fZm9ybWF0dGluZ1N0 YXRlKGZvcm1hdHRpbmdTdGF0ZSkKIHsKLQogfQogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVu dCwgY29uc3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxpbmVC b3hMb2dpY2FsVG9wTGVmdCwgY29uc3Qgc2l6ZV90IGxpbmVJbmRleCkKQEAgLTUyLDYgKzUxLDcg QEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWls ZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnQKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkUnVuKHsg bGluZUluZGV4LCBSdW46OlR5cGU6OlJvb3RJbmxpbmVCb3gsIHJvb3QoKSwgcm9vdElubGluZUJv eFJlY3QsIHJvb3RJbmxpbmVCb3hSZWN0LCB7IH0sIHsgfSwgIGxpbmVCb3gucm9vdElubGluZUJv eCgpLmhhc0NvbnRlbnQoKX0pOwogICAgIGNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxp bmVTcGFubmluZ0lubGluZUJveGVzKGxpbmVCb3gsIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgbGlu ZUluZGV4KTsKICAgICBjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChs aW5lQ29udGVudCwgbGluZUJveCwgbGluZUJveExvZ2ljYWxUb3BMZWZ0LCBsaW5lSW5kZXgpOwor ICAgIGNvbGxlY3RJbmtPdmVyZmxvd0ZvcklubGluZUJveFJ1bnMobGluZUJveCk7CiB9CiAKIHZv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0 cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250 ZW50LCBjb25zdCBMaW5lQm94JiBsaW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGlu ZUJveExvZ2ljYWxUb3BMZWZ0LCBjb25zdCBzaXplX3QgbGluZUluZGV4KQpAQCAtMTMyLDYgKzEz Miw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBk YXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zCiAgICAgICAgICAgICBhdXRvJiBib3hHZW9t ZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwogICAgICAgICAg ICAgYXV0byBsb2dpY2FsQm9yZGVyQm94ID0gbGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9yQXRv bWljSW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CiAgICAgICAgICAgICBs b2dpY2FsQm9yZGVyQm94Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOworICAgICAgICAg ICAgLy8gRklYTUU6IEFkZCBpbmsgb3ZlcmZsb3cgc3VwcG9ydCBmb3IgYXRvbWljIGlubGluZSBs ZXZlbCBib3hlcyAoZS5nLiBib3ggc2hhZG93KS4KICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0 ZS5hZGRSdW4oeyBsaW5lSW5kZXgsIFJ1bjo6VHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gsIGxh eW91dEJveCwgbG9naWNhbEJvcmRlckJveCwgbG9naWNhbEJvcmRlckJveCwgbGluZVJ1bi5leHBh bnNpb24oKSwgeyB9IH0pOwogCiAgICAgICAgICAgICBhdXRvIGJvcmRlckJveExvZ2ljYWxUb3BM ZWZ0ID0gbG9naWNhbEJvcmRlckJveC50b3BMZWZ0KCk7CkBAIC0xMzksNiArMTQwLDE3IEBAIHZv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0 cnlGb3JMaW5lQ29udGVudChjb25zCiAgICAgICAgICAgICAvLyBBdG9taWMgaW5saW5lIGJveGVz IGFyZSBhbGwgc2V0LiBUaGVpciBtYXJnaW4vYm9yZGVyL2NvbnRlbnQgYm94IGdlb21ldHJpZXMg YXJlIGFscmVhZHkgY29tcHV0ZWQuIFdlIGp1c3QgaGF2ZSB0byBwb3NpdGlvbiB0aGVtIGhlcmUu CiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50 KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7CiAgICAgICAgICAgICBsaW5lTmVlZEludGVncmFs UG9zaXRpb24gPSBmYWxzZTsKKworICAgICAgICAgICAgYXV0byBhZGp1c3RQYXJlbnRJbmxpbmVC b3hJbmtPdmVyZmxvdyA9IFsmXSB7CisgICAgICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5l Qm94ID0gbGF5b3V0Qm94LnBhcmVudCgpOworICAgICAgICAgICAgICAgIGlmICgmcGFyZW50SW5s aW5lQm94ID09ICZyb290KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gV2UgZG9uJ3QgY29s bGVjdCBpbmsgb3ZlcmZsb3cgZm9yIHRoZSByb290IGlubGluZSBib3ggcnVuLgorICAgICAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUKG1faW5saW5lQm94UnVuSW5kZXhNYXAuY29udGFpbnMoJnBhcmVudElubGlu ZUJveCkpOworICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5ydW5zKClbbV9pbmxpbmVC b3hSdW5JbmRleE1hcC5nZXQoJnBhcmVudElubGluZUJveCldLmFkanVzdElua092ZXJmbG93KGxv Z2ljYWxCb3JkZXJCb3gpOworICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIGFkanVzdFBhcmVu dElubGluZUJveElua092ZXJmbG93KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog ICAgICAgICBjYXNlIElubGluZUl0ZW06OlR5cGU6OklubGluZUJveFN0YXJ0OiB7CkBAIC0xNDgs NiArMTYwLDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNB bmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnMKICAgICAgICAgICAgIGlubGluZUJv eEJvcmRlckJveC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKICAgICAgICAgICAgIGlm IChsaW5lQm94Lmhhc0NvbnRlbnQoKSkgewogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJdCdz IGV4cGVjdGVkIHRvIG5vdCBoYXZlIGFueSBydW5zIG9uIGVtcHR5IGxpbmVzLiBXZSBzaG91bGQg cmVjb25zaWRlciB0aGlzLgorICAgICAgICAgICAgICAgIG1faW5saW5lQm94UnVuSW5kZXhNYXAu YWRkKCZsYXlvdXRCb3gsIGZvcm1hdHRpbmdTdGF0ZS5ydW5zKCkuc2l6ZSgpKTsKICAgICAgICAg ICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkUnVuKHsgbGluZUluZGV4LCBSdW46OlR5cGU6Ok5v blJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgaW5saW5lQm94Qm9yZGVyQm94LCBpbmxpbmVCb3hC b3JkZXJCb3gsIHsgfSwgeyB9LCBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxh eW91dEJveCkuaGFzQ29udGVudCgpIH0pOwogICAgICAgICAgICAgfQogCkBAIC0xNzksMTMgKzE5 Miw2IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBk YXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zCiAKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lU3Bhbm5pbmdJbmxp bmVCb3hlcyhjb25zdCBMaW5lQm94JiBsaW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYg bGluZUJveExvZ2ljYWxUb3BMZWZ0LCBjb25zdCBzaXplX3QgbGluZUluZGV4KQogewotICAgIGlm ICghbGluZUJveC5oYXNDb250ZW50KCkpIHsKLSAgICAgICAgLy8gV2hlbiBhIHNwYW5uaW5nIGlu bGluZSBib3ggKGUuZy4gPGRpdj50ZXh0PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4pIGxhbmRzIG9u IGFuIGVtcHR5IGxpbmUKLSAgICAgICAgLy8gKGVtcHR5IGhlcmUgbWVhbnMgbm8gY29udGVudCBh dCBhbGwgaW5jbHVkaW5nIGxpbmUgYnJlYWtzLCBub3QganVzdCB2aXN1YWxseSBlbXB0eSkgdGhl biB3ZQotICAgICAgICAvLyBkb24ndCBleHRlbmQgdGhlIHNwYW5uaW5nIGxpbmUgYm94IG92ZXIg dG8gdGhpcyBsaW5lIC1hbHNvIHRoZXJlIGlzIG5vIG5leHQgbGluZSBpbiBjYXNlcyBsaWtlIHRo aXMuCi0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBhdXRvJiByb290U3R5bGUgPSByb290 KCkuc3R5bGUoKTsKICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5n U3RhdGUoKTsKICAgICBhdXRvIGxpbmVOZWVkSW50ZWdyYWxQb3NpdGlvbiA9IHRydWU7CkBAIC0x OTgsNiArMjA0LDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1 bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmluZ0lubGkKICAgICAgICAgYXV0byBpbmxp bmVCb3hCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5 b3V0Qm94LCBib3hHZW9tZXRyeSk7CiAgICAgICAgIGlubGluZUJveEJvcmRlckJveC5tb3ZlQnko bGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKIAorICAgICAgICBtX2lubGluZUJveFJ1bkluZGV4TWFw LmFkZCgmbGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUucnVucygpLnNpemUoKSk7CiAgICAgICAg IGZvcm1hdHRpbmdTdGF0ZS5hZGRSdW4oeyBsaW5lSW5kZXgsIFJ1bjo6VHlwZTo6Tm9uUm9vdElu bGluZUJveCwgbGF5b3V0Qm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIGlubGluZUJveEJvcmRlckJv eCwgeyB9LCB7IH0sIGlubGluZUxldmVsQm94Lmhhc0NvbnRlbnQoKSwgdHJ1ZSB9KTsKIAogICAg ICAgICBhdXRvIGlubGluZUJveFNpemUgPSBMYXlvdXRTaXplIHsgTGF5b3V0VW5pdDo6ZnJvbUZs b2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gud2lkdGgoKSksIExheW91dFVuaXQ6OmZyb21GbG9h dENlaWwoaW5saW5lQm94Qm9yZGVyQm94LmhlaWdodCgpKSB9OwpAQCAtMjIyLDYgKzIyOSwzMSBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdl b21ldHJ5Rm9yTGluZVNwYW5uaW5nSW5saQogICAgIGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLmxh c3QoKS5zZXROZWVkc0ludGVncmFsUG9zaXRpb24obGluZU5lZWRJbnRlZ3JhbFBvc2l0aW9uKTsK IH0KIAordm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNvbGxlY3RJbmtPdmVyZmxv d0ZvcklubGluZUJveFJ1bnMoY29uc3QgTGluZUJveCYgbGluZUJveCkKK3sKKyAgICBpZiAobV9p bmxpbmVCb3hSdW5JbmRleE1hcC5pc0VtcHR5KCkpIHsKKyAgICAgICAgLy8gVGhpcyBsaW5lIGhh cyBubyBpbmxpbmUgYm94IChvbmx5IHJvb3QsIGJ1dCB3ZSBkb24ndCBjb2xsZWN0IGluayBvdmVy ZmxvdyBmb3IgdGhlIHJvb3QgaW5saW5lIGJveCBhdG0pCisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5nU3RhdGUoKTsK KyAgICBhdXRvJiBub25Sb290SW5saW5lTGV2ZWxCb3hlcyA9IGxpbmVCb3gubm9uUm9vdElubGlu ZUxldmVsQm94ZXMoKTsKKyAgICAvLyBWaXNpdCB0aGUgaW5saW5lIGJveGVzIGFuZCBwcm9wYWdh dGUgaW5rIG92ZXJmbG93IHRvIHRoZWlyIHBhcmVudHMgLWV4Y2VwdCB0byB0aGUgcm9vdCBpbmxp bmUgYm94LgorICAgIC8vIChlLmcuIDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDEwcHg7Ij5TbWFs bCBmb250IHNpemU8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAzMDBweDsiPkxhcmdlciBmb250IHNp emUuIFRoaXMgb3ZlcmZsb3dzIHRoZSB0b3AgbW9zdCBzcGFuLjwvc3Bhbj48L3NwYW4+KS4KKyAg ICBmb3IgKHNpemVfdCBpbmRleCA9IG5vblJvb3RJbmxpbmVMZXZlbEJveGVzLnNpemUoKTsgaW5k ZXgtLTspIHsKKyAgICAgICAgaWYgKCFub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF0uaXNJ bmxpbmVCb3goKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBhdXRvJiBpbmxpbmVC b3ggPSBub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF0ubGF5b3V0Qm94KCk7CisgICAgICAg IGF1dG8mIHBhcmVudElubGluZUJveCA9IGlubGluZUJveC5wYXJlbnQoKTsKKyAgICAgICAgaWYg KCZwYXJlbnRJbmxpbmVCb3ggPT0gJnJvb3QoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICBSRUxFQVNFX0FTU0VSVChtX2lubGluZUJveFJ1bkluZGV4TWFwLmNvbnRhaW5zKCZpbmxp bmVCb3gpICYmIG1faW5saW5lQm94UnVuSW5kZXhNYXAuY29udGFpbnMoJnBhcmVudElubGluZUJv eCkpOworICAgICAgICBhdXRvJiBpbmtPdmVyZmxvdyA9IGZvcm1hdHRpbmdTdGF0ZS5ydW5zKClb bV9pbmxpbmVCb3hSdW5JbmRleE1hcC5nZXQoJmlubGluZUJveCldLmlua092ZXJmbG93KCk7Cisg ICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveFJ1biA9IGZvcm1hdHRpbmdTdGF0ZS5ydW5zKClb bV9pbmxpbmVCb3hSdW5JbmRleE1hcC5nZXQoJnBhcmVudElubGluZUJveCldOworICAgICAgICBw YXJlbnRJbmxpbmVCb3hSdW4uYWRqdXN0SW5rT3ZlcmZsb3coaW5rT3ZlcmZsb3cpOworICAgIH0K K30KKwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oCmluZGV4IGMxNjhmODhiY2I3YjlhMGY0MTFkYzNjOGExMWU0YTQxMDYwZTkw ZTMuLmUwY2MyNGVjMWY1ZGU4ZjU1MzhiMTliY2NjMWRlODdiZTFkMmM0OWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURp c3BsYXlDb250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCkBAIC00Niwx MiArNDYsMTQgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZVJ1bnNBbmRVcGRh dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYs IGNvbnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxU b3BMZWZ0LCBjb25zdCBzaXplX3QgbGluZUluZGV4KTsKICAgICB2b2lkIGNyZWF0ZVJ1bnNBbmRV cGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmluZ0lubGluZUJveGVzKGNvbnN0IExpbmVCb3gmLCBj b25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxUb3BMZWZ0LCBjb25zdCBzaXpl X3QgbGluZUluZGV4KTsKKyAgICB2b2lkIGNvbGxlY3RJbmtPdmVyZmxvd0ZvcklubGluZUJveFJ1 bnMoY29uc3QgTGluZUJveCYpOwogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29u c3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dFJvb3Q7IH0KICAgICBJbmxpbmVGb3JtYXR0 aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0dGluZ1N0 YXRlOyB9IAogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiBtX2Zvcm1hdHRpbmdDb250ZXh0Um9v dDsKICAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIG1fZm9ybWF0dGluZ1N0YXRlOworICAgIEhh c2hNYXA8Y29uc3QgQm94Kiwgc2l6ZV90PiBtX2lubGluZUJveFJ1bkluZGV4TWFwOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZVJ1bi5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVJ1bi5oCmluZGV4IGYyZjA5ZDE5NWJhNzgyOWUxNzE4 NDRlYzA1ZjQzZmU0MzlmZjM5NmIuLjU3ZDMyNTMzOGZiY2U5YjhmNTAwMjNiNzcxM2QzNjAyNmE5 YjFhMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVSdW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lUnVuLmgKQEAgLTk3LDYgKzk3LDggQEAg c3RydWN0IFJ1biB7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3Qg eyByZXR1cm4gbG9naWNhbFJlY3QoKS5oZWlnaHQoKTsgfQogCiAgICAgdm9pZCBtb3ZlVmVydGlj YWxseShJbmxpbmVMYXlvdXRVbml0IG9mZnNldCkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNh bGx5KG9mZnNldCk7IH0KKyAgICB2b2lkIGFkanVzdElua092ZXJmbG93KGNvbnN0IElubGluZVJl Y3QmIGNoaWxkQm9yZGVyQm94KSB7IHJldHVybiBtX2lua092ZXJmbG93LmV4cGFuZFRvQ29udGFp bihjaGlsZEJvcmRlckJveCk7IH0KKwogICAgIHN0ZDo6b3B0aW9uYWw8VGV4dD4mIHRleHQoKSB7 IHJldHVybiBtX3RleHQ7IH0KICAgICBjb25zdCBzdGQ6Om9wdGlvbmFsPFRleHQ+JiB0ZXh0KCkg Y29uc3QgeyByZXR1cm4gbV90ZXh0OyB9CiAK 437587 2021-09-07 20:25:21 -0700 2021-09-08 06:33:38 -0700 Patch bug-230026-20210907202521.patch text/plain 9945 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA2MjljZjQ2NmM0NzY0 YjE1ZjM4M2UzMDg2ZjJiZjRjMDAwNGZhYi4uZTkwMjU5ZDBlMTI1NzhiYjRlODk1YTY3MWViMzA3 ZjNjMjU3Y2M5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTA5LTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpbmxpbmUgYm94IGluayBvdmVyZmxvdworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMDI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ29sbGVjdGluZyB0aGUgaW5rIG92ZXJmbG93IGZyb20g dGhlIGRlc2NlbmRhbnQgYm94ZXMgaGFzIDIgcGhhc2VzLgorICAgICAgICAxLiBVcGRhdGUgdGhl IGluayBvdmVyZmxvdyBvbiB0aGUgcGFyZW50IGlubGluZSBib3ggKHVubGVzcyBpdCdzIGEgcm9v dCBpbmxpbmUgYm94KSBhcyB3ZSB3YWxrIHRoZSBsaW5lIGNvbnRlbnQKKyAgICAgICAgYW5kIGZp bmQgdGhlIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgKGUuZy4gPHNwYW4+PGltZz48L3NwYW4+ KQorICAgICAgICAyLiBDb2xsZWN0IHRoZSBpbmsgb3ZlcmZsb3cgb24gbmVzdGVkIGlubGluZSBi b3hlcyAoZS5nLiA8c3Bhbj5zb21lPHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTAwcHgiPnRleHQ8 L3NwYW4+PHNwYW4+KS4gCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OklubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lU3Bhbm5pbmdJbmxpbmVCb3hlcyk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 Y29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94UnVucyk6CisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVJ1bi5o OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpSdW46OmFkanVzdElua092ZXJmbG93KToKKwog MjAyMS0wOS0wNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bSUZDXSBDb25zdHJ1Y3QgbGluZSBzcGFubmluZyBpbmxpbmUgYm94ZXMgZmlyc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmlu ZGV4IGMxZjk3MDQ4NTY2YWVlNmI3NmFhZTUwZjlmYjMzZDdhODg0MjZkNDcuLjA2MjU2ZjdjMGM3 YTY4NmNkMWVjYjFiN2M2OWI2OTBhZjA3NWYyMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNDAsNyArNDAsNiBAQCBJ bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcihj b25zdCBDb250YWluZXJCb3gmIGZvcgogICAgIDogbV9mb3JtYXR0aW5nQ29udGV4dFJvb3QoZm9y bWF0dGluZ0NvbnRleHRSb290KQogICAgICwgbV9mb3JtYXR0aW5nU3RhdGUoZm9ybWF0dGluZ1N0 YXRlKQogewotCiB9CiAKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpidWlsZChj b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBjb25zdCBMaW5lQm94 JiBsaW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxUb3BMZWZ0 LCBjb25zdCBzaXplX3QgbGluZUluZGV4KQpAQCAtNTIsNiArNTEsNyBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50 JiBsaW5lQ29udAogICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRSdW4oeyBsaW5lSW5kZXgsIFJ1bjo6 VHlwZTo6Um9vdElubGluZUJveCwgcm9vdCgpLCByb290SW5saW5lQm94UmVjdCwgcm9vdElubGlu ZUJveFJlY3QsIHsgfSwgeyB9LCAgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgp fSk7CiAgICAgY3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZVNwYW5uaW5nSW5saW5l Qm94ZXMobGluZUJveCwgbGluZUJveExvZ2ljYWxUb3BMZWZ0LCBsaW5lSW5kZXgpOwogICAgIGNy ZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGxpbmVDb250ZW50LCBsaW5l Qm94LCBsaW5lQm94TG9naWNhbFRvcExlZnQsIGxpbmVJbmRleCk7CisgICAgY29sbGVjdElua092 ZXJmbG93Rm9ySW5saW5lQm94UnVucyhsaW5lQm94KTsKIH0KIAogdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50 KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IExpbmVC b3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNhbFRvcExl ZnQsIGNvbnN0IHNpemVfdCBsaW5lSW5kZXgpCkBAIC0xMzIsNiArMTMyLDcgQEAgdm9pZCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxp bmVDb250ZW50KGNvbnMKICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGlu Z1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxC b3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JBdG9taWNJbmxpbmVMZXZlbEJv eChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgICAgIGxvZ2ljYWxCb3JkZXJCb3gu bW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgICAgICAvLyBGSVhNRTogQWRk IGluayBvdmVyZmxvdyBzdXBwb3J0IGZvciBhdG9taWMgaW5saW5lIGxldmVsIGJveGVzIChlLmcu IGJveCBzaGFkb3cpLgogICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZFJ1bih7IGxpbmVJ bmRleCwgUnVuOjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCwgbGF5b3V0Qm94LCBsb2dpY2Fs Qm9yZGVyQm94LCBsb2dpY2FsQm9yZGVyQm94LCBsaW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7 CiAKICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRvcExlZnQgPSBsb2dpY2FsQm9y ZGVyQm94LnRvcExlZnQoKTsKQEAgLTEzOSw2ICsxNDAsMTcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50 KGNvbnMKICAgICAgICAgICAgIC8vIEF0b21pYyBpbmxpbmUgYm94ZXMgYXJlIGFsbCBzZXQuIFRo ZWlyIG1hcmdpbi9ib3JkZXIvY29udGVudCBib3ggZ2VvbWV0cmllcyBhcmUgYWxyZWFkeSBjb21w dXRlZC4gV2UganVzdCBoYXZlIHRvIHBvc2l0aW9uIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGJv eEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94TG9naWNh bFRvcExlZnQpKTsKICAgICAgICAgICAgIGxpbmVOZWVkSW50ZWdyYWxQb3NpdGlvbiA9IGZhbHNl OworCisgICAgICAgICAgICBhdXRvIGFkanVzdFBhcmVudElubGluZUJveElua092ZXJmbG93ID0g WyZdIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBwYXJlbnRJbmxpbmVCb3ggPSBsYXlvdXRCb3gu cGFyZW50KCk7CisgICAgICAgICAgICAgICAgaWYgKCZwYXJlbnRJbmxpbmVCb3ggPT0gJnJvb3Qo KSkgeworICAgICAgICAgICAgICAgICAgICAvLyBXZSBkb24ndCBjb2xsZWN0IGluayBvdmVyZmxv dyBmb3IgdGhlIHJvb3QgaW5saW5lIGJveCBydW4uCisgICAgICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQobV9p bmxpbmVCb3hSdW5JbmRleE1hcC5jb250YWlucygmcGFyZW50SW5saW5lQm94KSk7CisgICAgICAg ICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLnJ1bnMoKVttX2lubGluZUJveFJ1bkluZGV4TWFwLmdl dCgmcGFyZW50SW5saW5lQm94KV0uYWRqdXN0SW5rT3ZlcmZsb3cobG9naWNhbEJvcmRlckJveCk7 CisgICAgICAgICAgICB9OworICAgICAgICAgICAgYWRqdXN0UGFyZW50SW5saW5lQm94SW5rT3Zl cmZsb3coKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgSW5s aW5lSXRlbTo6VHlwZTo6SW5saW5lQm94U3RhcnQ6IHsKQEAgLTE0OCw2ICsxNjAsNyBAQCB2b2lk IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5 Rm9yTGluZUNvbnRlbnQoY29ucwogICAgICAgICAgICAgaW5saW5lQm94Qm9yZGVyQm94Lm1vdmVC eShsaW5lQm94TG9naWNhbFRvcExlZnQpOwogICAgICAgICAgICAgaWYgKGxpbmVCb3guaGFzQ29u dGVudCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEl0J3MgZXhwZWN0ZWQgdG8gbm90 IGhhdmUgYW55IHJ1bnMgb24gZW1wdHkgbGluZXMuIFdlIHNob3VsZCByZWNvbnNpZGVyIHRoaXMu CisgICAgICAgICAgICAgICAgbV9pbmxpbmVCb3hSdW5JbmRleE1hcC5hZGQoJmxheW91dEJveCwg Zm9ybWF0dGluZ1N0YXRlLnJ1bnMoKS5zaXplKCkpOwogICAgICAgICAgICAgICAgIGZvcm1hdHRp bmdTdGF0ZS5hZGRSdW4oeyBsaW5lSW5kZXgsIFJ1bjo6VHlwZTo6Tm9uUm9vdElubGluZUJveCwg bGF5b3V0Qm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIGlubGluZUJveEJvcmRlckJveCwgeyB9LCB7 IH0sIGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5oYXNDb250 ZW50KCkgfSk7CiAgICAgICAgICAgICB9CiAKQEAgLTE5OCw2ICsyMTEsNyBAQCB2b2lkIElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlUnVuc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGlu ZVNwYW5uaW5nSW5saQogICAgICAgICBhdXRvIGlubGluZUJveEJvcmRlckJveCA9IGxpbmVCb3gu bG9naWNhbEJvcmRlckJveEZvcklubGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAg ICAgICAgaW5saW5lQm94Qm9yZGVyQm94Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwog CisgICAgICAgIG1faW5saW5lQm94UnVuSW5kZXhNYXAuYWRkKCZsYXlvdXRCb3gsIGZvcm1hdHRp bmdTdGF0ZS5ydW5zKCkuc2l6ZSgpKTsKICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZFJ1bih7 IGxpbmVJbmRleCwgUnVuOjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBsYXlvdXRCb3gsIGlubGlu ZUJveEJvcmRlckJveCwgaW5saW5lQm94Qm9yZGVyQm94LCB7IH0sIHsgfSwgaW5saW5lTGV2ZWxC b3guaGFzQ29udGVudCgpLCB0cnVlIH0pOwogCiAgICAgICAgIGF1dG8gaW5saW5lQm94U2l6ZSA9 IExheW91dFNpemUgeyBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJv eC53aWR0aCgpKSwgTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3gu aGVpZ2h0KCkpIH07CkBAIC0yMjIsNiArMjM2LDMxIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lU3Bhbm5pbmdJbmxp CiAgICAgZm9ybWF0dGluZ1N0YXRlLmxpbmVzKCkubGFzdCgpLnNldE5lZWRzSW50ZWdyYWxQb3Np dGlvbihsaW5lTmVlZEludGVncmFsUG9zaXRpb24pOwogfQogCit2b2lkIElubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6Y29sbGVjdElua092ZXJmbG93Rm9ySW5saW5lQm94UnVucyhjb25zdCBM aW5lQm94JiBsaW5lQm94KQoreworICAgIGlmIChtX2lubGluZUJveFJ1bkluZGV4TWFwLmlzRW1w dHkoKSB8fCAhbGluZUJveC5oYXNDb250ZW50KCkpIHsKKyAgICAgICAgLy8gVGhpcyBsaW5lIGhh cyBubyBpbmxpbmUgYm94IChvbmx5IHJvb3QsIGJ1dCB3ZSBkb24ndCBjb2xsZWN0IGluayBvdmVy ZmxvdyBmb3IgdGhlIHJvb3QgaW5saW5lIGJveCBhdG0pCisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5nU3RhdGUoKTsK KyAgICBhdXRvJiBub25Sb290SW5saW5lTGV2ZWxCb3hlcyA9IGxpbmVCb3gubm9uUm9vdElubGlu ZUxldmVsQm94ZXMoKTsKKyAgICAvLyBWaXNpdCB0aGUgaW5saW5lIGJveGVzIGFuZCBwcm9wYWdh dGUgaW5rIG92ZXJmbG93IHRvIHRoZWlyIHBhcmVudHMgLWV4Y2VwdCB0byB0aGUgcm9vdCBpbmxp bmUgYm94LgorICAgIC8vIChlLmcuIDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDEwcHg7Ij5TbWFs bCBmb250IHNpemU8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAzMDBweDsiPkxhcmdlciBmb250IHNp emUuIFRoaXMgb3ZlcmZsb3dzIHRoZSB0b3AgbW9zdCBzcGFuLjwvc3Bhbj48L3NwYW4+KS4KKyAg ICBmb3IgKHNpemVfdCBpbmRleCA9IG5vblJvb3RJbmxpbmVMZXZlbEJveGVzLnNpemUoKTsgaW5k ZXgtLTspIHsKKyAgICAgICAgaWYgKCFub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF0uaXNJ bmxpbmVCb3goKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBhdXRvJiBpbmxpbmVC b3ggPSBub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF0ubGF5b3V0Qm94KCk7CisgICAgICAg IGF1dG8mIHBhcmVudElubGluZUJveCA9IGlubGluZUJveC5wYXJlbnQoKTsKKyAgICAgICAgaWYg KCZwYXJlbnRJbmxpbmVCb3ggPT0gJnJvb3QoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICBSRUxFQVNFX0FTU0VSVChtX2lubGluZUJveFJ1bkluZGV4TWFwLmNvbnRhaW5zKCZpbmxp bmVCb3gpICYmIG1faW5saW5lQm94UnVuSW5kZXhNYXAuY29udGFpbnMoJnBhcmVudElubGluZUJv eCkpOworICAgICAgICBhdXRvJiBpbmtPdmVyZmxvdyA9IGZvcm1hdHRpbmdTdGF0ZS5ydW5zKClb bV9pbmxpbmVCb3hSdW5JbmRleE1hcC5nZXQoJmlubGluZUJveCldLmlua092ZXJmbG93KCk7Cisg ICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveFJ1biA9IGZvcm1hdHRpbmdTdGF0ZS5ydW5zKClb bV9pbmxpbmVCb3hSdW5JbmRleE1hcC5nZXQoJnBhcmVudElubGluZUJveCldOworICAgICAgICBw YXJlbnRJbmxpbmVCb3hSdW4uYWRqdXN0SW5rT3ZlcmZsb3coaW5rT3ZlcmZsb3cpOworICAgIH0K K30KKwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oCmluZGV4IGMxNjhmODhiY2I3YjlhMGY0MTFkYzNjOGExMWU0YTQxMDYwZTkw ZTMuLmUwY2MyNGVjMWY1ZGU4ZjU1MzhiMTliY2NjMWRlODdiZTFkMmM0OWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURp c3BsYXlDb250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCkBAIC00Niwx MiArNDYsMTQgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZVJ1bnNBbmRVcGRh dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYs IGNvbnN0IExpbmVCb3gmLCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxU b3BMZWZ0LCBjb25zdCBzaXplX3QgbGluZUluZGV4KTsKICAgICB2b2lkIGNyZWF0ZVJ1bnNBbmRV cGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmluZ0lubGluZUJveGVzKGNvbnN0IExpbmVCb3gmLCBj b25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxUb3BMZWZ0LCBjb25zdCBzaXpl X3QgbGluZUluZGV4KTsKKyAgICB2b2lkIGNvbGxlY3RJbmtPdmVyZmxvd0ZvcklubGluZUJveFJ1 bnMoY29uc3QgTGluZUJveCYpOwogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29u c3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dFJvb3Q7IH0KICAgICBJbmxpbmVGb3JtYXR0 aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0dGluZ1N0 YXRlOyB9IAogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiBtX2Zvcm1hdHRpbmdDb250ZXh0Um9v dDsKICAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIG1fZm9ybWF0dGluZ1N0YXRlOworICAgIEhh c2hNYXA8Y29uc3QgQm94Kiwgc2l6ZV90PiBtX2lubGluZUJveFJ1bkluZGV4TWFwOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZVJ1bi5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVJ1bi5oCmluZGV4IGYyZjA5ZDE5NWJhNzgyOWUxNzE4 NDRlYzA1ZjQzZmU0MzlmZjM5NmIuLjU3ZDMyNTMzOGZiY2U5YjhmNTAwMjNiNzcxM2QzNjAyNmE5 YjFhMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVSdW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lUnVuLmgKQEAgLTk3LDYgKzk3LDggQEAg c3RydWN0IFJ1biB7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3Qg eyByZXR1cm4gbG9naWNhbFJlY3QoKS5oZWlnaHQoKTsgfQogCiAgICAgdm9pZCBtb3ZlVmVydGlj YWxseShJbmxpbmVMYXlvdXRVbml0IG9mZnNldCkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNh bGx5KG9mZnNldCk7IH0KKyAgICB2b2lkIGFkanVzdElua092ZXJmbG93KGNvbnN0IElubGluZVJl Y3QmIGNoaWxkQm9yZGVyQm94KSB7IHJldHVybiBtX2lua092ZXJmbG93LmV4cGFuZFRvQ29udGFp bihjaGlsZEJvcmRlckJveCk7IH0KKwogICAgIHN0ZDo6b3B0aW9uYWw8VGV4dD4mIHRleHQoKSB7 IHJldHVybiBtX3RleHQ7IH0KICAgICBjb25zdCBzdGQ6Om9wdGlvbmFsPFRleHQ+JiB0ZXh0KCkg Y29uc3QgeyByZXR1cm4gbV90ZXh0OyB9CiAK