215168 2020-08-05 08:25:09 -0700 [LFC][IFC] Start constructing InlineBoxes for inline runs 2020-09-02 08:37:27 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215752 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1677941 0 zalan 2020-08-05 08:25:09 -0700 ssia 1677943 1 406003 zalan 2020-08-05 08:35:56 -0700 Created attachment 406003 Patch 1679732 2 webkit-bug-importer 2020-08-12 08:26:15 -0700 <rdar://problem/66909869> 1683626 3 407465 zalan 2020-08-28 06:39:26 -0700 Created attachment 407465 Patch 1684817 4 ews-feeder 2020-09-02 08:37:26 -0700 Committed r266462: <https://trac.webkit.org/changeset/266462> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407465. 406003 2020-08-05 08:35:56 -0700 2020-08-28 06:39:24 -0700 Patch bug-215168-20200805083555.patch text/plain 11324 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYwOThlZThiYjZiYzk3 ZGRhZmJhODQ2YmNmOGNiMWE3OGYxMzFjNy4uMmUxNWJhNzhmMWQ0OGFkZDI4MTNlYzQ2YzJiMjBl MDFkYzkwOWY2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA4LTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBTdGFydCBj b25zdHJ1Y3RpbmcgSW5saW5lQm94ZXMgZm9yIGlubGluZSBydW5zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxNjgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZv ciBhbGlnbmluZyB0aGUgSW5saW5lQm94ZXMgaW5zaWRlIHRoZSBMaW5lQm94IGluc3RlYWQgb2Yg dGhlIHJ1bnMgaXRzZWxmLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZSk6CisgICAgICAgICog bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQm94OjpyZWN0Rm9yUnVuIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveDo6YWxpZ25Ib3Jpem9udGFsbHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94OjphbGlnblZlcnRpY2FsbHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94OjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQm94OjppbmxpbmVSZWN0TGlzdCBjb25zdCk6IERlbGV0ZWQuCisKIDIwMjAtMDgtMDMg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1v dmUgaW5saW5lIGFsaWdubWVudCBjb2RlIHRvIExpbmVCb3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcAppbmRleCAwMWI4OGQzZWRkYTJkMDk2MzI4NmU5ZGM2NWQ5ZjY1NTgzYmRh OWZiLi5mNzE2YzUxMmE4OTdmNGJlYTNkMjAxYzUwNjBlOWJhM2YyM2M0ZWI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC01MDksMTEgKzUwOSw4IEBAIHZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUoY29uc3QgTGluZUxh eW91dENvbnRleHQ6OkxpCiAgICAgYXV0byBsaW5lSW5kZXggPSBpbmxpbmVDb250ZW50LmxpbmVC b3hlcy5zaXplKCk7CiAgICAgYXV0byBsaW5lSW5rT3ZlcmZsb3cgPSBsaW5lQm94LnNjcm9sbGFi bGVPdmVyZmxvdygpOwogICAgIC8vIENvbXB1dGUgYm94IGZpbmFsIGdlb21ldHJ5LgotICAgIGF1 dG8mIHJ1blJlY3RMaXN0ID0gbGluZUJveC5pbmxpbmVSZWN0TGlzdCgpOwotICAgIGF1dG8mIGxp bmVSdW5zID0gbGluZUNvbnRlbnQucnVuczsKLSAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGlu ZGV4IDwgbGluZVJ1bnMuc2l6ZSgpOyArK2luZGV4KSB7Ci0gICAgICAgIGF1dG8mIGxpbmVSdW4g PSBsaW5lUnVucy5hdChpbmRleCk7Ci0gICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBydW5SZWN0 TGlzdFtpbmRleF07CisgICAgZm9yIChhdXRvJiBsaW5lUnVuIDogbGluZUNvbnRlbnQucnVucykg eworICAgICAgICBhdXRvJiBsb2dpY2FsUmVjdCA9IGxpbmVCb3gucmVjdEZvclJ1bihsaW5lUnVu KTsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKIAogICAg ICAgICAvLyBBZGQgZmluYWwgZGlzcGxheSBydW5zIHRvIHN0YXRlIGZpcnN0LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 LmNwcAppbmRleCBhNTIxNmY3ZGE3NjkxMGI4ODI4MjU0OWMyYzY3MWMyNGFkNzMwNDdjLi42YWVh ZmUzYTM0OWQ3MTk3NWIxZjI3MjU2MTkzMTA3MjlkNjFmOTllIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApA QCAtNTYsNiArNTYsNyBAQCBMaW5lQm94OjpMaW5lQm94KGNvbnN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgY29uc3QgRAogICAgIDogbV9pbmxpbmVG b3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKICAgICAsIG1fcnVucyhy dW5zKQogICAgICwgbV9yZWN0KGxpbmVSZWN0KQorICAgICwgbV9yb290SW5saW5lQm94KElubGlu ZUJveCB7IGxpbmVSZWN0LCB7IH0sIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LnJvb3QoKSB9KQog ewogI2lmIEFTU0VSVF9FTkFCTEVECiAgICAgbV9oYXNWYWxpZEFsaWdubWVudEJhc2VsaW5lID0g dHJ1ZTsKQEAgLTYzLDggKzY0LDggQEAgTGluZUJveDo6TGluZUJveChjb25zdCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0IEQKICAgICBhdXRv JiByb290U3R5bGUgPSBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5yb290KCkuc3R5bGUoKTsKICAg ICBhdXRvIGhhbGZMZWFkaW5nTWV0cmljcyA9IHRoaXMtPmhhbGZMZWFkaW5nTWV0cmljcyhyb290 U3R5bGUuZm9udE1ldHJpY3MoKSwgbGluZVJlY3QuaGVpZ2h0KCkpOwogCisgICAgbV9yb290SW5s aW5lQm94LmFzY2VudEFuZERlc2NlbnQgPSBoYWxmTGVhZGluZ01ldHJpY3M7CiAgICAgbV9hbGln bm1lbnRCYXNlbGluZSA9IGhhbGZMZWFkaW5nTWV0cmljcy5hc2NlbnQ7Ci0gICAgbV9yb290SW5s aW5lQm94ID0gSW5saW5lQm94IHsgaGFsZkxlYWRpbmdNZXRyaWNzIH07CiAKICAgICBhdXRvIGNv bnRlbnRMb2dpY2FsV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICBmb3IgKGF1dG8m IHJ1biA6IG1fcnVucykgewpAQCAtODQsNyArODUsOCBAQCBMaW5lQm94OjpMaW5lQm94KGNvbnN0 IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgY29uc3Qg RAogICAgICAgICAgICAgLy8gTm9uLXJlcGxhY2VkIGlubGluZSBib3ggKGUuZy4gaW5saW5lLWJs b2NrKS4gSXQgbG9va3MgYSBiaXQgbWlzbGVhZGluZyBidXQgdGhlaXIgbWFyZ2luIGJveCBpcyBj b25zaWRlcmVkIHRoZSBjb250ZW50IGhlaWdodCBoZXJlLgogICAgICAgICAgICAgcmV0dXJuIGJv eEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwogICAgICAgICB9OwotICAgICAgICBtX3J1blJl Y3RMaXN0LmFwcGVuZCh7IDAsIHJ1bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFdpZHRoKCks IHJ1bkhlaWdodCgpIH0pOworICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyB0ZW1wb3JhcnkuIERv IG5vdCBtYWtlIGFuIGlubGluZSBib3ggZm9yIGVhY2ggcnVuLgorICAgICAgICBtX2lubGluZUJv eExpc3QuYXBwZW5kKElubGluZUJveCB7IHsgMCwgcnVuLmxvZ2ljYWxMZWZ0KCksIHJ1bi5sb2dp Y2FsV2lkdGgoKSwgcnVuSGVpZ2h0KCkgfSwgaGFsZkxlYWRpbmdNZXRyaWNzLCBydW4ubGF5b3V0 Qm94KCkgfSk7CiAgICAgICAgIGNvbnRlbnRMb2dpY2FsV2lkdGggKz0gcnVuLmxvZ2ljYWxXaWR0 aCgpOwogICAgIH0KICAgICBhbGlnblZlcnRpY2FsbHkoKTsKQEAgLTk2LDYgKzk4LDExIEBAIExp bmVCb3g6OkxpbmVCb3goY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1h dHRpbmdDb250ZXh0LCBjb25zdCBECiAgICAgfQogfQogCitjb25zdCBEaXNwbGF5OjpJbmxpbmVS ZWN0JiBMaW5lQm94OjpyZWN0Rm9yUnVuKGNvbnN0IExpbmVCdWlsZGVyOjpSdW4mIHJ1bikgY29u c3QKK3sKKyAgICByZXR1cm4gbV9pbmxpbmVCb3hMaXN0W21fcnVuVG9JbmxpbmVCb3hNYXAuZ2V0 KCZydW4pXS5yZWN0OworfQorCiB2b2lkIExpbmVCb3g6OmFsaWduSG9yaXpvbnRhbGx5KElubGlu ZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCBp c0xhc3RMaW5lKQogewogICAgIGF1dG8gaGFuZ2luZ0NvbnRlbnQgPSBjb2xsZWN0SGFuZ2luZ0Nv bnRlbnQoaXNMYXN0TGluZSk7CkBAIC0xMTgsNyArMTI1LDcgQEAgdm9pZCBMaW5lQm94OjphbGln bkhvcml6b250YWxseShJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBJc0xhc3RMaW5l V2l0aEkKICAgICBpZiAoY29tcHV0ZWRIb3Jpem9udGFsQWxpZ25tZW50ID09IFRleHRBbGlnbk1v ZGU6Okp1c3RpZnkpIHsKICAgICAgICAgYXV0byBhY2N1bXVsYXRlZEV4cGFuc2lvbiA9IElubGlu ZUxheW91dFVuaXQgeyB9OwogICAgICAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGluZGV4IDwg bV9ydW5zLnNpemUoKTsgKytpbmRleCkgewotICAgICAgICAgICAgbV9ydW5SZWN0TGlzdFtpbmRl eF0ubW92ZUhvcml6b250YWxseShhY2N1bXVsYXRlZEV4cGFuc2lvbik7CisgICAgICAgICAgICBt X2lubGluZUJveExpc3RbaW5kZXhdLnJlY3QubW92ZUhvcml6b250YWxseShhY2N1bXVsYXRlZEV4 cGFuc2lvbik7CiAgICAgICAgICAgICBhY2N1bXVsYXRlZEV4cGFuc2lvbiArPSBtX3J1bnNbaW5k ZXhdLmV4cGFuc2lvbigpLmhvcml6b250YWxFeHBhbnNpb247CiAgICAgICAgIH0KICAgICAgICAg cmV0dXJuOwpAQCAtMTQ2LDggKzE1Myw4IEBAIHZvaWQgTGluZUJveDo6YWxpZ25Ib3Jpem9udGFs bHkoSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSXNMYXN0TGluZVdpdGhJCiAgICAg fTsKIAogICAgIGlmIChhdXRvIGFkanVzdG1lbnQgPSBhZGp1c3RtZW50Rm9yQWxpZ25tZW50KGF2 YWlsYWJsZVdpZHRoKSkgewotICAgICAgICBmb3IgKGF1dG8mIHJ1blJlY3QgOiBtX3J1blJlY3RM aXN0KQotICAgICAgICAgICAgcnVuUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KCphZGp1c3RtZW50KTsK KyAgICAgICAgZm9yIChhdXRvJiBpbmxpbmVCb3ggOiBtX2lubGluZUJveExpc3QpCisgICAgICAg ICAgICBpbmxpbmVCb3gucmVjdC5tb3ZlSG9yaXpvbnRhbGx5KCphZGp1c3RtZW50KTsKICAgICB9 CiB9CiAKQEAgLTE1NSwxMSArMTYyLDEzIEBAIHZvaWQgTGluZUJveDo6YWxpZ25WZXJ0aWNhbGx5 KCkKIHsKICAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoKTsKICAgICBhdXRvIHNjcm9s bGFibGVPdmVyZmxvd1JlY3QgPSBsb2dpY2FsUmVjdCgpOwotICAgIGZvciAoc2l6ZV90IGluZGV4 ID0gMDsgaW5kZXggPCBtX3J1bnMuc2l6ZSgpOyArK2luZGV4KSB7CisgICAgZm9yIChzaXplX3Qg aW5kZXggPSAwOyBpbmRleCA8IG1faW5saW5lQm94TGlzdC5zaXplKCk7ICsraW5kZXgpIHsKKyAg ICAgICAgYXV0byYgaW5saW5lQm94ID0gbV9pbmxpbmVCb3hMaXN0W2luZGV4XTsKICAgICAgICAg YXV0byYgcnVuID0gbV9ydW5zW2luZGV4XTsKLSAgICAgICAgYXV0byYgcnVuUmVjdCA9IG1fcnVu UmVjdExpc3RbaW5kZXhdOworICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVCb3gubGF5 b3V0Qm94OworICAgICAgICBhdXRvIGlubGluZUJveEhlaWdodCA9IGlubGluZUJveC5yZWN0Lmhl aWdodCgpOworCiAgICAgICAgIGF1dG8gbG9naWNhbFRvcCA9IElubGluZUxheW91dFVuaXQgeyB9 OwotICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBydW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGF1 dG8gdmVydGljYWxBbGlnbiA9IGxheW91dEJveC5zdHlsZSgpLnZlcnRpY2FsQWxpZ24oKTsKICAg ICAgICAgYXV0byBhc2NlbnQgPSBsYXlvdXRCb3guc3R5bGUoKS5mb250TWV0cmljcygpLmFzY2Vu dCgpOwogCkBAIC0xOTEsMjUgKzIwMCwyNiBAQCB2b2lkIExpbmVCb3g6OmFsaWduVmVydGljYWxs eSgpCiAgICAgICAgICAgICAgICAgbG9naWNhbFRvcCA9IGFsaWdubWVudEJhc2VsaW5lKCkgLSBi YXNlbGluZUZyb21NYXJnaW5Cb3g7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg ICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJv eChsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBhbGlnbm1lbnRCYXNl bGluZSgpIC0gKGJveEdlb21ldHJ5LnZlcnRpY2FsQm9yZGVyKCkgKyBib3hHZW9tZXRyeS52ZXJ0 aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDBfbHUpICsgcnVuUmVjdC5oZWlnaHQoKSArIGJveEdlb21l dHJ5Lm1hcmdpbkFmdGVyKCkpOworICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBhbGlnbm1l bnRCYXNlbGluZSgpIC0gKGJveEdlb21ldHJ5LnZlcnRpY2FsQm9yZGVyKCkgKyBib3hHZW9tZXRy eS52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDBfbHUpICsgaW5saW5lQm94SGVpZ2h0ICsgYm94 R2VvbWV0cnkubWFyZ2luQWZ0ZXIoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUb3A6CiAgICAgICAgICAgICBsb2dpY2Fs VG9wID0gMF9sdTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFZlcnRpY2FsQWxp Z246OkJvdHRvbToKLSAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBsb2dpY2FsQm90dG9tKCkgLSBy dW5SZWN0LmhlaWdodCgpOworICAgICAgICAgICAgbG9naWNhbFRvcCA9IGxvZ2ljYWxCb3R0b20o KSAtIGlubGluZUJveEhlaWdodDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0 OgogICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIHJ1blJlY3Quc2V0VG9wKGxvZ2ljYWxUb3ApOwor ICAgICAgICBhdXRvJiBpbmxpbmVCb3hSZWN0ID0gaW5saW5lQm94LnJlY3Q7CisgICAgICAgIGlu bGluZUJveFJlY3Quc2V0VG9wKGxvZ2ljYWxUb3ApOwogICAgICAgICAvLyBBZGp1c3Qgc2Nyb2xs YWJsZSBvdmVyZmxvdyBpZiB0aGUgcnVuIG92ZXJmbG93cyB0aGUgbGluZS4KLSAgICAgICAgc2Ny b2xsYWJsZU92ZXJmbG93UmVjdC5leHBhbmRWZXJ0aWNhbGx5VG9Db250YWluKHJ1blJlY3QpOwor ICAgICAgICBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LmV4cGFuZFZlcnRpY2FsbHlUb0NvbnRhaW4o aW5saW5lQm94UmVjdCk7CiAgICAgICAgIC8vIENvbnZlcnQgcnVucyBmcm9tIHJlbGF0aXZlIHRv IHRoZSBsaW5lIHRvcC9sZWZ0IHRvIHRoZSBmb3JtYXR0aW5nIHJvb3QncyBib3JkZXIgYm94IHRv cC9sZWZ0LgotICAgICAgICBydW5SZWN0Lm1vdmVWZXJ0aWNhbGx5KHRoaXMtPmxvZ2ljYWxUb3Ao KSk7Ci0gICAgICAgIHJ1blJlY3QubW92ZUhvcml6b250YWxseShsb2dpY2FsTGVmdCgpKTsKKyAg ICAgICAgaW5saW5lQm94UmVjdC5tb3ZlVmVydGljYWxseSh0aGlzLT5sb2dpY2FsVG9wKCkpOwor ICAgICAgICBpbmxpbmVCb3hSZWN0Lm1vdmVIb3Jpem9udGFsbHkobG9naWNhbExlZnQoKSk7CiAg ICAgfQogICAgIHNldFNjcm9sbGFibGVPdmVyZmxvdyhzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0KTsK IH0KQEAgLTIxOCw5ICsyMjgsMTEgQEAgdm9pZCBMaW5lQm94OjphZGp1c3RCYXNlbGluZUFuZExp bmVIZWlnaHQoKQogewogICAgIHVuc2lnbmVkIGlubGluZUNvbnRhaW5lck5lc3RpbmdMZXZlbCA9 IDA7CiAgICAgYXV0byBoYXNTZWVuRGlyZWN0VGV4dE9yTGluZUJyZWFrID0gZmFsc2U7Ci0gICAg Zm9yIChhdXRvJiBydW4gOiBtX3J1bnMpIHsKLSAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVu LmxheW91dEJveCgpOworICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMDsgaW5kZXggPCBtX2lubGlu ZUJveExpc3Quc2l6ZSgpOyArK2luZGV4KSB7CisgICAgICAgIGF1dG8mIGlubGluZUJveCA9IG1f aW5saW5lQm94TGlzdFtpbmRleF07CisgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUJv eC5sYXlvdXRCb3g7CiAgICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7Cisg ICAgICAgIGF1dG8mIHJ1biA9IG1fcnVuc1tpbmRleF07CiAgICAgICAgIGlmIChydW4uaXNUZXh0 KCkgfHwgcnVuLmlzTGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIC8vIEZvciB0ZXh0IGNvbnRl bnQgd2Ugc2V0IHRoZSBiYXNlbGluZSBlaXRoZXIgdGhyb3VnaCB0aGUgaW5pdGlhbCBzdHJ1dCAo c2V0IGJ5IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCkgb3IKICAgICAgICAgICAgIC8vIHRo cm91Z2ggdGhlIGlubGluZSBjb250YWluZXIgKHN0YXJ0KS4gTm9ybWFsbHkgdGhlIHRleHQgY29u dGVudCBpdHNlbGYgZG9lcyBub3Qgc3RyZXRjaCB0aGUgbGluZS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCAw ZDlmOGM3NjdkNmFlNTg1MDFhMjM3NDk0NzJmNDQzNjI2MTNkZDY1Li5hYjk0NWQ0NjIyZTRiZGFi MTUwMzRjYTllOTE1ZTBlZjFhMDY4MzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC00OCwxOSArNDgsMTcg QEAgY2xhc3MgTGluZUJveCB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6 CiAgICAgc3RydWN0IElubGluZUJveCB7Ci0gICAgICAgIElubGluZUJveChjb25zdCBBc2NlbnRB bmREZXNjZW50Jik7Ci0gICAgICAgIElubGluZUJveCgpID0gZGVmYXVsdDsKKyAgICAgICAgSW5s aW5lQm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmLCBjb25zdCBBc2NlbnRBbmREZXNjZW50 JiwgY29uc3QgQm94Jik7CiAKKyAgICAgICAgRGlzcGxheTo6SW5saW5lUmVjdCByZWN0OwogICAg ICAgICBBc2NlbnRBbmREZXNjZW50IGFzY2VudEFuZERlc2NlbnQ7CisgICAgICAgIGNvbnN0IEJv eCYgbGF5b3V0Qm94OwogICAgIH07CiAKICAgICBlbnVtIGNsYXNzIElzTGFzdExpbmVXaXRoSW5s aW5lQ29udGVudCB7IE5vLCBZZXMgfTsKICAgICBlbnVtIGNsYXNzIElzTGluZVZpc3VhbGx5RW1w dHkgeyBObywgWWVzIH07CiAgICAgTGluZUJveChjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dCYsIGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmLCBjb25zdCBMaW5lQnVpbGRlcjo6UnVuTGlz dCYsIElzTGluZVZpc3VhbGx5RW1wdHksIElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCk7CiAK LSAgICB1c2luZyBJbmxpbmVSdW5SZWN0TGlzdCA9IFZlY3RvcjxEaXNwbGF5OjpJbmxpbmVSZWN0 LCAxMD47Ci0gICAgY29uc3QgSW5saW5lUnVuUmVjdExpc3QmIGlubGluZVJlY3RMaXN0KCkgY29u c3QgeyByZXR1cm4gbV9ydW5SZWN0TGlzdDsgfQotCiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC5sZWZ0KCk7IH0KICAgICBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC5yaWdodCgpOyB9CiAg ICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LnRv cCgpOyB9CkBAIC05MCw2ICs4OCw4IEBAIHB1YmxpYzoKICAgICAvLyAtLS0tLS0tLS0tLS0tLS0t LS0tICAgIGxpbmUgbG9naWNhbCBib3R0b20gIC0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICBJbmxp bmVMYXlvdXRVbml0IGFsaWdubWVudEJhc2VsaW5lKCkgY29uc3Q7CiAKKyAgICBjb25zdCBEaXNw bGF5OjpJbmxpbmVSZWN0JiByZWN0Rm9yUnVuKGNvbnN0IExpbmVCdWlsZGVyOjpSdW4mKSBjb25z dDsKKwogcHJpdmF0ZToKICAgICBjb25zdCBBc2NlbnRBbmREZXNjZW50JiBhc2NlbnRBbmREZXNj ZW50KCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LmFzY2VudEFuZERlc2NlbnQ7IH0K IApAQCAtMTE5LDExICsxMTksMTQgQEAgcHJpdmF0ZToKICAgICBEaXNwbGF5OjpJbmxpbmVSZWN0 IG1fc2Nyb2xsYWJsZU92ZXJmbG93OwogICAgIElubGluZUxheW91dFVuaXQgbV9hbGlnbm1lbnRC YXNlbGluZSB7IDAgfTsKICAgICBJbmxpbmVCb3ggbV9yb290SW5saW5lQm94OwotICAgIElubGlu ZVJ1blJlY3RMaXN0IG1fcnVuUmVjdExpc3Q7CisgICAgVmVjdG9yPElubGluZUJveD4gbV9pbmxp bmVCb3hMaXN0OworICAgIEhhc2hNYXA8Y29uc3QgTGluZUJ1aWxkZXI6OlJ1biosIHNpemVfdD4g bV9ydW5Ub0lubGluZUJveE1hcDsKIH07CiAKLWlubGluZSBMaW5lQm94OjpJbmxpbmVCb3g6Oklu bGluZUJveChjb25zdCBBc2NlbnRBbmREZXNjZW50JiBhc2NlbnRBbmREZXNjZW50KQotICAgIDog YXNjZW50QW5kRGVzY2VudChhc2NlbnRBbmREZXNjZW50KQoraW5saW5lIExpbmVCb3g6OklubGlu ZUJveDo6SW5saW5lQm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0IEFz Y2VudEFuZERlc2NlbnQmIGFzY2VudEFuZERlc2NlbnQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQor ICAgIDogcmVjdChyZWN0KQorICAgICwgYXNjZW50QW5kRGVzY2VudChhc2NlbnRBbmREZXNjZW50 KQorICAgICwgbGF5b3V0Qm94KGxheW91dEJveCkKIHsKIH0KIAo= 407465 2020-08-28 06:39:26 -0700 2020-09-02 08:37:26 -0700 Patch bug-215168-20200828063925.patch text/plain 11869 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE5YTUxNGY2YjlmODQy N2FhYjU3N2NkMThhMWM5MmMzMjQyZWMwMS4uZTUzYmU2ZTk1ZWRmMDg4ZjdlZjQ2N2E0MTJjZTFj NDMwMDAzNmYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA4LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBTdGFydCBj b25zdHJ1Y3RpbmcgSW5saW5lQm94ZXMgZm9yIGlubGluZSBydW5zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxNjgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0aGlzIHRyYW5zaXRpb25hbCBzdGVw IHdlIHN0YXJ0IGNvbnN0cnVjdGluZyBpbmxpbmUgYm94ZXMuIEhvd2V2ZXIgYXQgdGhpcyBwb2lu dCwgZWFjaCBydW4gZ2FpbnMgYSBkZWRpY2F0ZWQgaW5saW5lIGJveC4KKyAgICAgICAgV2hpbGUg dGhpcyBpcyBzb21ld2hhdCBpbmNvcnJlY3QgZnJvbSB0aGUgc3BlYyBwb2ludCBvZiB2aWV3LCB0 aGlzIGlzIGFsbCBpbnRlcm5hbCBhbmQgdmVyeSB0ZW1wb2FyYXJ5IGF0IHRoaXMgcG9pbnQuCisK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eDo6TGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnJlY3RGb3JS dW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjphbGlnbkhvcml6 b250YWxseSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmFsaWduVmVydGlj YWxseSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmFkanVzdEJhc2VsaW5l QW5kTGluZUhlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6 OklubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmlubGluZVJl Y3RMaXN0IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0wOC0yOCAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTW92ZSBpbmxpbmUgYWxpZ25tZW50 IGNvZGUgdG8gTGluZUJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IDJiOWJiNjEyN2FhNDZmZDFmYmNmN2Y5YmI4NTkyNjY0MzM5YjI4NTEuLmJjNDM5ZjBkNTQwODMz ZTJiOTVlNWIwYmIwNTlmNjRkZDViMjU5NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5jcHAKQEAgLTUxMSwxMSArNTExLDggQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29udGV4dDo6TGkKICAg ICBhdXRvIGxpbmVJbmRleCA9IGlubGluZUNvbnRlbnQubGluZUJveGVzLnNpemUoKTsKICAgICBh dXRvIGxpbmVJbmtPdmVyZmxvdyA9IGxpbmVCb3guc2Nyb2xsYWJsZU92ZXJmbG93KCk7CiAgICAg Ly8gQ29tcHV0ZSBib3ggZmluYWwgZ2VvbWV0cnkuCi0gICAgYXV0byYgcnVuUmVjdExpc3QgPSBs aW5lQm94LmlubGluZVJlY3RMaXN0KCk7Ci0gICAgYXV0byYgbGluZVJ1bnMgPSBsaW5lQ29udGVu dC5ydW5zOwotICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMDsgaW5kZXggPCBsaW5lUnVucy5zaXpl KCk7ICsraW5kZXgpIHsKLSAgICAgICAgYXV0byYgbGluZVJ1biA9IGxpbmVSdW5zLmF0KGluZGV4 KTsKLSAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IHJ1blJlY3RMaXN0W2luZGV4XTsKKyAgICBm b3IgKGF1dG8mIGxpbmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7CisgICAgICAgIGF1dG8mIGxv Z2ljYWxSZWN0ID0gbGluZUJveC5yZWN0Rm9yUnVuKGxpbmVSdW4pOwogICAgICAgICBhdXRvJiBs YXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOwogCiAgICAgICAgIC8vIEFkZCBmaW5hbCBk aXNwbGF5IHJ1bnMgdG8gc3RhdGUgZmlyc3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IDFiMTVmNWFj ZmFiYjNhYWQwYTNkZDQwOTU4MDI4NmM5NWVkNmQyMGIuLjYwYjIzY2FkMTRkMzg4ZjQ5ZGE1YzZh NzkzMmY0Y2FlZWNhZDgxMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC01Nyw2ICs1Nyw3IEBAIExp bmVCb3g6OkxpbmVCb3goY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1h dHRpbmdDb250ZXh0LCBjb25zdCBECiAgICAgLCBtX3J1bnMocnVucykKICAgICAsIG1fcmVjdChs aW5lUmVjdCkKICAgICAsIG1fc2Nyb2xsYWJsZU92ZXJmbG93KGxpbmVSZWN0KQorICAgICwgbV9y b290SW5saW5lQm94KElubGluZUJveCB7IGxpbmVSZWN0LCB7IH0sIGlubGluZUZvcm1hdHRpbmdD b250ZXh0LnJvb3QoKSB9KQogewogI2lmIEFTU0VSVF9FTkFCTEVECiAgICAgbV9oYXNWYWxpZEFs aWdubWVudEJhc2VsaW5lID0gdHJ1ZTsKQEAgLTY0LDggKzY1LDggQEAgTGluZUJveDo6TGluZUJv eChjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQs IGNvbnN0IEQKICAgICBhdXRvJiByb290U3R5bGUgPSBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5y b290KCkuc3R5bGUoKTsKICAgICBhdXRvIGhhbGZMZWFkaW5nTWV0cmljcyA9IHRoaXMtPmhhbGZM ZWFkaW5nTWV0cmljcyhyb290U3R5bGUuZm9udE1ldHJpY3MoKSwgbGluZVJlY3QuaGVpZ2h0KCkp OwogCisgICAgbV9yb290SW5saW5lQm94LmFzY2VudEFuZERlc2NlbnQgPSBoYWxmTGVhZGluZ01l dHJpY3M7CiAgICAgbV9hbGlnbm1lbnRCYXNlbGluZSA9IGhhbGZMZWFkaW5nTWV0cmljcy5hc2Nl bnQ7Ci0gICAgbV9yb290SW5saW5lQm94ID0gSW5saW5lQm94IHsgaGFsZkxlYWRpbmdNZXRyaWNz IH07CiAKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsg fTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IG1fcnVucykgewpAQCAtODUsNyArODYsOSBAQCBMaW5l Qm94OjpMaW5lQm94KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0 aW5nQ29udGV4dCwgY29uc3QgRAogICAgICAgICAgICAgLy8gTm9uLXJlcGxhY2VkIGlubGluZSBi b3ggKGUuZy4gaW5saW5lLWJsb2NrKS4gSXQgbG9va3MgYSBiaXQgbWlzbGVhZGluZyBidXQgdGhl aXIgbWFyZ2luIGJveCBpcyBjb25zaWRlcmVkIHRoZSBjb250ZW50IGhlaWdodCBoZXJlLgogICAg ICAgICAgICAgcmV0dXJuIGJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwogICAgICAgICB9 OwotICAgICAgICBtX3J1blJlY3RMaXN0LmFwcGVuZCh7IDAsIHJ1bi5sb2dpY2FsTGVmdCgpLCBy dW4ubG9naWNhbFdpZHRoKCksIHJ1bkhlaWdodCgpIH0pOworICAgICAgICAvLyBGSVhNRTogVGhp cyBpcyB0ZW1wb3JhcnkuIERvIG5vdCBtYWtlIGFuIGlubGluZSBib3ggZm9yIGVhY2ggcnVuLgor ICAgICAgICBtX2lubGluZUJveExpc3QuYXBwZW5kKElubGluZUJveCB7IHsgMCwgcnVuLmxvZ2lj YWxMZWZ0KCksIHJ1bi5sb2dpY2FsV2lkdGgoKSwgcnVuSGVpZ2h0KCkgfSwgaGFsZkxlYWRpbmdN ZXRyaWNzLCBydW4ubGF5b3V0Qm94KCkgfSk7CisgICAgICAgIG1fcnVuVG9JbmxpbmVCb3hNYXAu c2V0KCZydW4sIG1faW5saW5lQm94TGlzdC5zaXplKCkgLSAxKTsKICAgICAgICAgY29udGVudExv Z2ljYWxXaWR0aCArPSBydW4ubG9naWNhbFdpZHRoKCk7CiAgICAgfQogICAgIG1fc2Nyb2xsYWJs ZU92ZXJmbG93LnNldFdpZHRoKHN0ZDo6bWF4KGxpbmVSZWN0LndpZHRoKCksIGNvbnRlbnRMb2dp Y2FsV2lkdGgpKTsKQEAgLTEyMCwxMCArMTIzLDEwIEBAIHZvaWQgTGluZUJveDo6YWxpZ25Ib3Jp em9udGFsbHkoSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSXNMYXN0TGluZVdpdGhJ CiAgICAgaWYgKGNvbXB1dGVkSG9yaXpvbnRhbEFsaWdubWVudCA9PSBUZXh0QWxpZ25Nb2RlOjpK dXN0aWZ5KSB7CiAgICAgICAgIGF1dG8gYWNjdW11bGF0ZWRFeHBhbnNpb24gPSBJbmxpbmVMYXlv dXRVbml0IHsgfTsKICAgICAgICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IG1fcnVu cy5zaXplKCk7ICsraW5kZXgpIHsKLSAgICAgICAgICAgIG1fcnVuUmVjdExpc3RbaW5kZXhdLm1v dmVIb3Jpem9udGFsbHkoYWNjdW11bGF0ZWRFeHBhbnNpb24pOworICAgICAgICAgICAgbV9pbmxp bmVCb3hMaXN0W2luZGV4XS5yZWN0Lm1vdmVIb3Jpem9udGFsbHkoYWNjdW11bGF0ZWRFeHBhbnNp b24pOwogCiAgICAgICAgICAgICBhdXRvIGhvcml6b250YWxFeHBhbnNpb24gPSBtX3J1bnNbaW5k ZXhdLmV4cGFuc2lvbigpLmhvcml6b250YWxFeHBhbnNpb247Ci0gICAgICAgICAgICBtX3J1blJl Y3RMaXN0W2luZGV4XS5leHBhbmRIb3Jpem9udGFsbHkoaG9yaXpvbnRhbEV4cGFuc2lvbik7Cisg ICAgICAgICAgICBtX2lubGluZUJveExpc3RbaW5kZXhdLnJlY3QuZXhwYW5kSG9yaXpvbnRhbGx5 KGhvcml6b250YWxFeHBhbnNpb24pOwogICAgICAgICAgICAgYWNjdW11bGF0ZWRFeHBhbnNpb24g Kz0gaG9yaXpvbnRhbEV4cGFuc2lvbjsKICAgICAgICAgfQogICAgICAgICByZXR1cm47CkBAIC0x NTMsMTkgKzE1NiwyMSBAQCB2b2lkIExpbmVCb3g6OmFsaWduSG9yaXpvbnRhbGx5KElubGluZUxh eW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElzTGFzdExpbmVXaXRoSQogICAgIGlmIChhdXRvIGFk anVzdG1lbnQgPSBhZGp1c3RtZW50Rm9yQWxpZ25tZW50KGF2YWlsYWJsZVdpZHRoKSkgewogICAg ICAgICAvLyBGSVhNRTogbGluZSBib3ggc2hvdWxkIG5vdCBuZWVkIHRvIGJlIG1vdmVkLCBvbmx5 IHRoZSBydW5zLgogICAgICAgICBtX3JlY3QubW92ZUhvcml6b250YWxseSgqYWRqdXN0bWVudCk7 Ci0gICAgICAgIGZvciAoYXV0byYgcnVuUmVjdCA6IG1fcnVuUmVjdExpc3QpCi0gICAgICAgICAg ICBydW5SZWN0Lm1vdmVIb3Jpem9udGFsbHkoKmFkanVzdG1lbnQpOworICAgICAgICBmb3IgKGF1 dG8mIGlubGluZUJveCA6IG1faW5saW5lQm94TGlzdCkKKyAgICAgICAgICAgIGlubGluZUJveC5y ZWN0Lm1vdmVIb3Jpem9udGFsbHkoKmFkanVzdG1lbnQpOwogICAgIH0KIH0KIAogdm9pZCBMaW5l Qm94OjphbGlnblZlcnRpY2FsbHkoKQogewogICAgIGFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdo dCgpOwotICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMDsgaW5kZXggPCBtX3J1bnMuc2l6ZSgpOyAr K2luZGV4KSB7CisgICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IG1faW5saW5lQm94 TGlzdC5zaXplKCk7ICsraW5kZXgpIHsKKyAgICAgICAgYXV0byYgaW5saW5lQm94ID0gbV9pbmxp bmVCb3hMaXN0W2luZGV4XTsKICAgICAgICAgYXV0byYgcnVuID0gbV9ydW5zW2luZGV4XTsKLSAg ICAgICAgYXV0byYgcnVuUmVjdCA9IG1fcnVuUmVjdExpc3RbaW5kZXhdOworICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBpbmxpbmVCb3gubGF5b3V0Qm94OworICAgICAgICBhdXRvIGlubGluZUJv eEhlaWdodCA9IGlubGluZUJveC5yZWN0LmhlaWdodCgpOworCiAgICAgICAgIGF1dG8gbG9naWNh bFRvcCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBy dW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGF1dG8gdmVydGljYWxBbGlnbiA9IGxheW91dEJveC5z dHlsZSgpLnZlcnRpY2FsQWxpZ24oKTsKICAgICAgICAgYXV0byBhc2NlbnQgPSBsYXlvdXRCb3gu c3R5bGUoKS5mb250TWV0cmljcygpLmFzY2VudCgpOwogCkBAIC0xOTcsMjUgKzIwMiwyNiBAQCB2 b2lkIExpbmVCb3g6OmFsaWduVmVydGljYWxseSgpCiAgICAgICAgICAgICAgICAgbG9naWNhbFRv cCA9IGFsaWdubWVudEJhc2VsaW5lKCkgLSBiYXNlbGluZUZyb21NYXJnaW5Cb3g7CiAgICAgICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAg IGxvZ2ljYWxUb3AgPSBhbGlnbm1lbnRCYXNlbGluZSgpIC0gKGJveEdlb21ldHJ5LnZlcnRpY2Fs Qm9yZGVyKCkgKyBib3hHZW9tZXRyeS52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDBfbHUpICsg cnVuUmVjdC5oZWlnaHQoKSArIGJveEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkpOworICAgICAgICAg ICAgICAgIGxvZ2ljYWxUb3AgPSBhbGlnbm1lbnRCYXNlbGluZSgpIC0gKGJveEdlb21ldHJ5LnZl cnRpY2FsQm9yZGVyKCkgKyBib3hHZW9tZXRyeS52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDBf bHUpICsgaW5saW5lQm94SGVpZ2h0ICsgYm94R2VvbWV0cnkubWFyZ2luQWZ0ZXIoKSk7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWdu OjpUb3A6CiAgICAgICAgICAgICBsb2dpY2FsVG9wID0gMF9sdTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbToKLSAgICAgICAgICAgIGxvZ2lj YWxUb3AgPSBsb2dpY2FsQm90dG9tKCkgLSBydW5SZWN0LmhlaWdodCgpOworICAgICAgICAgICAg bG9naWNhbFRvcCA9IGxvZ2ljYWxCb3R0b20oKSAtIGlubGluZUJveEhlaWdodDsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBM RU1FTlRFRF9ZRVQoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIHJ1 blJlY3Quc2V0VG9wKGxvZ2ljYWxUb3ApOworICAgICAgICBhdXRvJiBpbmxpbmVCb3hSZWN0ID0g aW5saW5lQm94LnJlY3Q7CisgICAgICAgIGlubGluZUJveFJlY3Quc2V0VG9wKGxvZ2ljYWxUb3Ap OwogICAgICAgICAvLyBBZGp1c3Qgc2Nyb2xsYWJsZSBvdmVyZmxvdyBpZiB0aGUgcnVuIG92ZXJm bG93cyB0aGUgbGluZS4KLSAgICAgICAgbV9zY3JvbGxhYmxlT3ZlcmZsb3cuZXhwYW5kVmVydGlj YWxseVRvQ29udGFpbihydW5SZWN0KTsKKyAgICAgICAgbV9zY3JvbGxhYmxlT3ZlcmZsb3cuZXhw YW5kVmVydGljYWxseVRvQ29udGFpbihpbmxpbmVCb3hSZWN0KTsKICAgICAgICAgLy8gQ29udmVy dCBydW5zIGZyb20gcmVsYXRpdmUgdG8gdGhlIGxpbmUgdG9wL2xlZnQgdG8gdGhlIGZvcm1hdHRp bmcgcm9vdCdzIGJvcmRlciBib3ggdG9wL2xlZnQuCi0gICAgICAgIHJ1blJlY3QubW92ZVZlcnRp Y2FsbHkodGhpcy0+bG9naWNhbFRvcCgpKTsKLSAgICAgICAgcnVuUmVjdC5tb3ZlSG9yaXpvbnRh bGx5KGxvZ2ljYWxMZWZ0KCkpOworICAgICAgICBpbmxpbmVCb3hSZWN0Lm1vdmVWZXJ0aWNhbGx5 KHRoaXMtPmxvZ2ljYWxUb3AoKSk7CisgICAgICAgIGlubGluZUJveFJlY3QubW92ZUhvcml6b250 YWxseShsb2dpY2FsTGVmdCgpKTsKICAgICB9CiB9CiAKQEAgLTIyMyw5ICsyMjksMTEgQEAgdm9p ZCBMaW5lQm94OjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoKQogewogICAgIHVuc2lnbmVk IGlubGluZUNvbnRhaW5lck5lc3RpbmdMZXZlbCA9IDA7CiAgICAgYXV0byBoYXNTZWVuRGlyZWN0 VGV4dE9yTGluZUJyZWFrID0gZmFsc2U7Ci0gICAgZm9yIChhdXRvJiBydW4gOiBtX3J1bnMpIHsK LSAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJveCgpOworICAgIGZvciAoc2l6 ZV90IGluZGV4ID0gMDsgaW5kZXggPCBtX2lubGluZUJveExpc3Quc2l6ZSgpOyArK2luZGV4KSB7 CisgICAgICAgIGF1dG8mIGlubGluZUJveCA9IG1faW5saW5lQm94TGlzdFtpbmRleF07CisgICAg ICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUJveC5sYXlvdXRCb3g7CiAgICAgICAgIGF1dG8m IHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CisgICAgICAgIGF1dG8mIHJ1biA9IG1fcnVuc1tp bmRleF07CiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkgfHwgcnVuLmlzTGluZUJyZWFrKCkpIHsK ICAgICAgICAgICAgIC8vIEZvciB0ZXh0IGNvbnRlbnQgd2Ugc2V0IHRoZSBiYXNlbGluZSBlaXRo ZXIgdGhyb3VnaCB0aGUgaW5pdGlhbCBzdHJ1dCAoc2V0IGJ5IHRoZSBmb3JtYXR0aW5nIGNvbnRl eHQgcm9vdCkgb3IKICAgICAgICAgICAgIC8vIHRocm91Z2ggdGhlIGlubGluZSBjb250YWluZXIg KHN0YXJ0KS4gTm9ybWFsbHkgdGhlIHRleHQgY29udGVudCBpdHNlbGYgZG9lcyBub3Qgc3RyZXRj aCB0aGUgbGluZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCAwZDlmOGM3NjdkNmFlNTg1MDFhMjM3NDk0NzJm NDQzNjI2MTNkZDY1Li44OTFjNzMyNTJmODM1ZTRmZWZlNDI5NWI1ZDg0NjZiZGZiNjZiMTk0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5oCkBAIC00OCwxOSArNDgsMTcgQEAgY2xhc3MgTGluZUJveCB7CiAgICAgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgc3RydWN0IElubGluZUJveCB7Ci0g ICAgICAgIElubGluZUJveChjb25zdCBBc2NlbnRBbmREZXNjZW50Jik7Ci0gICAgICAgIElubGlu ZUJveCgpID0gZGVmYXVsdDsKKyAgICAgICAgSW5saW5lQm94KGNvbnN0IERpc3BsYXk6OklubGlu ZVJlY3QmLCBjb25zdCBBc2NlbnRBbmREZXNjZW50JiwgY29uc3QgQm94Jik7CiAKKyAgICAgICAg RGlzcGxheTo6SW5saW5lUmVjdCByZWN0OwogICAgICAgICBBc2NlbnRBbmREZXNjZW50IGFzY2Vu dEFuZERlc2NlbnQ7CisgICAgICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94OwogICAgIH07CiAKICAg ICBlbnVtIGNsYXNzIElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCB7IE5vLCBZZXMgfTsKICAg ICBlbnVtIGNsYXNzIElzTGluZVZpc3VhbGx5RW1wdHkgeyBObywgWWVzIH07CiAgICAgTGluZUJv eChjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIGNvbnN0IERpc3BsYXk6OklubGluZVJl Y3QmLCBjb25zdCBMaW5lQnVpbGRlcjo6UnVuTGlzdCYsIElzTGluZVZpc3VhbGx5RW1wdHksIElz TGFzdExpbmVXaXRoSW5saW5lQ29udGVudCk7CiAKLSAgICB1c2luZyBJbmxpbmVSdW5SZWN0TGlz dCA9IFZlY3RvcjxEaXNwbGF5OjpJbmxpbmVSZWN0LCAxMD47Ci0gICAgY29uc3QgSW5saW5lUnVu UmVjdExpc3QmIGlubGluZVJlY3RMaXN0KCkgY29uc3QgeyByZXR1cm4gbV9ydW5SZWN0TGlzdDsg fQotCiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1f cmVjdC5sZWZ0KCk7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxSaWdodCgpIGNvbnN0 IHsgcmV0dXJuIG1fcmVjdC5yaWdodCgpOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs VG9wKCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LnRvcCgpOyB9CkBAIC05MCw2ICs4OCw4IEBAIHB1 YmxpYzoKICAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tICAgIGxpbmUgbG9naWNhbCBib3R0b20g IC0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICBJbmxpbmVMYXlvdXRVbml0IGFsaWdubWVudEJhc2Vs aW5lKCkgY29uc3Q7CiAKKyAgICBjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0Rm9yUnVu KGNvbnN0IExpbmVCdWlsZGVyOjpSdW4mIHJ1bikgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVCb3hM aXN0W21fcnVuVG9JbmxpbmVCb3hNYXAuZ2V0KCZydW4pXS5yZWN0OyB9CisKIHByaXZhdGU6CiAg ICAgY29uc3QgQXNjZW50QW5kRGVzY2VudCYgYXNjZW50QW5kRGVzY2VudCgpIGNvbnN0IHsgcmV0 dXJuIG1fcm9vdElubGluZUJveC5hc2NlbnRBbmREZXNjZW50OyB9CiAKQEAgLTEwMyw3ICsxMDMs NiBAQCBwcml2YXRlOgogICAgIHZvaWQgYWxpZ25Ib3Jpem9udGFsbHkoSW5saW5lTGF5b3V0VW5p dCBhdmFpbGFibGVXaWR0aCwgSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50KTsKICAgICB2b2lk IGFsaWduVmVydGljYWxseSgpOwogICAgIHZvaWQgYWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0 KCk7Ci0KICAgICBIYW5naW5nQ29udGVudCBjb2xsZWN0SGFuZ2luZ0NvbnRlbnQoSXNMYXN0TGlu ZVdpdGhJbmxpbmVDb250ZW50KSBjb25zdDsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ7IH0KQEAgLTExOSwxMSArMTE4LDE1IEBAIHByaXZhdGU6CiAgICAgRGlzcGxh eTo6SW5saW5lUmVjdCBtX3Njcm9sbGFibGVPdmVyZmxvdzsKICAgICBJbmxpbmVMYXlvdXRVbml0 IG1fYWxpZ25tZW50QmFzZWxpbmUgeyAwIH07CiAgICAgSW5saW5lQm94IG1fcm9vdElubGluZUJv eDsKLSAgICBJbmxpbmVSdW5SZWN0TGlzdCBtX3J1blJlY3RMaXN0OworICAgIFZlY3RvcjxJbmxp bmVCb3g+IG1faW5saW5lQm94TGlzdDsKKyAgICAvLyBGSVhNRTogVGhpcyBpcyB0ZW1wb3Jhcnkg YW5kIHdpbGwgYmUgcmVwbGFjZWQgYnkgYW4gaW5saW5lIGJveCBtYXAuCisgICAgSGFzaE1hcDxj b25zdCBMaW5lQnVpbGRlcjo6UnVuKiwgc2l6ZV90PiBtX3J1blRvSW5saW5lQm94TWFwOwogfTsK IAotaW5saW5lIExpbmVCb3g6OklubGluZUJveDo6SW5saW5lQm94KGNvbnN0IEFzY2VudEFuZERl c2NlbnQmIGFzY2VudEFuZERlc2NlbnQpCi0gICAgOiBhc2NlbnRBbmREZXNjZW50KGFzY2VudEFu ZERlc2NlbnQpCitpbmxpbmUgTGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVCb3goY29uc3QgRGlz cGxheTo6SW5saW5lUmVjdCYgcmVjdCwgY29uc3QgQXNjZW50QW5kRGVzY2VudCYgYXNjZW50QW5k RGVzY2VudCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCisgICAgOiByZWN0KHJlY3QpCisgICAgLCBh c2NlbnRBbmREZXNjZW50KGFzY2VudEFuZERlc2NlbnQpCisgICAgLCBsYXlvdXRCb3gobGF5b3V0 Qm94KQogewogfQogCg==