214728 2020-07-24 04:19:45 -0700 [LFC][IFC] Remove redundant InlineFormattingContext::Quirks::lineDescentNeedsCollapsing 2020-09-02 08:40:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 215748 InRadar P2 Normal --- 215087 215752 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1674583 0 zalan 2020-07-24 04:19:45 -0700 ssia 1674584 1 405136 zalan 2020-07-24 04:27:21 -0700 Created attachment 405136 Patch 1676790 2 webkit-bug-importer 2020-07-31 04:20:15 -0700 <rdar://problem/66374693> 1682235 3 407071 zalan 2020-08-23 07:07:30 -0700 Created attachment 407071 Patch 1682236 4 zalan 2020-08-23 07:53:15 -0700 This is a transitional patch. Can't land as is. 1684821 5 zalan 2020-09-02 08:40:52 -0700 This got addressed in bug 215748 *** This bug has been marked as a duplicate of bug 215748 *** 405136 2020-07-24 04:27:21 -0700 2020-08-23 07:07:29 -0700 Patch bug-214728-20200724042721.patch text/plain 10707 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY5NGU4OWUxZWQ4ZmU0 ODg4Y2FhYmNmNmJmNjRlNDc3MzM2YjdmZS4uYjRlYjA4YTQ5N2IxNTQzYzRjYmJmNmU1ZDk2MGZh MzljZjJiNzhkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA3LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg cmVkdW5kYW50IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVEZXNjZW50TmVl ZHNDb2xsYXBzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTQ3MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBoYXZpbmcgYWN0dWFsIGlubGluZSBib3hl cyBvbiB0aGUgbGluZSB3aGVyZSB0aGVzZSBpbmxpbmUgYm94ZXMKKyAgICAgICAgc2V0IHRoZSBo ZWlnaHQgYW5kIHRoZSBiYXNlbGluZSBvZiB0aGUgY3VycmVudCBsaW5lIGJveC4KKworICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6UXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpsaW5lRGVzY2Vu dE5lZWRzQ29sbGFwc2luZyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQnVpbGRlcjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCdWlsZGVyOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIwMjAtMDctMjMgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERpc3BsYXk6Okxp bmVCb3ggZG9lcyBub3QgbmVlZCBhc2NlbnQvZGVzY2VudCBnZW9tZXRyeQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYmMxOWIyZmZiOGJhM2I3NTZjMDg3ZGJlNDQ2YzMwZjI4 MWIxNDRjYy4uY2Q2OTEwNjA3OGJmM2ExYmFiOWUwMThhODc1YmY3Y2YxYjBlY2EwMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01MCw3ICs1MCw2IEBAIHByaXZhdGU6CiAK ICAgICBjbGFzcyBRdWlya3MgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrcyB7CiAg ICAgcHVibGljOgotICAgICAgICBib29sIGxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0 IExpbmVCdWlsZGVyOjpSdW5MaXN0JikgY29uc3Q7CiAgICAgICAgIExpbmVCdWlsZGVyOjpDb25z dHJhaW50czo6SGVpZ2h0QW5kQmFzZWxpbmUgbGluZUhlaWdodENvbnN0cmFpbnRzKGNvbnN0IENv bnRhaW5lckJveCYgZm9ybWF0dGluZ1Jvb3QpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCBlMGRhM2JiY2Yz NDRiYjdhMDdjNTc4MTg2MmJjODkxOGE3NTg2ZGYwLi41ODMwODc4ODNiMzQ4N2JjZjlhYTljNGRi NmIxZTM5YmUyNTk3ZWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCkBAIC0zNCw2MSArMzQsMTYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVz cGFjZSBMYXlvdXQgewogCi1ib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6Omxp bmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmVCdWlsZGVyOjpSdW5MaXN0JiBydW5M aXN0KSBjb25zdAotewotICAgIC8vIENvbGxhcHNlIGxpbmUgZGVzY2VudCBpbiBsaW1pdGVkIGFu ZCBmdWxsIHF1aXJrIG1vZGUgd2hlbiB0aGVyZSdzIG5vIGJhc2VsaW5lIGFsaWduZWQgY29udGVu dCBvcgotICAgIC8vIHRoZSBiYXNlbGluZSBhbGlnbmVkIGNvbnRlbnQgaGFzIG5vIGRlc2NlbnQu Ci0gICAgYXV0byYgbGF5b3V0U3RhdGUgPSB0aGlzLT5sYXlvdXRTdGF0ZSgpOwotICAgIGlmICgh bGF5b3V0U3RhdGUuaW5RdWlya3NNb2RlKCkgJiYgIWxheW91dFN0YXRlLmluTGltaXRlZFF1aXJr c01vZGUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgZm9yIChhdXRvJiBydW4gOiBy dW5MaXN0KSB7Ci0gICAgICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKLSAg ICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lckVuZCgpIHx8IGxheW91dEJveC5zdHlsZSgpLnZlcnRp Y2FsQWxpZ24oKSAhPSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkKLSAgICAgICAgICAgIGNvbnRp bnVlOwotCi0gICAgICAgIGlmIChydW4uaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAgICAg IGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChs YXlvdXRCb3gpOwotICAgICAgICAgICAgaWYgKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIo KSB8fCAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRyeS5ob3Jp em9udGFsUGFkZGluZygpLnZhbHVlKCkpKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChydW4uaXNCb3go KSkgewotICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYgbGF5 b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAg ICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0YXRlLmVzdGFibGlzaGVkSW5s aW5lRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSk7Ci0g ICAgICAgICAgICAgICAgYXV0byBsYXN0TGluZUJveCA9IGZvcm1hdHRpbmdTdGF0ZS5kaXNwbGF5 SW5saW5lQ29udGVudCgpLT5saW5lQm94ZXMubGFzdCgpOwotICAgICAgICAgICAgICAgIGlmIChs YXN0TGluZUJveC5oZWlnaHQoKSA+IGxhc3RMaW5lQm94LmJhc2VsaW5lKCkpCi0gICAgICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIH0KLSAg ICByZXR1cm4gdHJ1ZTsKLX0KLQogTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzOjpIZWlnaHRBbmRC YXNlbGluZSBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3Ry YWludHMoY29uc3QgQ29udGFpbmVyQm94JiBmb3JtYXR0aW5nUm9vdCkgY29uc3QKIHsKLSAgICAv LyBjb21wdXRlZExpbmVIZWlnaHQgdGFrZXMgZm9udC1zaXplIGludG8gYWNjb3VudCB3aGVuIGxp bmUtaGVpZ2h0IGlzIG5vdCBzZXQuCi0gICAgLy8gU3RydXQgaXMgdGhlIGltYWdpbmFyeSBib3gg dGhhdCB3ZSBwdXQgb24gZXZlcnkgbGluZS4gSXQgc2V0cyB0aGUgaW5pdGlhbCB2ZXJ0aWNhbCBj b25zdHJhaW50cyBmb3IgZWFjaCBuZXcgbGluZS4KLSAgICBJbmxpbmVMYXlvdXRVbml0IHN0cnV0 SGVpZ2h0ID0gZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5jb21wdXRlZExpbmVIZWlnaHQoKTsKLSAg ICBhdXRvIHN0cnV0QmFzZWxpbmVPZmZzZXQgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRy aWNzKGZvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgc3RydXRIZWlnaHQpLmFz Y2VudCgpOwotICAgIGlmIChsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCi0gICAgICAg IHJldHVybiB7IHN0cnV0SGVpZ2h0LCBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCB7IH0gfTsKLQotICAg IGF1dG8gbGluZUhlaWdodCA9IGZvcm1hdHRpbmdSb290LnN0eWxlKCkubGluZUhlaWdodCgpOwot ICAgIGlmIChsaW5lSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7Ci0gICAgICAgIGF1 dG8gaW5pdGlhbEJhc2VsaW5lT2Zmc2V0ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmlj cyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIDBfbHUpLmFzY2VudCgpOwot ICAgICAgICByZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNlbGluZU9m ZnNldCwgSW5saW5lQm94OjpCYXNlbGluZSB7IHN0cnV0QmFzZWxpbmVPZmZzZXQsIHN0cnV0SGVp Z2h0IC0gc3RydXRCYXNlbGluZU9mZnNldCB9IH07Ci0gICAgfQotICAgIC8vIEZJWE1FOiBUaGUg b25seSByZWFzb24gd2h5IHdlIHVzZSBpbnRWYWx1ZSgpIGhlcmUgaXMgdG8gbWF0Y2ggY3VycmVu dCBpbmxpbmUgdHJlZSAoaW50ZWdyYWwpYmVoYXZpb3IuCi0gICAgSW5saW5lTGF5b3V0VW5pdCBp bml0aWFsTGluZUhlaWdodCA9IGxpbmVIZWlnaHQuaW50VmFsdWUoKTsKLSAgICBhdXRvIGluaXRp YWxCYXNlbGluZU9mZnNldCA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0 dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBpbml0aWFsTGluZUhlaWdodCkuYXNjZW50 KCk7Ci0gICAgcmV0dXJuIHsgaW5pdGlhbExpbmVIZWlnaHQsIGluaXRpYWxCYXNlbGluZU9mZnNl dCwgSW5saW5lQm94OjpCYXNlbGluZSB7IHN0cnV0QmFzZWxpbmVPZmZzZXQsIHN0cnV0SGVpZ2h0 IC0gc3RydXRCYXNlbGluZU9mZnNldCB9IH07CisgICAgSW5saW5lTGF5b3V0VW5pdCBjb21wdXRl ZExpbmVIZWlnaHQgPSBmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgp OworICAgIGF1dG8gaGFsZkxlYWRpbmdBc2NlbnQgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdN ZXRyaWNzKGZvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgY29tcHV0ZWRMaW5l SGVpZ2h0KS5hc2NlbnQoKTsKKyAgICAvLyBOZWdhdGl2ZSBsaW5lSGVpZ2h0IHZhbHVlIG1lYW5z IHRoZSBsaW5lLWhlaWdodCBpcyBub3Qgc2V0CisgICAgaWYgKGxheW91dFN0YXRlKCkuaW5Ob1F1 aXJrc01vZGUoKSB8fCAhZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5saW5lSGVpZ2h0KCkuaXNOZWdh dGl2ZSgpKQorICAgICAgICByZXR1cm4geyBjb21wdXRlZExpbmVIZWlnaHQsIGhhbGZMZWFkaW5n QXNjZW50IH07CisKKyAgICBhdXRvIHF1aXJrSGFsZkxlYWRpbmcgPSBMaW5lQnVpbGRlcjo6aGFs ZkxlYWRpbmdNZXRyaWNzKGZvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgMF9s dSk7CisgICAgcmV0dXJuIHsgcXVpcmtIYWxmTGVhZGluZy5oZWlnaHQoKSwgcXVpcmtIYWxmTGVh ZGluZy5hc2NlbnQoKSB9OwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggZDI2 MGM4YThlZjlmYmI4YWUwZmEwYmEwODVkZTE1YmMzZDRkNzBjMi4uMGE0OWM2Y2JhYThhMTcxZWRi NmFkM2Q1Nzg5NDkzN2Q3NThlNjM3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtODQs MTEgKzg0LDkgQEAgdm9pZCBMaW5lQnVpbGRlcjo6aW5pdGlhbGl6ZShjb25zdCBDb25zdHJhaW50 cyYgY29uc3RyYWludHMpCiAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTGluZUhlaWdodCA9 IDA7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsQmFzZWxpbmVPZmZzZXQgPSAwOwogICAg IGlmIChjb25zdHJhaW50cy5oZWlnaHRBbmRCYXNlbGluZSkgewotICAgICAgICBtX2luaXRpYWxT dHJ1dCA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLT5zdHJ1dDsKICAgICAgICAgaW5p dGlhbExpbmVIZWlnaHQgPSBjb25zdHJhaW50cy5oZWlnaHRBbmRCYXNlbGluZS0+aGVpZ2h0Owot ICAgICAgICBpbml0aWFsQmFzZWxpbmVPZmZzZXQgPSBjb25zdHJhaW50cy5oZWlnaHRBbmRCYXNl bGluZS0+YmFzZWxpbmVPZmZzZXQ7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1faW5pdGlhbFN0cnV0 ID0geyB9OworICAgICAgICBpbml0aWFsQmFzZWxpbmVPZmZzZXQgPSBjb25zdHJhaW50cy5oZWln aHRBbmRCYXNlbGluZS0+YmFzZWxpbmU7CisgICAgfQogCiAgICAgYXV0byBsaW5lUmVjdCA9IERp c3BsYXk6OklubGluZVJlY3QgeyBjb25zdHJhaW50cy5sb2dpY2FsVG9wTGVmdCwgMF9sdSwgaW5p dGlhbExpbmVIZWlnaHQgfTsKICAgICBhdXRvIGJhc2VsaW5lID0gSW5saW5lQm94OjpCYXNlbGlu ZSB7IGluaXRpYWxCYXNlbGluZU9mZnNldCwgaW5pdGlhbExpbmVIZWlnaHQgLSBpbml0aWFsQmFz ZWxpbmVPZmZzZXQgfTsKQEAgLTEyMywxMSArMTIxLDYgQEAgTGluZUJ1aWxkZXI6OlJ1bkxpc3Qg TGluZUJ1aWxkZXI6OmNsb3NlKElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCBpc0xhc3RMaW5l V2kKICAgICAgICAgbV9saW5lQm94LnJlc2V0QmFzZWxpbmUoKTsKICAgICAgICAgbV9saW5lQm94 LnNldExvZ2ljYWxIZWlnaHQoeyB9KTsKICAgICB9Ci0gICAgLy8gUmVtb3ZlIGRlc2NlbnQgd2hl biBhbGwgY29udGVudCBpcyBiYXNlbGluZSBhbGlnbmVkIGJ1dCBub25lIG9mIHRoZW0gaGF2ZSBk ZXNjZW50LgotICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygpLmxpbmVEZXNjZW50 TmVlZHNDb2xsYXBzaW5nKG1fcnVucykpIHsKLSAgICAgICAgbV9saW5lQm94LnNocmlua1ZlcnRp Y2FsbHkobV9saW5lQm94LmJhc2VsaW5lKCkuZGVzY2VudCgpKTsKLSAgICAgICAgbV9saW5lQm94 LnJlc2V0RGVzY2VudCgpOwotICAgIH0KICAgICBhbGlnbkNvbnRlbnRWZXJ0aWNhbGx5KCk7CiAg ICAgYWxpZ25Ib3Jpem9udGFsbHkoaGFuZ2luZ0NvbnRlbnQsIGlzTGFzdExpbmVXaXRoSW5saW5l Q29udGVudCk7CiAgICAgcmV0dXJuIFdURk1vdmUobV9ydW5zKTsKQEAgLTU2MiwxMCArNTU1LDYg QEAgdm9pZCBMaW5lQnVpbGRlcjo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KCkKICAgICAg ICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAg Ly8gRm9yIHRleHQgY29udGVudCB3ZSBzZXQgdGhlIGJhc2VsaW5lIGVpdGhlciB0aHJvdWdoIHRo ZSBpbml0aWFsIHN0cnV0IChzZXQgYnkgdGhlIGZvcm1hdHRpbmcgY29udGV4dCByb290KSBvcgog ICAgICAgICAgICAgLy8gdGhyb3VnaCB0aGUgaW5saW5lIGNvbnRhaW5lciAoc3RhcnQpLiBOb3Jt YWxseSB0aGUgdGV4dCBjb250ZW50IGl0c2VsZiBkb2VzIG5vdCBzdHJldGNoIHRoZSBsaW5lLgot ICAgICAgICAgICAgaWYgKCFtX2luaXRpYWxTdHJ1dCkgewotICAgICAgICAgICAgICAgIC8vIFdl IGFyZSBpbiBzdGFuZGFyZHMgbW9kZSB3aGVyZSB0aGUgYmFzZWxpbmUgYW5kIGxpbmUgaGVpZ2h0 IGFyZSBleHBsaWN0LgotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQog ICAgICAgICAgICAgaWYgKGlubGluZUNvbnRhaW5lck5lc3RpbmdMZXZlbCkgewogICAgICAgICAg ICAgICAgIC8vIFdlJ3ZlIGFscmVhZHkgYWRqdXN0ZWQgdGhlIGxpbmUgaGVpZ2h0L2Jhc2VsaW5l IHRocm91Z2ggdGhlIHBhcmVudCBpbmxpbmUgY29udGFpbmVyLiAKICAgICAgICAgICAgICAgICBj b250aW51ZTsKQEAgLTU3Nyw5ICs1NjYsMTAgQEAgdm9pZCBMaW5lQnVpbGRlcjo6YWRqdXN0QmFz ZWxpbmVBbmRMaW5lSGVpZ2h0KCkKICAgICAgICAgICAgIGhhc1NlZW5EaXJlY3RUZXh0T3JMaW5l QnJlYWsgPSB0cnVlOwogICAgICAgICAgICAgLy8gV2UgYXJlIGluIHF1aXJrcyBtb2RlIHdoZXJl IHRoZSBmb250LW1ldHJpY3MgbWlnaHQgY2hhbmdlIHRoZSBsaW5lIGxpbmUgaGVpZ2h0L2Jhc2Vs aW5lIGFuZCB0aGlzIGlzIHRoZSBmaXJzdCB0ZXh0IGNvbnRlbnQgb24gdGhlIGxpbmUKICAgICAg ICAgICAgIC8vIG91dHNpZGUgb2YgYW4gaW5saW5lIGNvbnRhaW5lci4KLSAgICAgICAgICAgIG1f bGluZUJveC5zZXRBc2NlbnRJZkdyZWF0ZXIobV9pbml0aWFsU3RydXQtPmFzY2VudCgpKTsKLSAg ICAgICAgICAgIG1fbGluZUJveC5zZXREZXNjZW50SWZHcmVhdGVyKG1faW5pdGlhbFN0cnV0LT5k ZXNjZW50KCkpOwotICAgICAgICAgICAgbV9saW5lQm94LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0 ZXIobV9pbml0aWFsU3RydXQtPmhlaWdodCgpKTsKKyAgICAgICAgICAgIGF1dG8gaGFsZkxlYWRp bmcgPSBoYWxmTGVhZGluZ01ldHJpY3Moc3R5bGUuZm9udE1ldHJpY3MoKSwgc3R5bGUuY29tcHV0 ZWRMaW5lSGVpZ2h0KCkpOworICAgICAgICAgICAgbV9saW5lQm94LnNldEFzY2VudElmR3JlYXRl cihoYWxmTGVhZGluZy5hc2NlbnQoKSk7CisgICAgICAgICAgICBtX2xpbmVCb3guc2V0RGVzY2Vu dElmR3JlYXRlcihoYWxmTGVhZGluZy5kZXNjZW50KCkpOworICAgICAgICAgICAgbV9saW5lQm94 LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIoaGFsZkxlYWRpbmcuaGVpZ2h0KCkpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggYjkz NmRlYmIwYjY1ZDZkOTlkMmMzODU0MjJmNWNhY2E2MTM2MzBlOC4uODY3ZTgyNmM1YmVhOTIwOTVm YjMwNTM3Y2ZkMGY5YWNmOTI5MzZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC00OSw4ICs0 OSw3IEBAIHB1YmxpYzoKICAgICAgICAgYm9vbCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgeyBm YWxzZSB9OwogICAgICAgICBzdHJ1Y3QgSGVpZ2h0QW5kQmFzZWxpbmUgewogICAgICAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBoZWlnaHQgeyAwIH07Ci0gICAgICAgICAgICBJbmxpbmVMYXlvdXRV bml0IGJhc2VsaW5lT2Zmc2V0IHsgMCB9OwotICAgICAgICAgICAgT3B0aW9uYWw8SW5saW5lQm94 OjpCYXNlbGluZT4gc3RydXQ7CisgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5l IHsgMCB9OwogICAgICAgICB9OwogICAgICAgICBPcHRpb25hbDxIZWlnaHRBbmRCYXNlbGluZT4g aGVpZ2h0QW5kQmFzZWxpbmU7CiAgICAgfTsKQEAgLTIxOSw3ICsyMTgsNiBAQCBwcml2YXRlOgog ICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250 ZXh0OwogICAgIFJ1bkxpc3QgbV9ydW5zOwogICAgIFRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCBt X3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudDsKLSAgICBPcHRpb25hbDxJbmxpbmVCb3g6OkJhc2Vs aW5lPiBtX2luaXRpYWxTdHJ1dDsKICAgICBJbmxpbmVMYXlvdXRVbml0IG1fbGluZUxvZ2ljYWxX aWR0aCB7IDAgfTsKICAgICBPcHRpb25hbDxUZXh0QWxpZ25Nb2RlPiBtX2hvcml6b250YWxBbGln bm1lbnQ7CiAgICAgYm9vbCBtX2lzSW50cmluc2ljU2l6aW5nIHsgZmFsc2UgfTsK 407071 2020-08-23 07:07:30 -0700 2020-08-23 07:11:34 -0700 Patch bug-214728-20200823070730.patch text/plain 10697 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ5NjNhMzE0ZDU5MDgy NWQ4Y2M5MDk1MTExM2RkZmI4ZDMwZWUzYy4uMzBkODg3MzJmMDI3MTZkZWY1MmZkMDRlMjhjNDUz M2Q5ZTY0YzVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA4LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg cmVkdW5kYW50IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVEZXNjZW50TmVl ZHNDb2xsYXBzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTQ3MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBoYXZpbmcgYWN0dWFsIGlubGluZSBib3hl cyBvbiB0aGUgbGluZSB3aGVyZSB0aGVzZSBpbmxpbmUgYm94ZXMKKyAgICAgICAgc2V0IHRoZSBo ZWlnaHQgYW5kIHRoZSBiYXNlbGluZSBvZiB0aGUgY3VycmVudCBsaW5lIGJveC4KKworICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6UXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpsaW5lRGVzY2Vu dE5lZWRzQ29sbGFwc2luZyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQnVpbGRlcjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCdWlsZGVyOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisKIDIwMjAtMDgtMjMgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERpc3BsYXk6Okxp bmVCb3ggZG9lcyBub3QgbmVlZCBhc2NlbnQvZGVzY2VudCBnZW9tZXRyeQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYmMxOWIyZmZiOGJhM2I3NTZjMDg3ZGJlNDQ2YzMwZjI4 MWIxNDRjYy4uY2Q2OTEwNjA3OGJmM2ExYmFiOWUwMThhODc1YmY3Y2YxYjBlY2EwMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01MCw3ICs1MCw2IEBAIHByaXZhdGU6CiAK ICAgICBjbGFzcyBRdWlya3MgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrcyB7CiAg ICAgcHVibGljOgotICAgICAgICBib29sIGxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0 IExpbmVCdWlsZGVyOjpSdW5MaXN0JikgY29uc3Q7CiAgICAgICAgIExpbmVCdWlsZGVyOjpDb25z dHJhaW50czo6SGVpZ2h0QW5kQmFzZWxpbmUgbGluZUhlaWdodENvbnN0cmFpbnRzKGNvbnN0IENv bnRhaW5lckJveCYgZm9ybWF0dGluZ1Jvb3QpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCBjNjY2MDY4MzU1 MmNhYWMwOTA4NjI3YzRiYmY4YzllYTUzM2FmZjNmLi41ODMwODc4ODNiMzQ4N2JjZjlhYTljNGRi NmIxZTM5YmUyNTk3ZWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCkBAIC0zNCw2MSArMzQsMTYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVz cGFjZSBMYXlvdXQgewogCi1ib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6Omxp bmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmVCdWlsZGVyOjpSdW5MaXN0JiBydW5M aXN0KSBjb25zdAotewotICAgIC8vIENvbGxhcHNlIGxpbmUgZGVzY2VudCBpbiBsaW1pdGVkIGFu ZCBmdWxsIHF1aXJrIG1vZGUgd2hlbiB0aGVyZSdzIG5vIGJhc2VsaW5lIGFsaWduZWQgY29udGVu dCBvcgotICAgIC8vIHRoZSBiYXNlbGluZSBhbGlnbmVkIGNvbnRlbnQgaGFzIG5vIGRlc2NlbnQu Ci0gICAgYXV0byYgbGF5b3V0U3RhdGUgPSB0aGlzLT5sYXlvdXRTdGF0ZSgpOwotICAgIGlmICgh bGF5b3V0U3RhdGUuaW5RdWlya3NNb2RlKCkgJiYgIWxheW91dFN0YXRlLmluTGltaXRlZFF1aXJr c01vZGUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgZm9yIChhdXRvJiBydW4gOiBy dW5MaXN0KSB7Ci0gICAgICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKLSAg ICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lckVuZCgpIHx8IGxheW91dEJveC5zdHlsZSgpLnZlcnRp Y2FsQWxpZ24oKSAhPSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkKLSAgICAgICAgICAgIGNvbnRp bnVlOwotCi0gICAgICAgIGlmIChydW4uaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAgICAg IGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChs YXlvdXRCb3gpOwotICAgICAgICAgICAgaWYgKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIo KSB8fCAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRyeS5ob3Jp em9udGFsUGFkZGluZygpLnZhbHVlKCkpKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChydW4uaXNCb3go KSkgewotICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYgbGF5 b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAg ICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0YXRlLmVzdGFibGlzaGVkSW5s aW5lRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSk7Ci0g ICAgICAgICAgICAgICAgYXV0byBsYXN0TGluZUJveCA9IGZvcm1hdHRpbmdTdGF0ZS5kaXNwbGF5 SW5saW5lQ29udGVudCgpLT5saW5lQm94ZXMubGFzdCgpOwotICAgICAgICAgICAgICAgIGlmIChs YXN0TGluZUJveC5oZWlnaHQoKSA+IGxhc3RMaW5lQm94LmJhc2VsaW5lKCkpCi0gICAgICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIH0KLSAg ICByZXR1cm4gdHJ1ZTsKLX0KLQogTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzOjpIZWlnaHRBbmRC YXNlbGluZSBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3Ry YWludHMoY29uc3QgQ29udGFpbmVyQm94JiBmb3JtYXR0aW5nUm9vdCkgY29uc3QKIHsKLSAgICAv LyBjb21wdXRlZExpbmVIZWlnaHQgdGFrZXMgZm9udC1zaXplIGludG8gYWNjb3VudCB3aGVuIGxp bmUtaGVpZ2h0IGlzIG5vdCBzZXQuCi0gICAgLy8gU3RydXQgaXMgdGhlIGltYWdpbmFyeSBib3gg dGhhdCB3ZSBwdXQgb24gZXZlcnkgbGluZS4gSXQgc2V0cyB0aGUgaW5pdGlhbCB2ZXJ0aWNhbCBj b25zdHJhaW50cyBmb3IgZWFjaCBuZXcgbGluZS4KLSAgICBJbmxpbmVMYXlvdXRVbml0IHN0cnV0 SGVpZ2h0ID0gZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5jb21wdXRlZExpbmVIZWlnaHQoKTsKLSAg ICBhdXRvIHN0cnV0QmFzZWxpbmVPZmZzZXQgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRy aWNzKGZvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgc3RydXRIZWlnaHQpLmFz Y2VudCgpOwotICAgIGlmIChsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkpCi0gICAgICAg IHJldHVybiB7IHN0cnV0SGVpZ2h0LCBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCB7IH0gfTsKLQotICAg IGF1dG8gbGluZUhlaWdodCA9IGZvcm1hdHRpbmdSb290LnN0eWxlKCkubGluZUhlaWdodCgpOwot ICAgIGlmIChsaW5lSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7Ci0gICAgICAgIGF1 dG8gaW5pdGlhbEJhc2VsaW5lT2Zmc2V0ID0gTGluZUJ1aWxkZXI6OmhhbGZMZWFkaW5nTWV0cmlj cyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIDBfbHUpLmFzY2VudCgpOwot ICAgICAgICByZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNlbGluZU9m ZnNldCwgTGluZUJveDo6QmFzZWxpbmUgeyBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhlaWdo dCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQgfSB9OwotICAgIH0KLSAgICAvLyBGSVhNRTogVGhlIG9u bHkgcmVhc29uIHdoeSB3ZSB1c2UgaW50VmFsdWUoKSBoZXJlIGlzIHRvIG1hdGNoIGN1cnJlbnQg aW5saW5lIHRyZWUgKGludGVncmFsKWJlaGF2aW9yLgotICAgIElubGluZUxheW91dFVuaXQgaW5p dGlhbExpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0LmludFZhbHVlKCk7Ci0gICAgYXV0byBpbml0aWFs QmFzZWxpbmVPZmZzZXQgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdNZXRyaWNzKGZvcm1hdHRp bmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgaW5pdGlhbExpbmVIZWlnaHQpLmFzY2VudCgp OwotICAgIHJldHVybiB7IGluaXRpYWxMaW5lSGVpZ2h0LCBpbml0aWFsQmFzZWxpbmVPZmZzZXQs IExpbmVCb3g6OkJhc2VsaW5lIHsgc3RydXRCYXNlbGluZU9mZnNldCwgc3RydXRIZWlnaHQgLSBz dHJ1dEJhc2VsaW5lT2Zmc2V0IH0gfTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkTGlu ZUhlaWdodCA9IGZvcm1hdHRpbmdSb290LnN0eWxlKCkuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7Cisg ICAgYXV0byBoYWxmTGVhZGluZ0FzY2VudCA9IExpbmVCdWlsZGVyOjpoYWxmTGVhZGluZ01ldHJp Y3MoZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBjb21wdXRlZExpbmVIZWln aHQpLmFzY2VudCgpOworICAgIC8vIE5lZ2F0aXZlIGxpbmVIZWlnaHQgdmFsdWUgbWVhbnMgdGhl IGxpbmUtaGVpZ2h0IGlzIG5vdCBzZXQKKyAgICBpZiAobGF5b3V0U3RhdGUoKS5pbk5vUXVpcmtz TW9kZSgpIHx8ICFmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmxpbmVIZWlnaHQoKS5pc05lZ2F0aXZl KCkpCisgICAgICAgIHJldHVybiB7IGNvbXB1dGVkTGluZUhlaWdodCwgaGFsZkxlYWRpbmdBc2Nl bnQgfTsKKworICAgIGF1dG8gcXVpcmtIYWxmTGVhZGluZyA9IExpbmVCdWlsZGVyOjpoYWxmTGVh ZGluZ01ldHJpY3MoZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCAwX2x1KTsK KyAgICByZXR1cm4geyBxdWlya0hhbGZMZWFkaW5nLmhlaWdodCgpLCBxdWlya0hhbGZMZWFkaW5n LmFzY2VudCgpIH07CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBhZDgzNjI3 ZWZlOTJhZWIyNDVlNGY4NzdlYTE5Mzc5ZGQ0ZWQ5NGVmLi43Y2QyZTIxOTRkMTI3OTBhM2ZmNTU1 ZDZkNTI1YjBjMmNkMzQxOGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC04NCwxMSAr ODQsOSBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IENvbnN0cmFpbnRzJiBj b25zdHJhaW50cykKICAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxMaW5lSGVpZ2h0ID0gMDsK ICAgICBJbmxpbmVMYXlvdXRVbml0IGluaXRpYWxCYXNlbGluZU9mZnNldCA9IDA7CiAgICAgaWYg KGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lKSB7Ci0gICAgICAgIG1faW5pdGlhbFN0cnV0 ID0gY29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUtPnN0cnV0OwogICAgICAgICBpbml0aWFs TGluZUhlaWdodCA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLT5oZWlnaHQ7Ci0gICAg ICAgIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IGNvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5l LT5iYXNlbGluZU9mZnNldDsKLSAgICB9IGVsc2UKLSAgICAgICAgbV9pbml0aWFsU3RydXQgPSB7 IH07CisgICAgICAgIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IGNvbnN0cmFpbnRzLmhlaWdodEFu ZEJhc2VsaW5lLT5iYXNlbGluZTsKKyAgICB9CiAKICAgICBhdXRvIGxpbmVSZWN0ID0gRGlzcGxh eTo6SW5saW5lUmVjdCB7IGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3BMZWZ0LCAwX2x1LCBpbml0aWFs TGluZUhlaWdodCB9OwogICAgIGF1dG8gYmFzZWxpbmUgPSBMaW5lQm94OjpCYXNlbGluZSB7IGlu aXRpYWxCYXNlbGluZU9mZnNldCwgaW5pdGlhbExpbmVIZWlnaHQgLSBpbml0aWFsQmFzZWxpbmVP ZmZzZXQgfTsKQEAgLTEyMywxMSArMTIxLDYgQEAgTGluZUJ1aWxkZXI6OlJ1bkxpc3QgTGluZUJ1 aWxkZXI6OmNsb3NlKElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCBpc0xhc3RMaW5lV2kKICAg ICAgICAgbV9saW5lQm94LnJlc2V0QmFzZWxpbmUoKTsKICAgICAgICAgbV9saW5lQm94LnNldExv Z2ljYWxIZWlnaHQoeyB9KTsKICAgICB9Ci0gICAgLy8gUmVtb3ZlIGRlc2NlbnQgd2hlbiBhbGwg Y29udGVudCBpcyBiYXNlbGluZSBhbGlnbmVkIGJ1dCBub25lIG9mIHRoZW0gaGF2ZSBkZXNjZW50 LgotICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygpLmxpbmVEZXNjZW50TmVlZHND b2xsYXBzaW5nKG1fcnVucykpIHsKLSAgICAgICAgbV9saW5lQm94LnNocmlua1ZlcnRpY2FsbHko bV9saW5lQm94LmJhc2VsaW5lKCkuZGVzY2VudCgpKTsKLSAgICAgICAgbV9saW5lQm94LnJlc2V0 RGVzY2VudCgpOwotICAgIH0KICAgICBhbGlnbkNvbnRlbnRWZXJ0aWNhbGx5KCk7CiAgICAgYWxp Z25Ib3Jpem9udGFsbHkoaGFuZ2luZ0NvbnRlbnQsIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVu dCk7CiAgICAgcmV0dXJuIFdURk1vdmUobV9ydW5zKTsKQEAgLTU2MiwxMCArNTU1LDYgQEAgdm9p ZCBMaW5lQnVpbGRlcjo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KCkKICAgICAgICAgaWYg KHJ1bi5pc1RleHQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgLy8gRm9y IHRleHQgY29udGVudCB3ZSBzZXQgdGhlIGJhc2VsaW5lIGVpdGhlciB0aHJvdWdoIHRoZSBpbml0 aWFsIHN0cnV0IChzZXQgYnkgdGhlIGZvcm1hdHRpbmcgY29udGV4dCByb290KSBvcgogICAgICAg ICAgICAgLy8gdGhyb3VnaCB0aGUgaW5saW5lIGNvbnRhaW5lciAoc3RhcnQpLiBOb3JtYWxseSB0 aGUgdGV4dCBjb250ZW50IGl0c2VsZiBkb2VzIG5vdCBzdHJldGNoIHRoZSBsaW5lLgotICAgICAg ICAgICAgaWYgKCFtX2luaXRpYWxTdHJ1dCkgewotICAgICAgICAgICAgICAgIC8vIFdlIGFyZSBp biBzdGFuZGFyZHMgbW9kZSB3aGVyZSB0aGUgYmFzZWxpbmUgYW5kIGxpbmUgaGVpZ2h0IGFyZSBl eHBsaWN0LgotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQogICAgICAg ICAgICAgaWYgKGlubGluZUNvbnRhaW5lck5lc3RpbmdMZXZlbCkgewogICAgICAgICAgICAgICAg IC8vIFdlJ3ZlIGFscmVhZHkgYWRqdXN0ZWQgdGhlIGxpbmUgaGVpZ2h0L2Jhc2VsaW5lIHRocm91 Z2ggdGhlIHBhcmVudCBpbmxpbmUgY29udGFpbmVyLiAKICAgICAgICAgICAgICAgICBjb250aW51 ZTsKQEAgLTU3Nyw5ICs1NjYsMTAgQEAgdm9pZCBMaW5lQnVpbGRlcjo6YWRqdXN0QmFzZWxpbmVB bmRMaW5lSGVpZ2h0KCkKICAgICAgICAgICAgIGhhc1NlZW5EaXJlY3RUZXh0T3JMaW5lQnJlYWsg PSB0cnVlOwogICAgICAgICAgICAgLy8gV2UgYXJlIGluIHF1aXJrcyBtb2RlIHdoZXJlIHRoZSBm b250LW1ldHJpY3MgbWlnaHQgY2hhbmdlIHRoZSBsaW5lIGxpbmUgaGVpZ2h0L2Jhc2VsaW5lIGFu ZCB0aGlzIGlzIHRoZSBmaXJzdCB0ZXh0IGNvbnRlbnQgb24gdGhlIGxpbmUKICAgICAgICAgICAg IC8vIG91dHNpZGUgb2YgYW4gaW5saW5lIGNvbnRhaW5lci4KLSAgICAgICAgICAgIG1fbGluZUJv eC5zZXRBc2NlbnRJZkdyZWF0ZXIobV9pbml0aWFsU3RydXQtPmFzY2VudCgpKTsKLSAgICAgICAg ICAgIG1fbGluZUJveC5zZXREZXNjZW50SWZHcmVhdGVyKG1faW5pdGlhbFN0cnV0LT5kZXNjZW50 KCkpOwotICAgICAgICAgICAgbV9saW5lQm94LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIobV9p bml0aWFsU3RydXQtPmhlaWdodCgpKTsKKyAgICAgICAgICAgIGF1dG8gaGFsZkxlYWRpbmcgPSBo YWxmTGVhZGluZ01ldHJpY3Moc3R5bGUuZm9udE1ldHJpY3MoKSwgc3R5bGUuY29tcHV0ZWRMaW5l SGVpZ2h0KCkpOworICAgICAgICAgICAgbV9saW5lQm94LnNldEFzY2VudElmR3JlYXRlcihoYWxm TGVhZGluZy5hc2NlbnQoKSk7CisgICAgICAgICAgICBtX2xpbmVCb3guc2V0RGVzY2VudElmR3Jl YXRlcihoYWxmTGVhZGluZy5kZXNjZW50KCkpOworICAgICAgICAgICAgbV9saW5lQm94LnNldExv Z2ljYWxIZWlnaHRJZkdyZWF0ZXIoaGFsZkxlYWRpbmcuaGVpZ2h0KCkpOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggODQ5NmVjMGY5 NzU5MGFiZDFkNzVmYzJjMjU0OGE4ZmZiM2NkZGRjMC4uMGIyYWE1NmYyM2JkZjZmN2M5ZGNhY2Q5 N2NhOGZmMzI4YzQ0Y2Q3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC00OSw4ICs0OSw3IEBA IHB1YmxpYzoKICAgICAgICAgYm9vbCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgeyBmYWxzZSB9 OwogICAgICAgICBzdHJ1Y3QgSGVpZ2h0QW5kQmFzZWxpbmUgewogICAgICAgICAgICAgSW5saW5l TGF5b3V0VW5pdCBoZWlnaHQgeyAwIH07Ci0gICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGJh c2VsaW5lT2Zmc2V0IHsgMCB9OwotICAgICAgICAgICAgT3B0aW9uYWw8TGluZUJveDo6QmFzZWxp bmU+IHN0cnV0OworICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSB7IDAgfTsK ICAgICAgICAgfTsKICAgICAgICAgT3B0aW9uYWw8SGVpZ2h0QW5kQmFzZWxpbmU+IGhlaWdodEFu ZEJhc2VsaW5lOwogICAgIH07CkBAIC0yMTksNyArMjE4LDYgQEAgcHJpdmF0ZToKICAgICBjb25z dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKICAg ICBSdW5MaXN0IG1fcnVuczsKICAgICBUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgbV90cmltbWFi bGVUcmFpbGluZ0NvbnRlbnQ7Ci0gICAgT3B0aW9uYWw8TGluZUJveDo6QmFzZWxpbmU+IG1faW5p dGlhbFN0cnV0OwogICAgIElubGluZUxheW91dFVuaXQgbV9saW5lTG9naWNhbFdpZHRoIHsgMCB9 OwogICAgIE9wdGlvbmFsPFRleHRBbGlnbk1vZGU+IG1faG9yaXpvbnRhbEFsaWdubWVudDsKICAg ICBib29sIG1faXNJbnRyaW5zaWNTaXppbmcgeyBmYWxzZSB9Owo=