219329 2020-11-28 16:42:23 -0800 [LFC][IFC] Create runs for inline boxes 2020-11-30 21:10:01 -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 1710447 0 zalan 2020-11-28 16:42:23 -0800 e.g. <span></span> 1710448 1 414981 zalan 2020-11-28 16:56:09 -0800 Created attachment 414981 Patch 1710460 2 414985 zalan 2020-11-28 20:37:59 -0800 Created attachment 414985 Patch 1710488 3 ews-feeder 2020-11-29 11:45:06 -0800 Committed r270229: <https://trac.webkit.org/changeset/270229> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414985. 1710489 4 webkit-bug-importer 2020-11-29 11:46:15 -0800 <rdar://problem/71787459> 1710921 5 414985 dbates 2020-11-30 21:10:01 -0800 Comment on attachment 414985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414985&action=review > Source/WebCore/layout/inlineformatting/InlineLineBox.cpp:121 > + auto inlineBoxAbsolutelogicalTop = inlineBoxLogicalRect.top(); Absolutelogical seems like it could be two words. 414981 2020-11-28 16:56:09 -0800 2020-11-28 21:00:54 -0800 Patch bug-219329-20201128165608.patch text/plain 15884 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc1ZjJkYjg2NjI3NjRm OTBmMTY1YWVlNTM0ODIxYzRlZTVkN2ZmNy4uZmQ2OThlOTQ0NDkyY2M4YmZjMTBkMGY5YTM3MmQ3 NTA2NjI4NzliYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTExLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDcmVhdGUg cnVucyBmb3IgaW5saW5lIGJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkzMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2ggd2Ugc3RhcnQgY29uc3RydWN0aW5nIHJ1bnMg Zm9yIGlubGluZSBib3hlcyAodGhlc2UgYXJlIHNwZWMgImlubGluZSBib3hlcyIgYW5kIG5vdCBs ZWdhY3kgbGluZSBsYXlvdXQgImlubGluZSBib3hlcyIpLgorCisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9y TGluZUNvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsTWFy Z2luUmVjdEZvcklubGluZUxldmVsQm94IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNw bGF5TGluZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Oklu bGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5SW5saW5lQm94ZXMgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6c2hvd0lubGluZVRyZWVBbmRSdW5zKToKKwogMjAyMC0xMS0yOCAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ10gRG8g bm90IGFzc3VtZSBmbG9hdCBhdm9pZGVycyBoYXZlIHByZS1jb21wdXRlZCB2ZXJ0aWNhbCBwb3Np dGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA0MTQwNTUwMzA4 ZDViODY5MGU2MTBiNTU5MjM1YjY4MWQwZjA1MzMxLi40NTRlOWEyZGVkYTNmNzBmNzI1Nzk5Yjgy OTI3MTA1N2JlYzEwOTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC00MjksMTkgKzQyOSw2IEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgfTsKICAgICB1 cGRhdGVGbG9hdEdlb21ldHJ5KCk7CiAKLSAgICBhdXRvIGNvbnN0cnVjdExpbmVSdW5zID0gWyZd IHsKLSAgICAgICAgYXV0byBsaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXpl KCk7Ci0gICAgICAgIC8vIENyZWF0ZSB0aGUgaW5saW5lIHJ1bnMgb24gdGhlIGN1cnJlbnQgbGlu ZS4gVGhpcyBpcyBtb3N0bHkgdGV4dCBhbmQgYXRvbWljIGlubGluZSBydW5zLgotICAgICAgICBm b3IgKGF1dG8mIGxpbmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7Ci0gICAgICAgICAgICAvLyBG SVhNRTogV2Ugc2hvdWxkIG5vdCBuZWVkIHRvIGNvbnN0cnVjdCBhIGxpbmUgcnVuIGZvciA8YnI+ LgotICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkgfHwgbGluZVJ1bi5pc0xpbmVCcmVh aygpKQotICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUlu ZGV4LCBsaW5lUnVuLmxheW91dEJveCgpLCBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihs aW5lUnVuKSwgbGluZVJ1bi5leHBhbnNpb24oKSwgbGluZVJ1bi50ZXh0Q29udGVudCgpIH0pOwot ICAgICAgICAgICAgZWxzZSBpZiAobGluZVJ1bi5pc0JveCgpKQotICAgICAgICAgICAgICAgIGZv cm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsaW5lUnVuLmxheW91dEJveCgp LCBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGluZVJ1bi5sYXlv dXRCb3goKSksIGxpbmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKLSAgICAgICAgfQotICAgIH07 Ci0gICAgY29uc3RydWN0TGluZVJ1bnMoKTsKLQogICAgIGF1dG8gdXBkYXRlQm94R2VvbWV0cnkg PSBbJl0gewogICAgICAgICAvLyBHcmFiIHRoZSBpbmxpbmUgYm94ZXMgKGV2ZW4gdGhvc2UgdGhh dCBkb24ndCBoYXZlIGFzc29jaWF0ZWQgbGF5b3V0IGJveGVzIG9uIHRoZSBjdXJyZW50IGxpbmUg ZHVlIHRvIGxpbmUgd3JhcHBpbmcpCiAgICAgICAgIC8vIGFuZCB1cGRhdGUgdGhlaXIgZ2VvbWV0 cmllcy4KQEAgLTQ1NCwxMCArNDQxLDEwIEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAg ICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShs YXlvdXRCb3gpOwogICAgICAgICAgICAgLy8gSW5saW5lIGJveCBjb29yZGluYXRlcyBhcmUgcmVs YXRpdmUgdG8gdGhlIGxpbmUgYm94LgogICAgICAgICAgICAgLy8gTGV0J3MgY29udmVydCB0b3Av bGVmdCByZWxhdGl2ZSB0byB0aGUgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QuCi0gICAgICAgICAg ICBhdXRvIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxl dmVsQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICAvLyBJbmxpbmUgYm94IGhlaWdodCBpbmNs dWRlcyB0aGUgbWFyZ2luIGJveC4gTGV0J3MgYWNjb3VudCBmb3IgdGhhdC4KKyAgICAgICAgICAg IGF1dG8gbG9naWNhbE1hcmdpblJlY3QgPSBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5s aW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CisgICAgICAgICAgICAvLyBJbmxp bmUgbGV2ZWwgYm94IGhlaWdodCBpbmNsdWRlcyB0aGUgbWFyZ2luIGJveC4gTGV0J3MgYWNjb3Vu dCBmb3IgdGhhdC4KICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRvcExlZnQgPSBs aW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpOwotICAgICAgICAgICAgYm9yZGVyQm94TG9naWNh bFRvcExlZnQubW92ZShsb2dpY2FsUmVjdC5sZWZ0KCksIGxvZ2ljYWxSZWN0LnRvcCgpICsgYm94 R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkpOworICAgICAgICAgICAgYm9yZGVyQm94TG9naWNhbFRv cExlZnQubW92ZShsb2dpY2FsTWFyZ2luUmVjdC5sZWZ0KCkgKyBib3hHZW9tZXRyeS5tYXJnaW5T dGFydCgpLCBsb2dpY2FsTWFyZ2luUmVjdC50b3AoKSArIGJveEdlb21ldHJ5Lm1hcmdpbkJlZm9y ZSgpKTsKIAogICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0luRmxvd1Bvc2l0aW9uZWQoKSkK ICAgICAgICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCArPSBnZW9tZXRyeS5pbkZs b3dQb3NpdGlvbmVkUG9zaXRpb25PZmZzZXQobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWlu dHMpOwpAQCAtNDY3LDMwICs0NTQsNDggQEAgSW5saW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWwKICAgICAg ICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGJv cmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgICAgICB9CisgICAgICAgICAgICAvLyBGSVhNRTogQ2hlY2sgaWYgdGhpcyBpcyBhIG11bHRp IGxpbmUgaW5saW5lIGJveCBhbmQgd2hldGhlciBob3Jpem9udGFsIG1hcmdpbi9wYWRkaW5nL2Jv cmRlciBzaG91bGQgYmUgaW5jbHVkZWQuCisgICAgICAgICAgICBhdXRvIGNvbnRlbnRCb3hIZWln aHQgPSB0b0xheW91dFVuaXQobG9naWNhbE1hcmdpblJlY3QuaGVpZ2h0KCkgLSBib3hHZW9tZXRy eS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSk7CiAgICAgICAgICAgICBpZiAobGF5 b3V0Qm94LmlzTGluZUJyZWFrQm94KCkpIHsKICAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5z ZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7 Ci0gICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodCh0b0xheW91 dFVuaXQobG9naWNhbFJlY3QuaGVpZ2h0KCkpKTsKKyAgICAgICAgICAgICAgICBib3hHZW9tZXRy eS5zZXRDb250ZW50Qm94SGVpZ2h0KGNvbnRlbnRCb3hIZWlnaHQpOwogICAgICAgICAgICAgfQot ICAgICAgICAgICAgYXV0byBtYXJnaW5Cb3hXaWR0aCA9IGxvZ2ljYWxSZWN0LndpZHRoKCk7Ci0g ICAgICAgICAgICBhdXRvIGNvbnRlbnRCb3hXaWR0aCA9IG1hcmdpbkJveFdpZHRoIC0gKGJveEdl b21ldHJ5Lm1hcmdpblN0YXJ0KCkgKyBib3hHZW9tZXRyeS5ib3JkZXJMZWZ0KCkgKyBib3hHZW9t ZXRyeS5wYWRkaW5nTGVmdCgpLnZhbHVlT3IoMCkpOworICAgICAgICAgICAgYXV0byBtYXJnaW5C b3hXaWR0aCA9IGxvZ2ljYWxNYXJnaW5SZWN0LndpZHRoKCk7CisgICAgICAgICAgICBhdXRvIGNv bnRlbnRCb3hXaWR0aCA9IHRvTGF5b3V0VW5pdChtYXJnaW5Cb3hXaWR0aCAtIGJveEdlb21ldHJ5 Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwogICAgICAgICAgICAgLy8gTm9u LWF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgbWF5IG9yIG1heSBub3QgYmUgd3JhcHBlZCBhbmQg aGF2ZSBnZW9tZXRyaWVzIG9uIG11bHRpcGxlIGxpbmVzLgogICAgICAgICAgICAgaW50IHByZXZp b3VzTGluZUluZGV4ID0gZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpLnNpemUoKSAtIDI7CiAg ICAgICAgICAgICBhdXRvIGlzU3Bhbm5pbmdJbmxpbmVCb3ggPSBwcmV2aW91c0xpbmVJbmRleCA+ IDAgJiYgZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpW3ByZXZpb3VzTGluZUluZGV4XS5jb250 YWluc0lubGluZUxldmVsQm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBpZiAoIWlzU3Bhbm5p bmdJbmxpbmVCb3gpIHsKICAgICAgICAgICAgICAgICAvLyBUaGlzIGJveCBzaG93ZWQgdXAgb24g dGhpcyBsaW5lIHRoZSBmaXJzdCB0aW1lLgogICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNl dExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsK LSAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgodG9MYXlvdXRV bml0KGNvbnRlbnRCb3hXaWR0aCkpOwotICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENv bnRlbnRCb3hIZWlnaHQodG9MYXlvdXRVbml0KGxvZ2ljYWxSZWN0LmhlaWdodCgpKSk7CisgICAg ICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKGNvbnRlbnRCb3hXaWR0 aCk7CisgICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChjb250 ZW50Qm94SGVpZ2h0KTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBqdXN0IGEgc2ltcGxlIGJveCBnZW9tZXRyeSBmb3Ig dGhlIGxpbmUgc3Bhbm5pbmcgaW5saW5lIGJveC4gZ2V0Qm91bmRpbmdDbGllbnRSZWN0IGxvb2tz IGludG8gZWFjaCBsaW5lIGJveGVzICh3aWxsIHR1cm4gaW50byBmcmFnbWVudGVkIGJveGVzKS4K ICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxMZWZ0KHN0ZDo6bWluKEJveEdlb21l dHJ5Ojpib3JkZXJCb3hMZWZ0KGJveEdlb21ldHJ5KSwgdG9MYXlvdXRVbml0KGJvcmRlckJveExv Z2ljYWxUb3BMZWZ0LngoKSkpKTsKLSAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRC b3hXaWR0aChzdGQ6Om1heCh0b0xheW91dFVuaXQoY29udGVudEJveFdpZHRoKSwgYm94R2VvbWV0 cnkuY29udGVudEJveFdpZHRoKCkpKTsKLSAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRl bnRCb3hIZWlnaHQoYm94R2VvbWV0cnkuY29udGVudEJveEhlaWdodCgpICsgdG9MYXlvdXRVbml0 KGxvZ2ljYWxSZWN0LmhlaWdodCgpKSk7CisgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250 ZW50Qm94V2lkdGgoc3RkOjptYXgoY29udGVudEJveFdpZHRoLCBib3hHZW9tZXRyeS5jb250ZW50 Qm94V2lkdGgoKSkpOworICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdo dChib3hHZW9tZXRyeS5jb250ZW50Qm94SGVpZ2h0KCkgKyBjb250ZW50Qm94SGVpZ2h0KTsKICAg ICAgICAgfQogICAgIH07CiAgICAgdXBkYXRlQm94R2VvbWV0cnkoKTsKIAorICAgIGF1dG8gY29u c3RydWN0TGluZVJ1bnMgPSBbJl0geworICAgICAgICBhdXRvIGxpbmVJbmRleCA9IGZvcm1hdHRp bmdTdGF0ZS5saW5lcygpLnNpemUoKTsKKyAgICAgICAgLy8gQ3JlYXRlIHRoZSBpbmxpbmUgcnVu cyBvbiB0aGUgY3VycmVudCBsaW5lLiBUaGlzIGlzIG1vc3RseSB0ZXh0IGFuZCBhdG9taWMgaW5s aW5lIHJ1bnMuCisgICAgICAgIGZvciAoYXV0byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMp IHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbm90IG5lZWQgdG8gY29uc3RydWN0 IGEgbGluZSBydW4gZm9yIDxicj4uCisgICAgICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSB8 fCBsaW5lUnVuLmlzTGluZUJyZWFrKCkpCisgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRl LmFkZExpbmVSdW4oeyBsaW5lSW5kZXgsIGxpbmVSdW4ubGF5b3V0Qm94KCksIGxpbmVCb3gubG9n aWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pLCBsaW5lUnVuLmV4cGFuc2lvbigpLCBsaW5lUnVu LnRleHRDb250ZW50KCkgfSk7CisgICAgICAgICAgICBlbHNlIGlmIChsaW5lUnVuLmlzQm94KCkg fHwgbGluZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBs YXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOworICAgICAgICAgICAgICAgIGF1dG8gYm9y ZGVyQm94UmVjdCA9IEJveEdlb21ldHJ5Ojpib3JkZXJCb3hSZWN0KGZvcm1hdHRpbmdTdGF0ZS5i b3hHZW9tZXRyeShsYXlvdXRCb3gpKTsKKyAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUu YWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGF5b3V0Qm94LCBJbmxpbmVSZWN0IHsgYm9yZGVyQm94 UmVjdC50b3BMZWZ0KCksIGJvcmRlckJveFJlY3Quc2l6ZSgpIH0sIGxpbmVSdW4uZXhwYW5zaW9u KCksIHsgfSB9KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH07CisgICAgY29uc3Ry dWN0TGluZVJ1bnMoKTsKKwogICAgIGF1dG8gY29uc3RydWN0TGluZUdlb21ldHJ5ID0gWyZdIHsK ICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmUoeyBsaW5lQm94TG9naWNhbFJlY3QsIGxp bmVCb3guYWxpZ25tZW50QmFzZWxpbmUoKSwgbGluZUJveC5ob3Jpem9udGFsQWxpZ25tZW50T2Zm c2V0KCkudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0IHsgfSksIGxpbmVDb250ZW50LmNvbnRlbnRM b2dpY2FsV2lkdGggfSk7CiAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggMTcwOGQ1ZmQyMWE3 NWI1NWQzM2E2ODYyNzA5MThjYWM3NTg3ZTU0Zi4uMGE2ZDI3OWZlMWNlYWYwMTczNTA3NjQxZGQ0 ZGRlNzJiNDE4NzA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKQEAgLTExMCwyMCArMTEwLDMwIEBAIElu bGluZVJlY3QgTGluZUJveDo6bG9naWNhbFJlY3RGb3JUZXh0UnVuKGNvbnN0IExpbmU6OlJ1biYg cnVuKSBjb25zdAogICAgIHJldHVybiB7IHJ1bmxvZ2ljYWxUb3AsIG1faG9yaXpvbnRhbEFsaWdu bWVudE9mZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSArIHJ1bi5sb2dpY2FsTGVm dCgpLCBydW4ubG9naWNhbFdpZHRoKCksIGxvZ2ljYWxIZWlnaHQgfTsKIH0KIAotSW5saW5lUmVj dCBMaW5lQm94Ojpsb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGNvbnN0IEJveCYg bGF5b3V0Qm94KSBjb25zdAorSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2FsTWFyZ2luUmVjdEZv cklubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBCb3hHZW9tZXRyeSYg Ym94R2VvbWV0cnkpIGNvbnN0CiB7Ci0gICAgYXV0byogaW5saW5lQm94ID0gJmlubGluZUxldmVs Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7Ci0gICAgaWYgKGlubGluZUJveC0+aGFzTGluZUJv eFJlbGF0aXZlQWxpZ25tZW50KCkpCi0gICAgICAgIHJldHVybiBpbmxpbmVCb3gtPmxvZ2ljYWxS ZWN0KCk7Ci0KLSAgICBhdXRvIGlubGluZUJveExvZ2ljYWxSZWN0ID0gaW5saW5lQm94LT5sb2dp Y2FsUmVjdCgpOwotICAgIGF1dG8gaW5saW5lQm94QWJzb2x1dGVsb2dpY2FsVG9wID0gaW5saW5l Qm94TG9naWNhbFJlY3QudG9wKCk7Ci0gICAgd2hpbGUgKGlubGluZUJveCAhPSBtX3Jvb3RJbmxp bmVCb3guZ2V0KCkgJiYgIWlubGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkp IHsKLSAgICAgICAgaW5saW5lQm94ID0gJmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGlubGlu ZUJveC0+bGF5b3V0Qm94KCkucGFyZW50KCkpOwotICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5p c0lubGluZUJveCgpKTsKLSAgICAgICAgaW5saW5lQm94QWJzb2x1dGVsb2dpY2FsVG9wICs9IGlu bGluZUJveC0+bG9naWNhbFRvcCgpOwotICAgIH0KLSAgICByZXR1cm4geyBpbmxpbmVCb3hBYnNv bHV0ZWxvZ2ljYWxUb3AsIGlubGluZUJveExvZ2ljYWxSZWN0LmxlZnQoKSwgaW5saW5lQm94TG9n aWNhbFJlY3Qud2lkdGgoKSwgaW5saW5lQm94TG9naWNhbFJlY3QuaGVpZ2h0KCkgfTsKKyAgICBh dXRvIGxvZ2ljYWxSZWN0ID0gWyZdIHsKKyAgICAgICAgYXV0byogaW5saW5lQm94ID0gJmlubGlu ZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CisgICAgICAgIGlmIChpbmxpbmVCb3gt Pmhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpKQorICAgICAgICAgICAgcmV0dXJuIGlubGlu ZUJveC0+bG9naWNhbFJlY3QoKTsKKworICAgICAgICBhdXRvIGlubGluZUJveExvZ2ljYWxSZWN0 ID0gaW5saW5lQm94LT5sb2dpY2FsUmVjdCgpOworICAgICAgICBhdXRvIGlubGluZUJveEFic29s dXRlbG9naWNhbFRvcCA9IGlubGluZUJveExvZ2ljYWxSZWN0LnRvcCgpOworICAgICAgICB3aGls ZSAoaW5saW5lQm94ICE9IG1fcm9vdElubGluZUJveC5nZXQoKSAmJiAhaW5saW5lQm94LT5oYXNM aW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSkgeworICAgICAgICAgICAgaW5saW5lQm94ID0gJmlu bGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGlubGluZUJveC0+bGF5b3V0Qm94KCkucGFyZW50KCkp OworICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveC0+aXNJbmxpbmVCb3goKSk7CisgICAgICAg ICAgICBpbmxpbmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AgKz0gaW5saW5lQm94LT5sb2dpY2FsVG9w KCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIElubGluZVJlY3QgeyBpbmxpbmVCb3hBYnNv bHV0ZWxvZ2ljYWxUb3AsIGlubGluZUJveExvZ2ljYWxSZWN0LmxlZnQoKSwgaW5saW5lQm94TG9n aWNhbFJlY3Qud2lkdGgoKSwgaW5saW5lQm94TG9naWNhbFJlY3QuaGVpZ2h0KCkgfTsKKyAgICB9 KCk7CisgICAgaWYgKCFsYXlvdXRCb3guaXNJbmxpbmVCb3goKSkKKyAgICAgICAgcmV0dXJuIGxv Z2ljYWxSZWN0OworCisgICAgLy8gVGhpcyBsb2dpY2FsIHJlY3QgaXMgYXMgdGFsbCBhcyB0aGUg InRleHQiIGNvbnRlbnQgaXMuIExldCdzIGFkanVzdCB3aXRoIHZlcnRpY2FsIGJvcmRlciBhbmQg cGFkZGluZyAtdmVydGljYWwgbWFyZ2luIGlzIGlnbm9yZWQuCisgICAgYXV0byB2ZXJ0aWNhbEJv cmRlckFuZFBhZGRpbmcgPSBib3hHZW9tZXRyeS52ZXJ0aWNhbEJvcmRlcigpICsgYm94R2VvbWV0 cnkudmVydGljYWxQYWRkaW5nKCkudmFsdWVPcigwX2x1KTsKKyAgICBsb2dpY2FsUmVjdC5leHBh bmRWZXJ0aWNhbGx5KHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZyk7CisgICAgbG9naWNhbFJlY3Qu bW92ZVZlcnRpY2FsbHkoLShib3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGJveEdlb21ldHJ5LnBh ZGRpbmdUb3AoKS52YWx1ZU9yKDBfbHUpKSk7CisgICAgcmV0dXJuIGxvZ2ljYWxSZWN0OwogfQog CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQm94LmgKaW5kZXggMWYwYTc2YzgzYzJlY2QzMDIyODk4ZWFmZWVjN2YzZmQ4YTBl ZDJmNy4uMjk0YmViNzY4NDk1OGZiZTc3ZGFiMWY4ZWFhYjEzNDY2MzcxNGZiOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC b3guaApAQCAtMjksMTMgKzI5LDEzIEBACiAKICNpbmNsdWRlICJJbmxpbmVMaW5lLmgiCiAjaW5j bHVkZSAiSW5saW5lUmVjdC5oIgotI2luY2x1ZGUgIkxheW91dEJveEdlb21ldHJ5LmgiCiAjaW5j bHVkZSA8d3RmL0lzb01hbGxvY0lubGluZXMuaD4KICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAorY2xhc3MgQm94R2Vv bWV0cnk7CiBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKIGNsYXNzIExpbmVCb3hCdWls ZGVyOwogCkBAIC0xNDMsNyArMTQzLDcgQEAgcHVibGljOgogICAgIGNvbnN0IElubGluZUxldmVs Qm94JiBpbmxpbmVMZXZlbEJveEZvckxheW91dEJveChjb25zdCBCb3gmIGxheW91dEJveCkgY29u c3QgeyByZXR1cm4gKm1faW5saW5lTGV2ZWxCb3hSZWN0TWFwLmdldCgmbGF5b3V0Qm94KTsgfQog CiAgICAgSW5saW5lUmVjdCBsb2dpY2FsUmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJikg Y29uc3Q7Ci0gICAgSW5saW5lUmVjdCBsb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94 KGNvbnN0IEJveCYpIGNvbnN0OworICAgIElubGluZVJlY3QgbG9naWNhbE1hcmdpblJlY3RGb3JJ bmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBjb25zdCBCb3hHZW9tZXRyeSYpIGNvbnN0OwogCiAg ICAgYXV0byBpbmxpbmVMZXZlbEJveExpc3QoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUxldmVs Qm94UmVjdE1hcC52YWx1ZXMoKTsgfQogICAgIGJvb2wgY29udGFpbnNJbmxpbmVMZXZlbEJveChj b25zdCBCb3gmIGxheW91dEJveCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVMZXZlbEJveFJlY3RN YXAuY29udGFpbnMoJmxheW91dEJveCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCAxOWY2MjQ5NzY1MTA1NDgzYjI0ODYyMmUwNTA1 NGZiM2MzODM4OGI4Li4wMjNjYmM1ZDcyOTQ1MGIwYWEzMzQ2OTQ1YWZhOTc4ZjE3ZmI2MjBhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBA IC0zMjUsOSArMzI1LDkgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxh eUxpbmVzKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXQKICAgICAgICAgICAgIGF1 dG8mIGxpbmVCb3ggPSBsaW5lQm94ZXNbbGluZUluZGV4XTsKICAgICAgICAgICAgIGZvciAoYXV0 byYgaW5saW5lTGV2ZWxCb3ggOiBsaW5lQm94LmlubGluZUxldmVsQm94TGlzdCgpKSB7CiAgICAg ICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gtPmxheW91dEJveCgp OwotICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCA9IGxpbmVC b3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gpOwotICAgICAg ICAgICAgICAgIC8vIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QgZW5jbG9zZXMgdGhlIG1hcmdp biBib3gsIGJ1dCB3ZSBuZWVkIGJvcmRlciBib3ggZm9yIHRoZSBkaXNwbGF5IGxpbmUuCiAgICAg ICAgICAgICAgICAgYXV0byYgZ2VvbWV0cnkgPSBtX2xheW91dFN0YXRlLmdlb21ldHJ5Rm9yQm94 KGxheW91dEJveCk7CisgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveExvZ2ljYWxS ZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGxheW91dEJv eCwgZ2VvbWV0cnkpOworICAgICAgICAgICAgICAgIC8vIGlubGluZUxldmVsQm94TG9naWNhbFJl Y3QgZW5jbG9zZXMgdGhlIG1hcmdpbiBib3gsIGJ1dCB3ZSBuZWVkIGJvcmRlciBib3ggZm9yIHRo ZSBkaXNwbGF5IGxpbmUuCiAgICAgICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVj dC5leHBhbmRWZXJ0aWNhbGx5KC1zdGQ6Om1heCgwX2x1LCBnZW9tZXRyeS5tYXJnaW5CZWZvcmUo KSArIGdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkpKTsKICAgICAgICAgICAgICAgICBpbmxpbmVMZXZl bEJveExvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KHN0ZDo6bWF4KDBfbHUsIGdlb21ldHJ5Lm1h cmdpbkJlZm9yZSgpKSk7CiAKQEAgLTM2Myw5ICszNjMsOSBAQCB2b2lkIElubGluZUNvbnRlbnRC dWlsZGVyOjpjcmVhdGVEaXNwbGF5SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3Jt YXR0aQogICAgICAgICAgICAgaWYgKCFpbmxpbmVMZXZlbEJveC0+aXNJbmxpbmVCb3goKSB8fCBp bmxpbmVMZXZlbEJveC0+aXNSb290SW5saW5lQm94KCkpCiAgICAgICAgICAgICAgICAgY29udGlu dWU7CiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0 Qm94KCk7Ci0gICAgICAgICAgICBhdXRvIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QgPSBsaW5l Qm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94KTsKLSAgICAg ICAgICAgIC8vIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QgZW5jbG9zZXMgdGhlIG1hcmdpbiBi b3gsIGJ1dCB3ZSBuZWVkIGJvcmRlciBib3ggZm9yIHRoZSBkaXNwbGF5IGxpbmUuCiAgICAgICAg ICAgICBhdXRvJiBnZW9tZXRyeSA9IG1fbGF5b3V0U3RhdGUuZ2VvbWV0cnlGb3JCb3gobGF5b3V0 Qm94KTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCA9IGxpbmVC b3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGdlb21ldHJ5 KTsKKyAgICAgICAgICAgIC8vIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QgZW5jbG9zZXMgdGhl IG1hcmdpbiBib3gsIGJ1dCB3ZSBuZWVkIGJvcmRlciBib3ggZm9yIHRoZSBkaXNwbGF5IGxpbmUu CiAgICAgICAgICAgICBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0LmV4cGFuZFZlcnRpY2FsbHko LXN0ZDo6bWF4KDBfbHUsIGdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpICsgZ2VvbWV0cnkubWFyZ2lu QWZ0ZXIoKSkpOwogICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdC5tb3ZlVmVy dGljYWxseShzdGQ6Om1heCgwX2x1LCBnZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSkpOwogICAgICAg ICAgICAgaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxSZWN0 LnRvcExlZnQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJl ZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJl ZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKaW5kZXggOWRjNDBlOGIyMjg3YTAzOWMxYTgwY2YzZmNm ZGJmNWViODY3MThkZC4uYWI0MTRhMDlhYWZkYjg4Mjg4MzU0ZWUzMDc0YmU2MzYzNDA2ODJlYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1 aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRy ZWVCdWlsZGVyLmNwcApAQCAtNDE2LDcgKzQxNiw4IEBAIHZvaWQgc2hvd0lubGluZVRyZWVBbmRS dW5zKFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBj CiAgICAgICAgICAgICAgICAgc3RyZWFtIDw8ICJHZW5lcmljIGlubGluZSBib3giOwogICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHN0cmVhbSA8PCAiR2VuZXJpYyBpbmxpbmUgbGV2 ZWwgYm94IjsKLSAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxN YXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkpOwor ICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCk7 CisgICAgICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVj dEZvcklubGluZUxldmVsQm94KGxheW91dEJveCwgbGF5b3V0U3RhdGUuZ2VvbWV0cnlGb3JCb3go bGF5b3V0Qm94KSk7CiAgICAgICAgICAgICBzdHJlYW0KICAgICAgICAgICAgICAgICA8PCAiIGF0 ICgiIDw8IGxvZ2ljYWxSZWN0LmxlZnQoKSA8PCAiLCIgPDwgbG9naWNhbFJlY3QudG9wKCkgPDwg IikiCiAgICAgICAgICAgICAgICAgPDwgIiBzaXplICgiIDw8IGxvZ2ljYWxSZWN0LndpZHRoKCkg PDwgIngiIDw8IGxvZ2ljYWxSZWN0LmhlaWdodCgpIDw8ICIpIgo= 414985 2020-11-28 20:37:59 -0800 2020-11-29 11:45:06 -0800 Patch bug-219329-20201128203759.patch text/plain 14563 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdkMzhjNGQyM2YwZGE2 NGFiZjVlNzQ0YWQ3ODBlMjg1ZTg2OTJhMS4uZjBkZDc1NGE0MWViODliNmZhYTRlMDIwNzI5MmEx MGNiMmQ3NjA4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTExLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDcmVhdGUg cnVucyBmb3IgaW5saW5lIGJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkzMjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2ggd2Ugc3RhcnQgY29uc3RydWN0aW5nIHJ1bnMg Zm9yIGlubGluZSBib3hlcyAodGhlc2UgYXJlIHNwZWMgImlubGluZSBib3hlcyIgYW5kIG5vdCBs ZWdhY3kgbGluZSBsYXlvdXQgImlubGluZSBib3hlcyIpLgorCisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9y TGluZUNvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsTWFy Z2luUmVjdEZvcklubGluZUxldmVsQm94IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNw bGF5TGluZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Oklu bGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5SW5saW5lQm94ZXMgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6c2hvd0lubGluZVRyZWVBbmRSdW5zKToKKwogMjAyMC0xMS0yOCAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ10gRG8g bm90IGFzc3VtZSBmbG9hdCBhdm9pZGVycyBoYXZlIHByZS1jb21wdXRlZCB2ZXJ0aWNhbCBwb3Np dGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA0MTQwNTUwMzA4 ZDViODY5MGU2MTBiNTU5MjM1YjY4MWQwZjA1MzMxLi5lYjc1ZWQ0YTEwMDM3MDFlNThiYmExOTQy YTg3NWZiYzZkZGRkMzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC00MzYsOCArNDM2LDExIEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgICAgICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIG5vdCBuZWVkIHRvIGNvbnN0cnVjdCBhIGxpbmUgcnVuIGZvciA8 YnI+LgogICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkgfHwgbGluZVJ1bi5pc0xpbmVC cmVhaygpKQogICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGlu ZUluZGV4LCBsaW5lUnVuLmxheW91dEJveCgpLCBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1 bihsaW5lUnVuKSwgbGluZVJ1bi5leHBhbnNpb24oKSwgbGluZVJ1bi50ZXh0Q29udGVudCgpIH0p OwotICAgICAgICAgICAgZWxzZSBpZiAobGluZVJ1bi5pc0JveCgpKQotICAgICAgICAgICAgICAg IGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsaW5lUnVuLmxheW91dEJv eCgpLCBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGluZVJ1bi5s YXlvdXRCb3goKSksIGxpbmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKKyAgICAgICAgICAgIGVs c2UgaWYgKGxpbmVSdW4uaXNCb3goKSB8fCBsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewor ICAgICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7Cisg ICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2Vv bWV0cnkobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGlu ZVJ1bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJveC5sb2dpY2FsTWFy Z2luUmVjdEZvcklubGluZUxldmVsQm94KGxpbmVSdW4ubGF5b3V0Qm94KCksIGJveEdlb21ldHJ5 KSwgbGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOworICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfTsKICAgICBjb25zdHJ1Y3RMaW5lUnVucygpOwpAQCAtNDU0LDEwICs0NTcsMTAgQEAg SW5saW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGlu ZUNvbnRlbnQoY29uc3QgTGluZUJ1aWwKICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0g Zm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCk7CiAgICAgICAgICAgICAvLyBJ bmxpbmUgYm94IGNvb3JkaW5hdGVzIGFyZSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3guCiAgICAg ICAgICAgICAvLyBMZXQncyBjb252ZXJ0IHRvcC9sZWZ0IHJlbGF0aXZlIHRvIHRoZSBmb3JtYXR0 aW5nIGNvbnRleHQgcm9vdC4KLSAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94 LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94KTsKLSAgICAgICAg ICAgIC8vIElubGluZSBib3ggaGVpZ2h0IGluY2x1ZGVzIHRoZSBtYXJnaW4gYm94LiBMZXQncyBh Y2NvdW50IGZvciB0aGF0LgorICAgICAgICAgICAgYXV0byBsb2dpY2FsTWFyZ2luUmVjdCA9IGxp bmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJveEdl b21ldHJ5KTsKKyAgICAgICAgICAgIC8vIElubGluZSBsZXZlbCBib3ggaGVpZ2h0IGluY2x1ZGVz IHRoZSBtYXJnaW4gYm94LiBMZXQncyBhY2NvdW50IGZvciB0aGF0LgogICAgICAgICAgICAgYXV0 byBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCA9IGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCk7 Ci0gICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdC5tb3ZlKGxvZ2ljYWxSZWN0Lmxl ZnQoKSwgbG9naWNhbFJlY3QudG9wKCkgKyBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSk7Cisg ICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdC5tb3ZlKGxvZ2ljYWxNYXJnaW5SZWN0 LmxlZnQoKSArIGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCksIGxvZ2ljYWxNYXJnaW5SZWN0LnRv cCgpICsgYm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkpOwogCiAgICAgICAgICAgICBpZiAobGF5 b3V0Qm94LmlzSW5GbG93UG9zaXRpb25lZCgpKQogICAgICAgICAgICAgICAgIGJvcmRlckJveExv Z2ljYWxUb3BMZWZ0ICs9IGdlb21ldHJ5LmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbk9mZnNldChs YXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CkBAIC00NjcsMjYgKzQ3MCwyOCBAQCBJ bmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5l Q29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExv Z2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8vIEZJ WE1FOiBDaGVjayBpZiB0aGlzIGlzIGEgbXVsdGkgbGluZSBpbmxpbmUgYm94IGFuZCB3aGV0aGVy IGhvcml6b250YWwgbWFyZ2luL3BhZGRpbmcvYm9yZGVyIHNob3VsZCBiZSBpbmNsdWRlZC4KKyAg ICAgICAgICAgIGF1dG8gY29udGVudEJveEhlaWdodCA9IHRvTGF5b3V0VW5pdChsb2dpY2FsTWFy Z2luUmVjdC5oZWlnaHQoKSAtIGJveEdlb21ldHJ5LnZlcnRpY2FsTWFyZ2luQm9yZGVyQW5kUGFk ZGluZygpKTsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNMaW5lQnJlYWtCb3goKSkgewog ICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9p bnQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsKLSAgICAgICAgICAgICAgICBib3hHZW9tZXRy eS5zZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0VW5pdChsb2dpY2FsUmVjdC5oZWlnaHQoKSkp OworICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoY29udGVu dEJveEhlaWdodCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBhdXRvIG1hcmdpbkJveFdp ZHRoID0gbG9naWNhbFJlY3Qud2lkdGgoKTsKLSAgICAgICAgICAgIGF1dG8gY29udGVudEJveFdp ZHRoID0gbWFyZ2luQm94V2lkdGggLSAoYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSArIGJveEdl b21ldHJ5LmJvcmRlckxlZnQoKSArIGJveEdlb21ldHJ5LnBhZGRpbmdMZWZ0KCkudmFsdWVPcigw KSk7CisgICAgICAgICAgICBhdXRvIG1hcmdpbkJveFdpZHRoID0gbG9naWNhbE1hcmdpblJlY3Qu d2lkdGgoKTsKKyAgICAgICAgICAgIGF1dG8gY29udGVudEJveFdpZHRoID0gdG9MYXlvdXRVbml0 KG1hcmdpbkJveFdpZHRoIC0gYm94R2VvbWV0cnkuaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBh ZGRpbmcoKSk7CiAgICAgICAgICAgICAvLyBOb24tYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyBt YXkgb3IgbWF5IG5vdCBiZSB3cmFwcGVkIGFuZCBoYXZlIGdlb21ldHJpZXMgb24gbXVsdGlwbGUg bGluZXMuCiAgICAgICAgICAgICBpbnQgcHJldmlvdXNMaW5lSW5kZXggPSBmb3JtYXR0aW5nU3Rh dGUubGluZUJveGVzKCkuc2l6ZSgpIC0gMjsKICAgICAgICAgICAgIGF1dG8gaXNTcGFubmluZ0lu bGluZUJveCA9IHByZXZpb3VzTGluZUluZGV4ID4gMCAmJiBmb3JtYXR0aW5nU3RhdGUubGluZUJv eGVzKClbcHJldmlvdXNMaW5lSW5kZXhdLmNvbnRhaW5zSW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94 KTsKICAgICAgICAgICAgIGlmICghaXNTcGFubmluZ0lubGluZUJveCkgewogICAgICAgICAgICAg ICAgIC8vIFRoaXMgYm94IHNob3dlZCB1cCBvbiB0aGlzIGxpbmUgdGhlIGZpcnN0IHRpbWUuCiAg ICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQodG9MYXlvdXRQb2lu dChib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCkpOwotICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5 LnNldENvbnRlbnRCb3hXaWR0aCh0b0xheW91dFVuaXQoY29udGVudEJveFdpZHRoKSk7Ci0gICAg ICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodCh0b0xheW91dFVuaXQo bG9naWNhbFJlY3QuaGVpZ2h0KCkpKTsKKyAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRD b250ZW50Qm94V2lkdGgoY29udGVudEJveFdpZHRoKTsKKyAgICAgICAgICAgICAgICBib3hHZW9t ZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGNvbnRlbnRCb3hIZWlnaHQpOwogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgLy8gVGhpcyBpcyBhIGp1 c3QgYSBzaW1wbGUgYm94IGdlb21ldHJ5IGZvciB0aGUgbGluZSBzcGFubmluZyBpbmxpbmUgYm94 LiBnZXRCb3VuZGluZ0NsaWVudFJlY3QgbG9va3MgaW50byBlYWNoIGxpbmUgYm94ZXMgKHdpbGwg dHVybiBpbnRvIGZyYWdtZW50ZWQgYm94ZXMpLgogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0 TG9naWNhbExlZnQoc3RkOjptaW4oQm94R2VvbWV0cnk6OmJvcmRlckJveExlZnQoYm94R2VvbWV0 cnkpLCB0b0xheW91dFVuaXQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQueCgpKSkpOwotICAgICAg ICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKHN0ZDo6bWF4KHRvTGF5b3V0VW5p dChjb250ZW50Qm94V2lkdGgpLCBib3hHZW9tZXRyeS5jb250ZW50Qm94V2lkdGgoKSkpOwotICAg ICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChib3hHZW9tZXRyeS5jb250 ZW50Qm94SGVpZ2h0KCkgKyB0b0xheW91dFVuaXQobG9naWNhbFJlY3QuaGVpZ2h0KCkpKTsKKyAg ICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aChzdGQ6Om1heChjb250ZW50 Qm94V2lkdGgsIGJveEdlb21ldHJ5LmNvbnRlbnRCb3hXaWR0aCgpKSk7CisgICAgICAgICAgICBi b3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGJveEdlb21ldHJ5LmNvbnRlbnRCb3hIZWln aHQoKSArIGNvbnRlbnRCb3hIZWlnaHQpOwogICAgICAgICB9CiAgICAgfTsKICAgICB1cGRhdGVC b3hHZW9tZXRyeSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAppbmRleCAxNzA4ZDVmZDIxYTc1YjU1ZDMzYTY4 NjI3MDkxOGNhYzc1ODdlNTRmLi4wYTZkMjc5ZmUxY2VhZjAxNzM1MDc2NDFkZDRkZGU3MmI0MTg3 MDRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQm94LmNwcApAQCAtMTEwLDIwICsxMTAsMzAgQEAgSW5saW5lUmVjdCBM aW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJiBydW4pIGNvbnN0 CiAgICAgcmV0dXJuIHsgcnVubG9naWNhbFRvcCwgbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0 LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pICsgcnVuLmxvZ2ljYWxMZWZ0KCksIHJ1bi5s b2dpY2FsV2lkdGgoKSwgbG9naWNhbEhlaWdodCB9OwogfQogCi1JbmxpbmVSZWN0IExpbmVCb3g6 OmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gp IGNvbnN0CitJbmxpbmVSZWN0IExpbmVCb3g6OmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2 ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IEJveEdlb21ldHJ5JiBib3hHZW9tZXRy eSkgY29uc3QKIHsKLSAgICBhdXRvKiBpbmxpbmVCb3ggPSAmaW5saW5lTGV2ZWxCb3hGb3JMYXlv dXRCb3gobGF5b3V0Qm94KTsKLSAgICBpZiAoaW5saW5lQm94LT5oYXNMaW5lQm94UmVsYXRpdmVB bGlnbm1lbnQoKSkKLSAgICAgICAgcmV0dXJuIGlubGluZUJveC0+bG9naWNhbFJlY3QoKTsKLQot ICAgIGF1dG8gaW5saW5lQm94TG9naWNhbFJlY3QgPSBpbmxpbmVCb3gtPmxvZ2ljYWxSZWN0KCk7 Ci0gICAgYXV0byBpbmxpbmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AgPSBpbmxpbmVCb3hMb2dpY2Fs UmVjdC50b3AoKTsKLSAgICB3aGlsZSAoaW5saW5lQm94ICE9IG1fcm9vdElubGluZUJveC5nZXQo KSAmJiAhaW5saW5lQm94LT5oYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSkgewotICAgICAg ICBpbmxpbmVCb3ggPSAmaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lQm94LT5sYXlv dXRCb3goKS5wYXJlbnQoKSk7Ci0gICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94 KCkpOwotICAgICAgICBpbmxpbmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AgKz0gaW5saW5lQm94LT5s b2dpY2FsVG9wKCk7Ci0gICAgfQotICAgIHJldHVybiB7IGlubGluZUJveEFic29sdXRlbG9naWNh bFRvcCwgaW5saW5lQm94TG9naWNhbFJlY3QubGVmdCgpLCBpbmxpbmVCb3hMb2dpY2FsUmVjdC53 aWR0aCgpLCBpbmxpbmVCb3hMb2dpY2FsUmVjdC5oZWlnaHQoKSB9OworICAgIGF1dG8gbG9naWNh bFJlY3QgPSBbJl0geworICAgICAgICBhdXRvKiBpbmxpbmVCb3ggPSAmaW5saW5lTGV2ZWxCb3hG b3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgaWYgKGlubGluZUJveC0+aGFzTGluZUJv eFJlbGF0aXZlQWxpZ25tZW50KCkpCisgICAgICAgICAgICByZXR1cm4gaW5saW5lQm94LT5sb2dp Y2FsUmVjdCgpOworCisgICAgICAgIGF1dG8gaW5saW5lQm94TG9naWNhbFJlY3QgPSBpbmxpbmVC b3gtPmxvZ2ljYWxSZWN0KCk7CisgICAgICAgIGF1dG8gaW5saW5lQm94QWJzb2x1dGVsb2dpY2Fs VG9wID0gaW5saW5lQm94TG9naWNhbFJlY3QudG9wKCk7CisgICAgICAgIHdoaWxlIChpbmxpbmVC b3ggIT0gbV9yb290SW5saW5lQm94LmdldCgpICYmICFpbmxpbmVCb3gtPmhhc0xpbmVCb3hSZWxh dGl2ZUFsaWdubWVudCgpKSB7CisgICAgICAgICAgICBpbmxpbmVCb3ggPSAmaW5saW5lTGV2ZWxC b3hGb3JMYXlvdXRCb3goaW5saW5lQm94LT5sYXlvdXRCb3goKS5wYXJlbnQoKSk7CisgICAgICAg ICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKKyAgICAgICAgICAgIGlubGlu ZUJveEFic29sdXRlbG9naWNhbFRvcCArPSBpbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKTsKKyAgICAg ICAgfQorICAgICAgICByZXR1cm4gSW5saW5lUmVjdCB7IGlubGluZUJveEFic29sdXRlbG9naWNh bFRvcCwgaW5saW5lQm94TG9naWNhbFJlY3QubGVmdCgpLCBpbmxpbmVCb3hMb2dpY2FsUmVjdC53 aWR0aCgpLCBpbmxpbmVCb3hMb2dpY2FsUmVjdC5oZWlnaHQoKSB9OworICAgIH0oKTsKKyAgICBp ZiAoIWxheW91dEJveC5pc0lubGluZUJveCgpKQorICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7 CisKKyAgICAvLyBUaGlzIGxvZ2ljYWwgcmVjdCBpcyBhcyB0YWxsIGFzIHRoZSAidGV4dCIgY29u dGVudCBpcy4gTGV0J3MgYWRqdXN0IHdpdGggdmVydGljYWwgYm9yZGVyIGFuZCBwYWRkaW5nIC12 ZXJ0aWNhbCBtYXJnaW4gaXMgaWdub3JlZC4KKyAgICBhdXRvIHZlcnRpY2FsQm9yZGVyQW5kUGFk ZGluZyA9IGJveEdlb21ldHJ5LnZlcnRpY2FsQm9yZGVyKCkgKyBib3hHZW9tZXRyeS52ZXJ0aWNh bFBhZGRpbmcoKS52YWx1ZU9yKDBfbHUpOworICAgIGxvZ2ljYWxSZWN0LmV4cGFuZFZlcnRpY2Fs bHkodmVydGljYWxCb3JkZXJBbmRQYWRkaW5nKTsKKyAgICBsb2dpY2FsUmVjdC5tb3ZlVmVydGlj YWxseSgtKGJveEdlb21ldHJ5LmJvcmRlclRvcCgpICsgYm94R2VvbWV0cnkucGFkZGluZ1RvcCgp LnZhbHVlT3IoMF9sdSkpKTsKKyAgICByZXR1cm4gbG9naWNhbFJlY3Q7CiB9CiAKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC b3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC b3guaAppbmRleCAxZjBhNzZjODNjMmVjZDMwMjI4OThlYWZlZWM3ZjNmZDhhMGVkMmY3Li4yOTRi ZWI3Njg0OTU4ZmJlNzdkYWIxZjhlYWFiMTM0NjYzNzE0ZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC0y OSwxMyArMjksMTMgQEAKIAogI2luY2x1ZGUgIklubGluZUxpbmUuaCIKICNpbmNsdWRlICJJbmxp bmVSZWN0LmgiCi0jaW5jbHVkZSAiTGF5b3V0Qm94R2VvbWV0cnkuaCIKICNpbmNsdWRlIDx3dGYv SXNvTWFsbG9jSW5saW5lcy5oPgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCitjbGFzcyBCb3hHZW9tZXRyeTsKIGNs YXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0OwogY2xhc3MgTGluZUJveEJ1aWxkZXI7CiAKQEAg LTE0Myw3ICsxNDMsNyBAQCBwdWJsaWM6CiAgICAgY29uc3QgSW5saW5lTGV2ZWxCb3gmIGlubGlu ZUxldmVsQm94Rm9yTGF5b3V0Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVy biAqbV9pbmxpbmVMZXZlbEJveFJlY3RNYXAuZ2V0KCZsYXlvdXRCb3gpOyB9CiAKICAgICBJbmxp bmVSZWN0IGxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihjb25zdCBMaW5lOjpSdW4mKSBjb25zdDsKLSAg ICBJbmxpbmVSZWN0IGxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgQm94 JikgY29uc3Q7CisgICAgSW5saW5lUmVjdCBsb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVs Qm94KGNvbnN0IEJveCYsIGNvbnN0IEJveEdlb21ldHJ5JikgY29uc3Q7CiAKICAgICBhdXRvIGlu bGluZUxldmVsQm94TGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lTGV2ZWxCb3hSZWN0TWFw LnZhbHVlcygpOyB9CiAgICAgYm9vbCBjb250YWluc0lubGluZUxldmVsQm94KGNvbnN0IEJveCYg bGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiBtX2lubGluZUxldmVsQm94UmVjdE1hcC5jb250YWlu cygmbGF5b3V0Qm94KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVu dEJ1aWxkZXIuY3BwCmluZGV4IDE5ZjYyNDk3NjUxMDU0ODNiMjQ4NjIyZTA1MDU0ZmIzYzM4Mzg4 YjguLjAyM2NiYzVkNzI5NDUwYjBhYTMzNDY5NDVhZmE5NzhmMTdmYjYyMGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKQEAgLTMyNSw5ICsz MjUsOSBAQCB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMoY29u c3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdAogICAgICAgICAgICAgYXV0byYgbGluZUJv eCA9IGxpbmVCb3hlc1tsaW5lSW5kZXhdOwogICAgICAgICAgICAgZm9yIChhdXRvJiBpbmxpbmVM ZXZlbEJveCA6IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hMaXN0KCkpIHsKICAgICAgICAgICAgICAg ICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm94KCk7Ci0gICAgICAg ICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2Fs TWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICAgICAg Ly8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCBlbmNsb3NlcyB0aGUgbWFyZ2luIGJveCwgYnV0 IHdlIG5lZWQgYm9yZGVyIGJveCBmb3IgdGhlIGRpc3BsYXkgbGluZS4KICAgICAgICAgICAgICAg ICBhdXRvJiBnZW9tZXRyeSA9IG1fbGF5b3V0U3RhdGUuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94 KTsKKyAgICAgICAgICAgICAgICBhdXRvIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QgPSBsaW5l Qm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBnZW9tZXRy eSk7CisgICAgICAgICAgICAgICAgLy8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCBlbmNsb3Nl cyB0aGUgbWFyZ2luIGJveCwgYnV0IHdlIG5lZWQgYm9yZGVyIGJveCBmb3IgdGhlIGRpc3BsYXkg bGluZS4KICAgICAgICAgICAgICAgICBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0LmV4cGFuZFZl cnRpY2FsbHkoLXN0ZDo6bWF4KDBfbHUsIGdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpICsgZ2VvbWV0 cnkubWFyZ2luQWZ0ZXIoKSkpOwogICAgICAgICAgICAgICAgIGlubGluZUxldmVsQm94TG9naWNh bFJlY3QubW92ZVZlcnRpY2FsbHkoc3RkOjptYXgoMF9sdSwgZ2VvbWV0cnkubWFyZ2luQmVmb3Jl KCkpKTsKIApAQCAtMzYzLDkgKzM2Myw5IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNy ZWF0ZURpc3BsYXlJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpCiAgICAg ICAgICAgICBpZiAoIWlubGluZUxldmVsQm94LT5pc0lubGluZUJveCgpIHx8IGlubGluZUxldmVs Qm94LT5pc1Jvb3RJbmxpbmVCb3goKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxldmVsQm94LT5sYXlvdXRCb3goKTsKLSAg ICAgICAgICAgIGF1dG8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNh bE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgLy8g aW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCBlbmNsb3NlcyB0aGUgbWFyZ2luIGJveCwgYnV0IHdl IG5lZWQgYm9yZGVyIGJveCBmb3IgdGhlIGRpc3BsYXkgbGluZS4KICAgICAgICAgICAgIGF1dG8m IGdlb21ldHJ5ID0gbV9sYXlvdXRTdGF0ZS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOworICAg ICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2Fs TWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGxheW91dEJveCwgZ2VvbWV0cnkpOworICAgICAg ICAgICAgLy8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCBlbmNsb3NlcyB0aGUgbWFyZ2luIGJv eCwgYnV0IHdlIG5lZWQgYm9yZGVyIGJveCBmb3IgdGhlIGRpc3BsYXkgbGluZS4KICAgICAgICAg ICAgIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QuZXhwYW5kVmVydGljYWxseSgtc3RkOjptYXgo MF9sdSwgZ2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBnZW9tZXRyeS5tYXJnaW5BZnRlcigpKSk7 CiAgICAgICAgICAgICBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KHN0 ZDo6bWF4KDBfbHUsIGdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpKSk7CiAgICAgICAgICAgICBpbmxp bmVMZXZlbEJveExvZ2ljYWxSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRy ZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRy ZWVCdWlsZGVyLmNwcAppbmRleCA5ZGM0MGU4YjIyODdhMDM5YzFhODBjZjNmY2ZkYmY1ZWI4Njcx OGRkLi5hYjQxNGEwOWFhZmRiODgyODgzNTRlZTMwNzRiZTYzNjM0MDY4MmViIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIu Y3BwCkBAIC00MTYsNyArNDE2LDggQEAgdm9pZCBzaG93SW5saW5lVHJlZUFuZFJ1bnMoVGV4dFN0 cmVhbSYgc3RyZWFtLCBjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGMKICAgICAgICAg ICAgICAgICBzdHJlYW0gPDwgIkdlbmVyaWMgaW5saW5lIGJveCI7CiAgICAgICAgICAgICBlbHNl CiAgICAgICAgICAgICAgICAgc3RyZWFtIDw8ICJHZW5lcmljIGlubGluZSBsZXZlbCBib3giOwot ICAgICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RG b3JJbmxpbmVMZXZlbEJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7CisgICAgICAgICAg ICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKKyAgICAgICAg ICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5l TGV2ZWxCb3gobGF5b3V0Qm94LCBsYXlvdXRTdGF0ZS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gp KTsKICAgICAgICAgICAgIHN0cmVhbQogICAgICAgICAgICAgICAgIDw8ICIgYXQgKCIgPDwgbG9n aWNhbFJlY3QubGVmdCgpIDw8ICIsIiA8PCBsb2dpY2FsUmVjdC50b3AoKSA8PCAiKSIKICAgICAg ICAgICAgICAgICA8PCAiIHNpemUgKCIgPDwgbG9naWNhbFJlY3Qud2lkdGgoKSA8PCAieCIgPDwg bG9naWNhbFJlY3QuaGVpZ2h0KCkgPDwgIikiCg==