233896 2021-12-06 13:23:46 -0800 [LFC][IFC] Add support for empty bidi inline boxes 2021-12-09 13:06:12 -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 1820747 0 zalan 2021-12-06 13:23:46 -0800 e.g. <span style="border-left: solid"></span> 1820750 1 446078 zalan 2021-12-06 13:25:50 -0800 Created attachment 446078 Patch 1822163 2 446559 zalan 2021-12-09 09:46:12 -0800 Created attachment 446559 Patch 1822179 3 ews-feeder 2021-12-09 10:34:31 -0800 Committed r286786 (245027@main): <https://commits.webkit.org/245027@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446559. 1822281 4 webkit-bug-importer 2021-12-09 13:06:12 -0800 <rdar://problem/86287087> 446078 2021-12-06 13:25:50 -0800 2021-12-09 09:46:10 -0800 Patch bug-233896-20211206132549.patch text/plain 6689 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmMwZTQ0Yzc0YTA3NmQw MjVkNGZmZjExY2Q4MGE5NDQxZThlOTQ2YS4uMTYwYzI5NTIxMmM3NDY1NzIyNDM2Nzg3NWI5MjEz YWQwODEwNThmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTA2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBlbXB0eSBiaWRpIGlubGluZSBib3hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzODk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW5saW5lIGJveGVzIHdpdGggZGVjb3JhdGlvbiBvbmx5 IHNob3VsZCBhbHNvIHByb2R1Y2UgYXNzb2NpYXRlZCBkaXNwbGF5IGJveGVzLgorCisgICAgICAg ICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y3JlYXRlZERpc3BsYXlCb3hO b2RlRm9yQ29udGFpbmVyQm94QW5kUHVzaFRvQW5jZXN0b3JTdGFjayk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZW5zdXJlRGlzcGxheUJv eEZvckNvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToKKwogMjAyMS0xMi0wNiAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBSZWZhY3RvciBi aWRpIGlubGluZSBib3ggYm91bmRhcnkgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGIxMWZlNzhkMzUyYjAz M2Y0ZjE3MTU3YmQ0MWNmZTNlMmE1NGIyZGMuLjdhYjdjOWU4ZDVhNDUxOWQyMGE1Mjg0ZTBjODgw OTNiNjQxMjMxNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMzcyLDYgKzM3MiwxNCBAQCBwcml2YXRlOgogICAgIExp c3RIYXNoU2V0PGNvbnN0IENvbnRhaW5lckJveCo+IG1fc2V0OwogfTsKIAorc3RhdGljIGlubGlu ZSBEaXNwbGF5Qm94Tm9kZSYgY3JlYXRlZERpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVyQm94QW5k UHVzaFRvQW5jZXN0b3JTdGFjayhjb25zdCBDb250YWluZXJCb3gmIGNvbnRhaW5lckJveCwgc2l6 ZV90IGRpc3BsYXlCb3hJbmRleCwgRGlzcGxheUJveE5vZGUmIHBhcmVudERpc3BsYXlCb3hOb2Rl LCBBbmNlc3RvclN0YWNrJiBhbmNlc3RvclN0YWNrKQoreworICAgIHBhcmVudERpc3BsYXlCb3hO b2RlLmFwcGVuZENoaWxkKGRpc3BsYXlCb3hJbmRleCk7CisgICAgYXV0byYgZGlzcGxheUJveE5v ZGUgPSAqcGFyZW50RGlzcGxheUJveE5vZGUuY2hpbGRyZW4ubGFzdCgpOworICAgIGFuY2VzdG9y U3RhY2sucHVzaChkaXNwbGF5Qm94Tm9kZSwgY29udGFpbmVyQm94KTsKKyAgICByZXR1cm4gZGlz cGxheUJveE5vZGU7Cit9CisKIERpc3BsYXlCb3hOb2RlJiBJbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIoY29uc3QgQ29udGFpbmVyQm94JiBj b250YWluZXJCb3gsIEFuY2VzdG9yU3RhY2smIGFuY2VzdG9yU3RhY2ssIERpc3BsYXlCb3hlcyYg Ym94ZXMpCiB7CiAgICAgQVNTRVJUKGNvbnRhaW5lckJveC5pc0lubGluZUJveCgpIHx8ICZjb250 YWluZXJCb3ggPT0gJnJvb3QoKSk7CkBAIC0zNzksMTEgKzM4Nyw3IEBAIERpc3BsYXlCb3hOb2Rl JiBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWlu ZXIoY29uc3QKICAgICAgICAgcmV0dXJuICpsb3dlc3RDb21tb25BbmNlc3RvcjsKICAgICBhdXRv JiBlbmNsb3NpbmdEaXNwbGF5Qm94Tm9kZUZvckNvbnRhaW5lciA9IGVuc3VyZURpc3BsYXlCb3hG b3JDb250YWluZXIoY29udGFpbmVyQm94LnBhcmVudCgpLCBhbmNlc3RvclN0YWNrLCBib3hlcyk7 CiAgICAgYm94ZXMuYXBwZW5kKHsgbV9saW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlw ZTo6Tm9uUm9vdElubGluZUJveCwgY29udGFpbmVyQm94LCBVQklESV9ERUZBVUxUX0xUUiwgeyB9 LCB7IH0sIHsgfSwgeyB9LCB0cnVlLCB7IH0gfSk7Ci0KLSAgICBlbmNsb3NpbmdEaXNwbGF5Qm94 Tm9kZUZvckNvbnRhaW5lci5hcHBlbmRDaGlsZChib3hlcy5zaXplKCkgLSAxKTsKLSAgICBhdXRv JiBkaXNwbGF5Qm94Tm9kZUZvckNvbnRhaW5lciA9ICplbmNsb3NpbmdEaXNwbGF5Qm94Tm9kZUZv ckNvbnRhaW5lci5jaGlsZHJlbi5sYXN0KCk7Ci0gICAgYW5jZXN0b3JTdGFjay5wdXNoKGRpc3Bs YXlCb3hOb2RlRm9yQ29udGFpbmVyLCBjb250YWluZXJCb3gpOwotICAgIHJldHVybiBkaXNwbGF5 Qm94Tm9kZUZvckNvbnRhaW5lcjsKKyAgICByZXR1cm4gY3JlYXRlZERpc3BsYXlCb3hOb2RlRm9y Q29udGFpbmVyQm94QW5kUHVzaFRvQW5jZXN0b3JTdGFjayhjb250YWluZXJCb3gsIGJveGVzLnNp emUoKSAtIDEsIGVuY2xvc2luZ0Rpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVyLCBhbmNlc3RvclN0 YWNrKTsKIH0KIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3Vh bEdlb21ldHJ5Rm9yQ2hpbGROb2RlKGNvbnN0IERpc3BsYXlCb3hOb2RlJiBkaXNwbGF5Qm94Tm9k ZSwgSW5saW5lTGF5b3V0VW5pdCYgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lQm94TG9naWNhbFRvcCwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGlu ZUJveCYgbGluZUJveCkKQEAgLTQ2MywxMSArNDY3LDkgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKICAgICAgICAgICAgIGF1dG8mIGxpbmVSdW4gPSBydW5zW3Zpc3VhbEluZGV4XTsKICAgICAg ICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKLSAgICAgICAg ICAgIGF1dG8gaXNDb250ZW50UnVuID0gIWxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpICYmICFs aW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSAmJiAhbGluZVJ1bi5pc0lubGlu ZUJveEVuZCgpICYmICFsaW5lUnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKLSAgICAgICAg ICAgIGlmICghaXNDb250ZW50UnVuKSB7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6IEFkZCBz dXBwb3J0IGZvciBpbmxpbmUgYm94ZXMgd2l0aCBubyBjb250ZW50LgorICAgICAgICAgICAgYXV0 byBuZWVkc0Rpc3BsYXlCb3ggPSAhbGluZVJ1bi5pc0lubGluZUJveEVuZCgpICYmICFsaW5lUnVu LmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKKyAgICAgICAgICAgIGlmICghbmVlZHNEaXNwbGF5 Qm94KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQogCiAgICAgICAg ICAgICBhdXRvIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdCA9IFsmXShhdXRvIGxvZ2ljYWxsUmVj dCkgewogICAgICAgICAgICAgICAgIGxvZ2ljYWxsUmVjdC5zZXRMZWZ0KGNvbnRlbnRSaWdodElu VmlzdWFsT3JkZXIpOwpAQCAtNDgwLDIwICs0ODIsMzYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKICAgICAgICAgICAgICAgICBhdXRvIHZpc3VhbFJlY3QgPSB2aXN1YWxSZWN0UmVsYXRpdmVU b1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpOwogICAgICAgICAg ICAgICAgIGFwcGVuZFRleHREaXNwbGF5Qm94KGxpbmVSdW4sIHZpc3VhbFJlY3QsIGJveGVzKTsK ICAgICAgICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IHZpc3VhbFJlY3Qu d2lkdGgoKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAobGluZVJ1bi5pc1NvZnRMaW5lQnJlYWso KSkgeworICAgICAgICAgICAgICAgIHBhcmVudERpc3BsYXlCb3hOb2RlLmFwcGVuZENoaWxkKGJv eGVzLnNpemUoKSAtIDEpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg fQorICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKICAgICAgICAg ICAgICAgICBBU1NFUlQoIXZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxS ZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKSkud2lkdGgoKSk7CiAgICAgICAgICAgICAgICAgYXBwZW5k U29mdExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1biwgdmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290 KGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pKSwgYm94ZXMpOwotICAgICAg ICAgICAgfSBlbHNlIGlmIChsaW5lUnVuLmlzSGFyZExpbmVCcmVhaygpKSB7CisgICAgICAgICAg ICAgICAgcGFyZW50RGlzcGxheUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7 CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBp ZiAobGluZVJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgICAgIEFTU0VSVCgh dmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5lQnJlYWtC b3gobGF5b3V0Qm94KSkud2lkdGgoKSk7CiAgICAgICAgICAgICAgICAgYXBwZW5kSGFyZExpbmVC cmVha0Rpc3BsYXlCb3gobGluZVJ1biwgdmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gu bG9naWNhbFJlY3RGb3JMaW5lQnJlYWtCb3gobGF5b3V0Qm94KSksIGJveGVzKTsKLSAgICAgICAg ICAgIH0gZWxzZSBpZiAobGluZVJ1bi5pc0JveCgpKSB7CisgICAgICAgICAgICAgICAgcGFyZW50 RGlzcGxheUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7CisgICAgICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobGluZVJ1bi5p c0JveCgpKSB7CiAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5n U3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIGF1dG8gdmlz dWFsUmVjdCA9IHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxCb3JkZXJC b3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KSk7CiAgICAg ICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KGJveEdlb21ldHJ5Lm1hcmdp blN0YXJ0KCkpOwogICAgICAgICAgICAgICAgIGFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxh eUJveChsaW5lUnVuLCB2aXN1YWxSZWN0LCBib3hlcyk7CiAgICAgICAgICAgICAgICAgY29udGVu dFJpZ2h0SW5WaXN1YWxPcmRlciArPSBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpICsgdmlzdWFs UmVjdC53aWR0aCgpICsgYm94R2VvbWV0cnkubWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAg cGFyZW50RGlzcGxheUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7CisgICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobGlu ZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJv eFN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRleCwg SW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBsYXlvdXRCb3gsIFVC SURJX0RFRkFVTFRfTFRSLCB7IH0sIHsgfSwgeyB9LCB7IH0sIHRydWUsIHsgfSB9KTsKKyAgICAg ICAgICAgICAgICBjcmVhdGVkRGlzcGxheUJveE5vZGVGb3JDb250YWluZXJCb3hBbmRQdXNoVG9B bmNlc3RvclN0YWNrKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSwgYm94ZXMuc2l6 ZSgpIC0gMSwgcGFyZW50RGlzcGxheUJveE5vZGUsIGFuY2VzdG9yU3RhY2spOworICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcGFyZW50RGlzcGxh eUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7CisgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgfQogICAgIH07CiAgICAgY3JlYXRlRGlzcGxheUJv eGVzSW5WaXN1YWxPcmRlcigpOwo= 446559 2021-12-09 09:46:12 -0800 2021-12-09 10:34:33 -0800 Patch bug-233896-20211209094611.patch text/plain 6689 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Nzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMyZjk3YzUyNjhhOWZl ZGVkODVmOGNlMjYxYzU2NDAyYjY4MTQ2Yi4uM2VjMTFlMzQxOTI5NDdmOThkZDVmYzAyYjZmNzY1 M2E4ZjRiY2Y0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBlbXB0eSBiaWRpIGlubGluZSBib3hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzODk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 dGkgS29pdmlzdG8uCisKKyAgICAgICAgSW5saW5lIGJveGVzIHdpdGggZGVjb3JhdGlvbiBvbmx5 IHNob3VsZCBhbHNvIHByb2R1Y2UgYXNzb2NpYXRlZCBkaXNwbGF5IGJveGVzLgorCisgICAgICAg ICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y3JlYXRlZERpc3BsYXlCb3hO b2RlRm9yQ29udGFpbmVyQm94QW5kUHVzaFRvQW5jZXN0b3JTdGFjayk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZW5zdXJlRGlzcGxheUJv eEZvckNvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToKKwogMjAyMS0xMi0wOSAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBSZWZhY3RvciBi aWRpIGlubGluZSBib3ggYm91bmRhcnkgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGVmYWUzYzZjM2ExOTVj ZTQ4MDdkZDU1MzBmNDk2NDI0MjU5ZTFhOGYuLjM1NTQ3OTIyYzkwMDhlNzE0YzZkZDllODM0Zjll ZGVjYWYyMjQ0Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMzYzLDYgKzM2MywxNCBAQCBwcml2YXRlOgogICAgIExp c3RIYXNoU2V0PGNvbnN0IENvbnRhaW5lckJveCo+IG1fc2V0OwogfTsKIAorc3RhdGljIGlubGlu ZSBEaXNwbGF5Qm94Tm9kZSYgY3JlYXRlZERpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVyQm94QW5k UHVzaFRvQW5jZXN0b3JTdGFjayhjb25zdCBDb250YWluZXJCb3gmIGNvbnRhaW5lckJveCwgc2l6 ZV90IGRpc3BsYXlCb3hJbmRleCwgRGlzcGxheUJveE5vZGUmIHBhcmVudERpc3BsYXlCb3hOb2Rl LCBBbmNlc3RvclN0YWNrJiBhbmNlc3RvclN0YWNrKQoreworICAgIHBhcmVudERpc3BsYXlCb3hO b2RlLmFwcGVuZENoaWxkKGRpc3BsYXlCb3hJbmRleCk7CisgICAgYXV0byYgZGlzcGxheUJveE5v ZGUgPSAqcGFyZW50RGlzcGxheUJveE5vZGUuY2hpbGRyZW4ubGFzdCgpOworICAgIGFuY2VzdG9y U3RhY2sucHVzaChkaXNwbGF5Qm94Tm9kZSwgY29udGFpbmVyQm94KTsKKyAgICByZXR1cm4gZGlz cGxheUJveE5vZGU7Cit9CisKIERpc3BsYXlCb3hOb2RlJiBJbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIoY29uc3QgQ29udGFpbmVyQm94JiBj b250YWluZXJCb3gsIEFuY2VzdG9yU3RhY2smIGFuY2VzdG9yU3RhY2ssIERpc3BsYXlCb3hlcyYg Ym94ZXMpCiB7CiAgICAgQVNTRVJUKGNvbnRhaW5lckJveC5pc0lubGluZUJveCgpIHx8ICZjb250 YWluZXJCb3ggPT0gJnJvb3QoKSk7CkBAIC0zNzAsMTEgKzM3OCw3IEBAIERpc3BsYXlCb3hOb2Rl JiBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWlu ZXIoY29uc3QKICAgICAgICAgcmV0dXJuICpsb3dlc3RDb21tb25BbmNlc3RvcjsKICAgICBhdXRv JiBlbmNsb3NpbmdEaXNwbGF5Qm94Tm9kZUZvckNvbnRhaW5lciA9IGVuc3VyZURpc3BsYXlCb3hG b3JDb250YWluZXIoY29udGFpbmVyQm94LnBhcmVudCgpLCBhbmNlc3RvclN0YWNrLCBib3hlcyk7 CiAgICAgYm94ZXMuYXBwZW5kKHsgbV9saW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlw ZTo6Tm9uUm9vdElubGluZUJveCwgY29udGFpbmVyQm94LCBVQklESV9ERUZBVUxUX0xUUiwgeyB9 LCB7IH0sIHsgfSwgeyB9LCB0cnVlLCB7IH0gfSk7Ci0KLSAgICBlbmNsb3NpbmdEaXNwbGF5Qm94 Tm9kZUZvckNvbnRhaW5lci5hcHBlbmRDaGlsZChib3hlcy5zaXplKCkgLSAxKTsKLSAgICBhdXRv JiBkaXNwbGF5Qm94Tm9kZUZvckNvbnRhaW5lciA9ICplbmNsb3NpbmdEaXNwbGF5Qm94Tm9kZUZv ckNvbnRhaW5lci5jaGlsZHJlbi5sYXN0KCk7Ci0gICAgYW5jZXN0b3JTdGFjay5wdXNoKGRpc3Bs YXlCb3hOb2RlRm9yQ29udGFpbmVyLCBjb250YWluZXJCb3gpOwotICAgIHJldHVybiBkaXNwbGF5 Qm94Tm9kZUZvckNvbnRhaW5lcjsKKyAgICByZXR1cm4gY3JlYXRlZERpc3BsYXlCb3hOb2RlRm9y Q29udGFpbmVyQm94QW5kUHVzaFRvQW5jZXN0b3JTdGFjayhjb250YWluZXJCb3gsIGJveGVzLnNp emUoKSAtIDEsIGVuY2xvc2luZ0Rpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVyLCBhbmNlc3RvclN0 YWNrKTsKIH0KIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3Vh bEdlb21ldHJ5Rm9yQ2hpbGROb2RlKGNvbnN0IERpc3BsYXlCb3hOb2RlJiBkaXNwbGF5Qm94Tm9k ZSwgSW5saW5lTGF5b3V0VW5pdCYgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lQm94TG9naWNhbFRvcCwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGlu ZUJveCYgbGluZUJveCkKQEAgLTQ1NCwxMSArNDU4LDkgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKICAgICAgICAgICAgIGF1dG8mIGxpbmVSdW4gPSBydW5zW3Zpc3VhbEluZGV4XTsKICAgICAg ICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKLSAgICAgICAg ICAgIGF1dG8gaXNDb250ZW50UnVuID0gIWxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpICYmICFs aW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSAmJiAhbGluZVJ1bi5pc0lubGlu ZUJveEVuZCgpICYmICFsaW5lUnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKLSAgICAgICAg ICAgIGlmICghaXNDb250ZW50UnVuKSB7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6IEFkZCBz dXBwb3J0IGZvciBpbmxpbmUgYm94ZXMgd2l0aCBubyBjb250ZW50LgorICAgICAgICAgICAgYXV0 byBuZWVkc0Rpc3BsYXlCb3ggPSAhbGluZVJ1bi5pc0lubGluZUJveEVuZCgpICYmICFsaW5lUnVu LmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKKyAgICAgICAgICAgIGlmICghbmVlZHNEaXNwbGF5 Qm94KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQogCiAgICAgICAg ICAgICBhdXRvIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdCA9IFsmXShhdXRvIGxvZ2ljYWxsUmVj dCkgewogICAgICAgICAgICAgICAgIGxvZ2ljYWxsUmVjdC5zZXRMZWZ0KGNvbnRlbnRSaWdodElu VmlzdWFsT3JkZXIpOwpAQCAtNDcxLDIwICs0NzMsMzYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKICAgICAgICAgICAgICAgICBhdXRvIHZpc3VhbFJlY3QgPSB2aXN1YWxSZWN0UmVsYXRpdmVU b1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpOwogICAgICAgICAg ICAgICAgIGFwcGVuZFRleHREaXNwbGF5Qm94KGxpbmVSdW4sIHZpc3VhbFJlY3QsIGJveGVzKTsK ICAgICAgICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IHZpc3VhbFJlY3Qu d2lkdGgoKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAobGluZVJ1bi5pc1NvZnRMaW5lQnJlYWso KSkgeworICAgICAgICAgICAgICAgIHBhcmVudERpc3BsYXlCb3hOb2RlLmFwcGVuZENoaWxkKGJv eGVzLnNpemUoKSAtIDEpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg fQorICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkpIHsKICAgICAgICAg ICAgICAgICBBU1NFUlQoIXZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxS ZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKSkud2lkdGgoKSk7CiAgICAgICAgICAgICAgICAgYXBwZW5k U29mdExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1biwgdmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290 KGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pKSwgYm94ZXMpOwotICAgICAg ICAgICAgfSBlbHNlIGlmIChsaW5lUnVuLmlzSGFyZExpbmVCcmVhaygpKSB7CisgICAgICAgICAg ICAgICAgcGFyZW50RGlzcGxheUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7 CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBp ZiAobGluZVJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgICAgIEFTU0VSVCgh dmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5lQnJlYWtC b3gobGF5b3V0Qm94KSkud2lkdGgoKSk7CiAgICAgICAgICAgICAgICAgYXBwZW5kSGFyZExpbmVC cmVha0Rpc3BsYXlCb3gobGluZVJ1biwgdmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gu bG9naWNhbFJlY3RGb3JMaW5lQnJlYWtCb3gobGF5b3V0Qm94KSksIGJveGVzKTsKLSAgICAgICAg ICAgIH0gZWxzZSBpZiAobGluZVJ1bi5pc0JveCgpKSB7CisgICAgICAgICAgICAgICAgcGFyZW50 RGlzcGxheUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7CisgICAgICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobGluZVJ1bi5p c0JveCgpKSB7CiAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5n U3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIGF1dG8gdmlz dWFsUmVjdCA9IHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxCb3JkZXJC b3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KSk7CiAgICAg ICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KGJveEdlb21ldHJ5Lm1hcmdp blN0YXJ0KCkpOwogICAgICAgICAgICAgICAgIGFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxh eUJveChsaW5lUnVuLCB2aXN1YWxSZWN0LCBib3hlcyk7CiAgICAgICAgICAgICAgICAgY29udGVu dFJpZ2h0SW5WaXN1YWxPcmRlciArPSBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpICsgdmlzdWFs UmVjdC53aWR0aCgpICsgYm94R2VvbWV0cnkubWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAg cGFyZW50RGlzcGxheUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7CisgICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobGlu ZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJv eFN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRleCwg SW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBsYXlvdXRCb3gsIFVC SURJX0RFRkFVTFRfTFRSLCB7IH0sIHsgfSwgeyB9LCB7IH0sIHRydWUsIHsgfSB9KTsKKyAgICAg ICAgICAgICAgICBjcmVhdGVkRGlzcGxheUJveE5vZGVGb3JDb250YWluZXJCb3hBbmRQdXNoVG9B bmNlc3RvclN0YWNrKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSwgYm94ZXMuc2l6 ZSgpIC0gMSwgcGFyZW50RGlzcGxheUJveE5vZGUsIGFuY2VzdG9yU3RhY2spOworICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcGFyZW50RGlzcGxh eUJveE5vZGUuYXBwZW5kQ2hpbGQoYm94ZXMuc2l6ZSgpIC0gMSk7CisgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgfQogICAgIH07CiAgICAgY3JlYXRlRGlzcGxheUJv eGVzSW5WaXN1YWxPcmRlcigpOwo=