233597 2021-11-29 14:22:37 -0800 [LFC][IFC] Redundant line run type checking in InlineDisplayContentBuilder::processNonBidiContent 2021-12-02 13:26:28 -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 1818476 0 zalan 2021-11-29 14:22:37 -0800 ssia 1818478 1 445345 zalan 2021-11-29 14:24:20 -0800 Created attachment 445345 Patch 1818529 2 445361 zalan 2021-11-29 16:14:42 -0800 Created attachment 445361 Patch 1819850 3 ews-feeder 2021-12-02 13:25:42 -0800 Committed r286448 (244790@main): <https://commits.webkit.org/244790@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445361. 1819851 4 webkit-bug-importer 2021-12-02 13:26:28 -0800 <rdar://problem/85986369> 445345 2021-11-29 14:24:20 -0800 2021-11-29 16:14:40 -0800 Patch bug-233597-20211129142419.patch text/plain 5255 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QwODFhNDI4MTg2ZWQy ZWQyZWY4ODg0MTU1MzQ4OGI5MmM5YzM3Yy4uNTMxOGM2ZWU2ZTY2N2JiNzY1Y2Y3YTcxZWFlNTcw ZjhjZDE3MDE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTExLTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFJlZHVuZGFu dCBsaW5lIHJ1biB0eXBlIGNoZWNraW5nIGluIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 cHJvY2Vzc05vbkJpZGlDb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzM1OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURp c3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKwogMjAyMS0x MS0yOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBTcGxpdCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudCBp bnRvIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJXaXRoTG9naWNhbEdlb21ldHJ5IGFu ZCBjb21wdXRlVmlzdWFsR2VvbWV0cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGM2OWQ1NzU0MWMyMDNmN2JhNTVjNmU4 MzI3MWJjYTc0MDQzNDViNTUuLjBlM2Y2YWFiZTFlNTNlYjhiNTBmMGQwNWI0ZTNhMWI4MDZhMTM3 MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmNwcApAQCAtMjkxLDQzICsyOTEsMzcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUMK IHsKICAgICAvLyBDcmVhdGUgdGhlIGlubGluZSBib3hlcyBvbiB0aGUgY3VycmVudCBsaW5lLiBU aGlzIGlzIG1vc3RseSB0ZXh0IGFuZCBhdG9taWMgaW5saW5lIGJveGVzLgogICAgIGZvciAoYXV0 byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMpIHsKKyAgICAgICAgYXV0byYgbGF5b3V0Qm94 ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKIAotICAgICAgICBhdXRvIGRpc3BsYXlCb3hSZWN0ID0g WyZdIHsKLSAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7 Ci0gICAgICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IH07Ci0KLSAgICAg ICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpIHx8IGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkp Ci0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4 dFJ1bihsaW5lUnVuKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNIYXJkTGluZUJy ZWFrKCkpCi0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0 Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChsaW5lUnVu LmlzQm94KCkpCi0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxC b3JkZXJCb3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGZvcm1hdHRpbmdTdGF0 ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCkpOwotICAgICAgICAgICAgZWxzZSBpZiAobGluZVJ1 bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJveFN0 YXJ0KCkpCi0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3Jk ZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRy eShsYXlvdXRCb3gpKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYXV0byBsb2dpY2FsUmVjdFJlbGF0aXZlVG9MaW5lID0g WyZdKGF1dG8gbG9naWNhbFJlY3QpIHsKICAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVCeShs aW5lQm94TG9naWNhbFRvcExlZnQpOwogICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxSZWN0Owog ICAgICAgICB9OwogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpKSB7Ci0gICAgICAgICAg ICBhcHBlbmRUZXh0RGlzcGxheUJveChsaW5lUnVuLCBkaXNwbGF5Qm94UmVjdCgpLCBib3hlcyk7 CisgICAgICAgICAgICBhcHBlbmRUZXh0RGlzcGxheUJveChsaW5lUnVuLCBsb2dpY2FsUmVjdFJl bGF0aXZlVG9MaW5lKGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pKSwgYm94 ZXMpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGxpbmVS dW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIGFwcGVuZFNvZnRMaW5lQnJlYWtE aXNwbGF5Qm94KGxpbmVSdW4sIGRpc3BsYXlCb3hSZWN0KCksIGJveGVzKTsKKyAgICAgICAgICAg IGFwcGVuZFNvZnRMaW5lQnJlYWtEaXNwbGF5Qm94KGxpbmVSdW4sIGxvZ2ljYWxSZWN0UmVsYXRp dmVUb0xpbmUobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpLCBib3hlcyk7 CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1bi5p c0hhcmRMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgYXBwZW5kSGFyZExpbmVCcmVha0Rpc3Bs YXlCb3gobGluZVJ1biwgZGlzcGxheUJveFJlY3QoKSwgYm94ZXMpOworICAgICAgICAgICAgYXBw ZW5kSGFyZExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1biwgbG9naWNhbFJlY3RSZWxhdGl2ZVRv TGluZShsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCkpLCBib3hl cyk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1 bi5pc0JveCgpKSB7Ci0gICAgICAgICAgICBhcHBlbmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlC b3gobGluZVJ1biwgZGlzcGxheUJveFJlY3QoKSwgYm94ZXMpOworICAgICAgICAgICAgYXBwZW5k QXRvbWljSW5saW5lTGV2ZWxEaXNwbGF5Qm94KGxpbmVSdW4KKyAgICAgICAgICAgICAgICAsIGxv Z2ljYWxSZWN0UmVsYXRpdmVUb0xpbmUobGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9yQXRvbWlj SW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShs YXlvdXRCb3gpKSkKKyAgICAgICAgICAgICAgICAsIGJveGVzKTsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkg ewotICAgICAgICAgICAgYXBwZW5kSW5saW5lQm94RGlzcGxheUJveChsaW5lUnVuLCBsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpLCBkaXNwbGF5 Qm94UmVjdCgpLCBsaW5lQm94Lmhhc0NvbnRlbnQoKSwgYm94ZXMpOworICAgICAgICAgICAgYXBw ZW5kSW5saW5lQm94RGlzcGxheUJveChsaW5lUnVuCisgICAgICAgICAgICAgICAgLCBsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpCisgICAgICAg ICAgICAgICAgLCBsb2dpY2FsUmVjdFJlbGF0aXZlVG9MaW5lKGxpbmVCb3gubG9naWNhbEJvcmRl ckJveEZvcklubGluZUJveChsYXlvdXRCb3gsIGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5 KGxheW91dEJveCkpKQorICAgICAgICAgICAgICAgICwgbGluZUJveC5oYXNDb250ZW50KCkKKyAg ICAgICAgICAgICAgICAsIGJveGVzKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9 CiAgICAgICAgIGlmIChsaW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSkgewpA QCAtMzM3LDcgKzMzMSwxMCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJv Y2Vzc05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQwogICAgICAgICAgICAg ICAgIC8vIGRvbid0IGV4dGVuZCB0aGUgc3Bhbm5pbmcgbGluZSBib3ggb3ZlciB0byB0aGlzIGxp bmUgLWFsc28gdGhlcmUgaXMgbm8gbmV4dCBsaW5lIGluIGNhc2VzIGxpa2UgdGhpcy4KICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGFwcGVuZFNw YW5uaW5nSW5saW5lQm94RGlzcGxheUJveChsaW5lUnVuLCBsaW5lQm94LmlubGluZUxldmVsQm94 Rm9yTGF5b3V0Qm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpLCBkaXNwbGF5Qm94UmVjdCgpLCBib3hl cyk7CisgICAgICAgICAgICBhcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3gobGluZVJ1 bgorICAgICAgICAgICAgICAgICwgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChs aW5lUnVuLmxheW91dEJveCgpKQorICAgICAgICAgICAgICAgICwgbG9naWNhbFJlY3RSZWxhdGl2 ZVRvTGluZShsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBm b3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpKSkKKyAgICAgICAgICAgICAg ICAsIGJveGVzKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIEFT U0VSVChsaW5lUnVuLmlzSW5saW5lQm94RW5kKCkgfHwgbGluZVJ1bi5pc1dvcmRCcmVha09wcG9y dHVuaXR5KCkpOwo= 445361 2021-11-29 16:14:42 -0800 2021-12-02 13:25:43 -0800 Patch bug-233597-20211129161442.patch text/plain 5255 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QwODFhNDI4MTg2ZWQy ZWQyZWY4ODg0MTU1MzQ4OGI5MmM5YzM3Yy4uNTMxOGM2ZWU2ZTY2N2JiNzY1Y2Y3YTcxZWFlNTcw ZjhjZDE3MDE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTExLTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFJlZHVuZGFu dCBsaW5lIHJ1biB0eXBlIGNoZWNraW5nIGluIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 cHJvY2Vzc05vbkJpZGlDb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzM1OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURp c3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKwogMjAyMS0x MS0yOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBTcGxpdCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudCBp bnRvIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJXaXRoTG9naWNhbEdlb21ldHJ5IGFu ZCBjb21wdXRlVmlzdWFsR2VvbWV0cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGM2OWQ1NzU0MWMyMDNmN2JhNTVjNmU4 MzI3MWJjYTc0MDQzNDViNTUuLjI1MTcwZGQ5MjNjMzkyZTUyNDlmZjNkMjJkMzgzNTM0NGFkZjg1 YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmNwcApAQCAtMjkxLDQzICsyOTEsMzcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUMK IHsKICAgICAvLyBDcmVhdGUgdGhlIGlubGluZSBib3hlcyBvbiB0aGUgY3VycmVudCBsaW5lLiBU aGlzIGlzIG1vc3RseSB0ZXh0IGFuZCBhdG9taWMgaW5saW5lIGJveGVzLgogICAgIGZvciAoYXV0 byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMpIHsKKyAgICAgICAgYXV0byYgbGF5b3V0Qm94 ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKIAotICAgICAgICBhdXRvIGRpc3BsYXlCb3hSZWN0ID0g WyZdIHsKLSAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7 Ci0gICAgICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IH07Ci0KLSAgICAg ICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpIHx8IGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkp Ci0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4 dFJ1bihsaW5lUnVuKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNIYXJkTGluZUJy ZWFrKCkpCi0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0 Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChsaW5lUnVu LmlzQm94KCkpCi0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxC b3JkZXJCb3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGZvcm1hdHRpbmdTdGF0 ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCkpOwotICAgICAgICAgICAgZWxzZSBpZiAobGluZVJ1 bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJveFN0 YXJ0KCkpCi0gICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3Jk ZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRy eShsYXlvdXRCb3gpKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYXV0byBsb2dpY2FsUmVjdFJlbGF0aXZlVG9Sb290ID0g WyZdKGF1dG8gbG9naWNhbFJlY3QpIHsKICAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVCeShs aW5lQm94TG9naWNhbFRvcExlZnQpOwogICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxSZWN0Owog ICAgICAgICB9OwogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpKSB7Ci0gICAgICAgICAg ICBhcHBlbmRUZXh0RGlzcGxheUJveChsaW5lUnVuLCBkaXNwbGF5Qm94UmVjdCgpLCBib3hlcyk7 CisgICAgICAgICAgICBhcHBlbmRUZXh0RGlzcGxheUJveChsaW5lUnVuLCBsb2dpY2FsUmVjdFJl bGF0aXZlVG9Sb290KGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pKSwgYm94 ZXMpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGxpbmVS dW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIGFwcGVuZFNvZnRMaW5lQnJlYWtE aXNwbGF5Qm94KGxpbmVSdW4sIGRpc3BsYXlCb3hSZWN0KCksIGJveGVzKTsKKyAgICAgICAgICAg IGFwcGVuZFNvZnRMaW5lQnJlYWtEaXNwbGF5Qm94KGxpbmVSdW4sIGxvZ2ljYWxSZWN0UmVsYXRp dmVUb1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpLCBib3hlcyk7 CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1bi5p c0hhcmRMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgYXBwZW5kSGFyZExpbmVCcmVha0Rpc3Bs YXlCb3gobGluZVJ1biwgZGlzcGxheUJveFJlY3QoKSwgYm94ZXMpOworICAgICAgICAgICAgYXBw ZW5kSGFyZExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1biwgbG9naWNhbFJlY3RSZWxhdGl2ZVRv Um9vdChsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCkpLCBib3hl cyk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1 bi5pc0JveCgpKSB7Ci0gICAgICAgICAgICBhcHBlbmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlC b3gobGluZVJ1biwgZGlzcGxheUJveFJlY3QoKSwgYm94ZXMpOworICAgICAgICAgICAgYXBwZW5k QXRvbWljSW5saW5lTGV2ZWxEaXNwbGF5Qm94KGxpbmVSdW4KKyAgICAgICAgICAgICAgICAsIGxv Z2ljYWxSZWN0UmVsYXRpdmVUb1Jvb3QobGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9yQXRvbWlj SW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShs YXlvdXRCb3gpKSkKKyAgICAgICAgICAgICAgICAsIGJveGVzKTsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkg ewotICAgICAgICAgICAgYXBwZW5kSW5saW5lQm94RGlzcGxheUJveChsaW5lUnVuLCBsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpLCBkaXNwbGF5 Qm94UmVjdCgpLCBsaW5lQm94Lmhhc0NvbnRlbnQoKSwgYm94ZXMpOworICAgICAgICAgICAgYXBw ZW5kSW5saW5lQm94RGlzcGxheUJveChsaW5lUnVuCisgICAgICAgICAgICAgICAgLCBsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpCisgICAgICAg ICAgICAgICAgLCBsb2dpY2FsUmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gubG9naWNhbEJvcmRl ckJveEZvcklubGluZUJveChsYXlvdXRCb3gsIGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5 KGxheW91dEJveCkpKQorICAgICAgICAgICAgICAgICwgbGluZUJveC5oYXNDb250ZW50KCkKKyAg ICAgICAgICAgICAgICAsIGJveGVzKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9 CiAgICAgICAgIGlmIChsaW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSkgewpA QCAtMzM3LDcgKzMzMSwxMCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJv Y2Vzc05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQwogICAgICAgICAgICAg ICAgIC8vIGRvbid0IGV4dGVuZCB0aGUgc3Bhbm5pbmcgbGluZSBib3ggb3ZlciB0byB0aGlzIGxp bmUgLWFsc28gdGhlcmUgaXMgbm8gbmV4dCBsaW5lIGluIGNhc2VzIGxpa2UgdGhpcy4KICAgICAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGFwcGVuZFNw YW5uaW5nSW5saW5lQm94RGlzcGxheUJveChsaW5lUnVuLCBsaW5lQm94LmlubGluZUxldmVsQm94 Rm9yTGF5b3V0Qm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpLCBkaXNwbGF5Qm94UmVjdCgpLCBib3hl cyk7CisgICAgICAgICAgICBhcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3gobGluZVJ1 bgorICAgICAgICAgICAgICAgICwgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChs aW5lUnVuLmxheW91dEJveCgpKQorICAgICAgICAgICAgICAgICwgbG9naWNhbFJlY3RSZWxhdGl2 ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBm b3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpKSkKKyAgICAgICAgICAgICAg ICAsIGJveGVzKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIEFT U0VSVChsaW5lUnVuLmlzSW5saW5lQm94RW5kKCkgfHwgbGluZVJ1bi5pc1dvcmRCcmVha09wcG9y dHVuaXR5KCkpOwo=