315439 2026-05-23 20:33:27 -0700 [cleanup] Separate flex base/hypothetical main size determination from FlexLayoutItem construction 2026-05-25 10:00:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2213586 0 zalan 2026-05-23 20:33:27 -0700 ssia 2213587 1 479788 zalan 2026-05-23 20:34:42 -0700 Created attachment 479788 Patch 2213850 2 479802 zalan 2026-05-25 07:53:20 -0700 Created attachment 479802 [fast-cq]Patch 2213881 3 ews-feeder 2026-05-25 09:59:17 -0700 Committed 313847@main (180eaa125ce9): <https://commits.webkit.org/313847@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479802. 2213882 4 webkit-bug-importer 2026-05-25 10:00:13 -0700 <rdar://problem/177885114> 479788 2026-05-23 20:34:42 -0700 2026-05-25 07:53:19 -0700 Patch bug-315439-20260523203441.patch text/plain 9734 zalan RnJvbSA0Yjk3OTUwNjNiYjYyODVmNDFjMjA5ZTI4YzhjZDZlY2UwMmY4MGU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjMgTWF5IDIwMjYgMjA6MzQ6MDMgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gU2VwYXJhdGUgZmxleCBiYXNlL2h5cG90aGV0aWNhbCBtYWluIHNpemUKIGRldGVybWluYXRp b24gZnJvbSBGbGV4TGF5b3V0SXRlbSBjb25zdHJ1Y3Rpb24KIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMTU0MzkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK Y29uc3RydWN0RmxleExheW91dEl0ZW0gd2FzIGRvaW5nIHR3byB1bnJlbGF0ZWQgdGhpbmdzOiBy dW5uaW5nIHRoZSBzcGVjCnNlY3Rpb24gOS4yLjMgc3RlcCAoZGV0ZXJtaW5lIHRoZSBmbGV4IGJh c2Ugc2l6ZSBhbmQgaHlwb3RoZXRpY2FsIG1haW4gc2l6ZQpvZiBlYWNoIGl0ZW0pIGFuZCBjb25z dHJ1Y3RpbmcgdGhlIEZsZXhMYXlvdXRJdGVtIG9iamVjdCB0aGF0IGNhcnJpZXMgdGhvc2UKc2l6 ZXMgaW50byB0aGUgcmVzdCBvZiB0aGUgZmxleCBhbGdvcml0aG0uIFRoZSBmdW5jdGlvbiBuYW1l IGRlc2NyaWJlZCB0aGUKb3V0cHV0IG9iamVjdCwgbm90IHRoZSBsYXlvdXQgc3RlcC4KClJlbmFt ZWQgdG8gZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSBhbmQgY2hhbmdlZCB0aGUgcmV0 dXJuIHR5cGUgdG8gYQpuZXcgdHlwZWQgc3RydWN0IHRoYXQgbWlycm9ycyB0aGUgc3BlYyBxdWFu dGl0eToKCiAgICBzdHJ1Y3QgRmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSB7CiAgICAg ICAgTGF5b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplOwogICAgICAgIExheW91dFVuaXQgaHlw b3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplOwogICAgICAgIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBM YXlvdXRVbml0PiBtaW5NYXhNYWluU2l6ZXM7CiAgICB9OwoKVGhlIGh5cG90aGV0aWNhbCBtYWlu IGNvbnRlbnQgc2l6ZSBpcyBub3cgY29tcHV0ZWQgaW5zaWRlIHRoYXQgZnVuY3Rpb24gKGl0Cndh cyBwcmV2aW91c2x5IGRlcml2ZWQgaW5zaWRlIEZsZXhMYXlvdXRJdGVtJ3MgY29uc3RydWN0b3Ig YXMKY29uc3RyYWluU2l6ZUJ5TWluTWF4KGZsZXhCYXNlQ29udGVudFNpemUpKS4gRmxleExheW91 dEl0ZW0ncyBjb25zdHJ1Y3RvciBub3cKdGFrZXMgdGhlIHN0cnVjdCBwbHVzIGFuIGV2ZXJIYWRM YXlvdXQgZmxhZywgYW5kIHF1ZXJpZXMgbWFpbkF4aXNCb3JkZXItCkFuZFBhZGRpbmcgLyBtYWlu QXhpc01hcmdpbiBmcm9tIHRoZSBmbGV4IGl0ZW0gaXRzZWxmIHZpYSBhIHNtYWxsCmZsZXhDb250 YWluZXJJc0hvcml6b250YWxGbG93IGhlbHBlciBpbnN0ZWFkIG9mIHJlY2VpdmluZyB0aGVtIGFz IHBhcmFtZXRlcnMuCgpUaHJlZSBwZXItaXRlbSBib29ra2VlcGluZyBzdGVwcyB0aGF0IGxpdmVk IGluc2lkZSBjb25zdHJ1Y3RGbGV4TGF5b3V0SXRlbQoocmVzZXQgZGVmaW5pdGUtaGVpZ2h0IGNh Y2hlIG9uIGEgbmVzdGVkIGZsZXhib3gsIGNsZWFyIHRyaW1tZWQtbWFyZ2luCm1hcmtpbmdzLCBt YXJrIHByZWZlcnJlZC13aWR0aHMgZGlydHkpIHdlcmUgbW92ZWQgaW50byBhIHByZXBhcmVGbGV4 SXRlbQpsYW1iZGEgaW5zaWRlIHBlcmZvcm1GbGV4TGF5b3V0J3Mgc2V0dXAgbG9vcCB3aGVyZSB0 aGV5IGJlbG9uZyAtIHRoZXkgYXJlCm5vdCBwYXJ0IG9mIHRoZSBzaXplIGRldGVybWluYXRpb24u CgpObyBiZWhhdmlvciBjaGFuZ2UuCgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5jcHA6CihXZWJDb3JlOjpmbGV4Q29udGFpbmVySXNIb3Jpem9udGFsRmxvdyk6 CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleExheW91dEl0ZW06OkZsZXhMYXlvdXRJ dGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpwZXJmb3JtRmxleExheW91dCk6CihX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6 ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExheW91dEl0ZW0p OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o OgotLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgICB8IDU0 ICsrKysrKysrKystLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5oICB8IDEwICsrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwg MjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHAKaW5kZXggM2M3MjNhNGQ0YWI2Li41ODE4OWIzZWFmMmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNjcsMTQgKzY3 LDE4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogV1RGX01BS0VfVFpPTkVfQUxMT0NBVEVEX0lN UEwoUmVuZGVyRmxleGlibGVCb3gpOwogCi1SZW5kZXJGbGV4aWJsZUJveDo6RmxleExheW91dEl0 ZW06OkZsZXhMYXlvdXRJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQgZmxleEJh c2VDb250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91 dFVuaXQgbWFpbkF4aXNNYXJnaW4sIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBt aW5NYXhTaXplcywgYm9vbCBldmVySGFkTGF5b3V0KQorc3RhdGljIGJvb2wgZmxleENvbnRhaW5l cklzSG9yaXpvbnRhbEZsb3coY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkKK3sKKyAgICByZXR1 cm4gZG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+KCpmbGV4SXRlbS5wYXJlbnQoKSkuaXNIb3Jp em9udGFsRmxvdygpOworfQorCitSZW5kZXJGbGV4aWJsZUJveDo6RmxleExheW91dEl0ZW06OkZs ZXhMYXlvdXRJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IEZsZXhCYXNlQW5kSHlwb3Ro ZXRpY2FsTWFpblNpemUmIHNpemluZywgYm9vbCBldmVySGFkTGF5b3V0KQogICAgIDogcmVuZGVy ZXIoZmxleEl0ZW0pCi0gICAgLCBmbGV4QmFzZUNvbnRlbnRTaXplKGZsZXhCYXNlQ29udGVudFNp emUpCi0gICAgLCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcobWFpbkF4aXNCb3JkZXJBbmRQYWRk aW5nKQotICAgICwgbWFpbkF4aXNNYXJnaW4obWFpbkF4aXNNYXJnaW4pCi0gICAgLCBtaW5NYXhT aXplcyhtaW5NYXhTaXplcykKLSAgICAsIGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZShjb25z dHJhaW5TaXplQnlNaW5NYXgoZmxleEJhc2VDb250ZW50U2l6ZSkpCi0gICAgLCBmcm96ZW4oZmFs c2UpCisgICAgLCBmbGV4QmFzZUNvbnRlbnRTaXplKHNpemluZy5mbGV4QmFzZUNvbnRlbnRTaXpl KQorICAgICwgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nKGZsZXhDb250YWluZXJJc0hvcml6b250 YWxGbG93KGZsZXhJdGVtKSA/IGZsZXhJdGVtLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSkKKyAgICAs IG1haW5BeGlzTWFyZ2luKGZsZXhDb250YWluZXJJc0hvcml6b250YWxGbG93KGZsZXhJdGVtKSA/ IGZsZXhJdGVtLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGZsZXhJdGVtLnZlcnRpY2FsTWFy Z2luRXh0ZW50KCkpCisgICAgLCBtaW5NYXhTaXplcyhzaXppbmcubWluTWF4TWFpblNpemVzKQor ICAgICwgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplKHNpemluZy5oeXBvdGhldGljYWxNYWlu Q29udGVudFNpemUpCiAgICAgLCBldmVySGFkTGF5b3V0KGV2ZXJIYWRMYXlvdXQpCiB7CiAgICAg QVNTRVJUKCFmbGV4SXRlbS5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CkBAIC0xNjAzLDE1ICsx NjA3LDI2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnBlcmZvcm1GbGV4TGF5b3V0KFJlbGF5 b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKICAgICAvLyBzaG91bGQgd29yayBvZmYgdGhp cyBsaXN0IG9mIGEgc3Vic2V0LgogICAgIC8vIEZJWE1FOiBUaGF0IHNlY29uZCBwYXJ0IGlzIG5v dCB5ZXQgdHJ1ZS4KICAgICBGbGV4TGF5b3V0SXRlbXMgYWxsSXRlbXM7Ci0gICAgZm9yIChhdXRv KiBmbGV4SXRlbSA9IG1fb3JkZXJJdGVyYXRvci5maXJzdCgpOyBmbGV4SXRlbTsgZmxleEl0ZW0g PSBtX29yZGVySXRlcmF0b3IubmV4dCgpKSB7CisgICAgZm9yIChDaGVja2VkUHRyIGZsZXhJdGVt ID0gbV9vcmRlckl0ZXJhdG9yLmZpcnN0KCk7IGZsZXhJdGVtOyBmbGV4SXRlbSA9IG1fb3JkZXJJ dGVyYXRvci5uZXh0KCkpIHsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lw Q2hpbGQoKmZsZXhJdGVtKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4g YXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlm IChmbGV4SXRlbS0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgcHJl cGFyZUZsZXhJdGVtRm9yUG9zaXRpb25lZExheW91dCgqZmxleEl0ZW0pOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgYWxsSXRlbXMuYXBwZW5kKGNvbnN0cnVjdEZs ZXhMYXlvdXRJdGVtKCpmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbikpOwotICAgICAgICAvLyBj b25zdHJ1Y3RGbGV4SXRlbSgpIG1pZ2h0IHNldCB0aGUgb3ZlcnJpZGUgY29udGFpbmluZyBibG9j ayBoZWlnaHQgc28gYW55IHZhbHVlIGNhY2hlZCBmb3IgZGVmaW5pdGVuZXNzIG1pZ2h0IGJlIGlu Y29ycmVjdC4KKyAgICAgICAgYXV0byBwcmVwYXJlRmxleEl0ZW0gPSBbJl0geworICAgICAgICAg ICAgYXV0byBldmVySGFkTGF5b3V0ID0gZmxleEl0ZW0tPmV2ZXJIYWRMYXlvdXQoKTsKKyAgICAg ICAgICAgIGlmIChDaGVja2VkUHRyIGZsZXhpYmxlQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRl ckZsZXhpYmxlQm94PihmbGV4SXRlbS5nZXQoKSkpCisgICAgICAgICAgICAgICAgZmxleGlibGVC b3gtPnJlc2V0SGFzRGVmaW5pdGVIZWlnaHQoKTsKKyAgICAgICAgICAgIGlmIChldmVySGFkTGF5 b3V0ICYmIGZsZXhJdGVtLT5oYXNUcmltbWVkTWFyZ2luKHN0ZDo6b3B0aW9uYWw8U3R5bGU6Ok1h cmdpblRyaW1TaWRlPiB7IH0pKQorICAgICAgICAgICAgICAgIGZsZXhJdGVtLT5jbGVhclRyaW1t ZWRNYXJnaW5zTWFya2luZ3MoKTsKKyAgICAgICAgICAgIGlmIChmbGV4SXRlbS0+c2hvdWxkSW52 YWxpZGF0ZVByZWZlcnJlZFdpZHRocygpKQorICAgICAgICAgICAgICAgIGZsZXhJdGVtLT5zZXRO ZWVkc1ByZWZlcnJlZFdpZHRoc1VwZGF0ZShNYXJraW5nQmVoYXZpb3I6Ok1hcmtPbmx5VGhpcyk7 CisgICAgICAgICAgICByZXR1cm4gZXZlckhhZExheW91dDsKKyAgICAgICAgfTsKKyAgICAgICAg YXV0byBldmVySGFkTGF5b3V0ID0gcHJlcGFyZUZsZXhJdGVtKCk7CisgICAgICAgIGFsbEl0ZW1z LmFwcGVuZCh7ICpmbGV4SXRlbSwgZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSgqZmxl eEl0ZW0sIHJlbGF5b3V0Q2hpbGRyZW4pLCBldmVySGFkTGF5b3V0IH0pOworICAgICAgICAvLyBm bGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplIG1pZ2h0IHNldCB0aGUgb3ZlcnJpZGUgY29u dGFpbmluZyBibG9jayBoZWlnaHQgc28gYW55IHZhbHVlIGNhY2hlZCBmb3IgZGVmaW5pdGVuZXNz IG1pZ2h0IGJlIGluY29ycmVjdC4KICAgICAgICAgcmVzZXRIYXNEZWZpbml0ZUhlaWdodCgpOwog ICAgIH0KIApAQCAtMjEyNiwyMiArMjE0MSwxMSBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpl bnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94Jgog ICAgIG1fcmVsYWlkT3V0RmxleEl0ZW1zLmFkZChmbGV4SXRlbSk7CiB9CiAKLVJlbmRlckZsZXhp YmxlQm94OjpGbGV4TGF5b3V0SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExh eW91dEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENo aWxkcmVuKQorUmVuZGVyRmxleGlibGVCb3g6OkZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNp emUgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUoUmVu ZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuKQogewot ICAgIGF1dG8gZXZlckhhZExheW91dCA9IGZsZXhJdGVtLmV2ZXJIYWRMYXlvdXQoKTsKLSAgICBp ZiAoYXV0byogZmxleGlibGVCb3ggPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+ KGZsZXhJdGVtKSkKLSAgICAgICAgZmxleGlibGVCb3gtPnJlc2V0SGFzRGVmaW5pdGVIZWlnaHQo KTsKLQotICAgIGlmIChldmVySGFkTGF5b3V0ICYmIGZsZXhJdGVtLmhhc1RyaW1tZWRNYXJnaW4o c3RkOjpvcHRpb25hbDxTdHlsZTo6TWFyZ2luVHJpbVNpZGU+IHsgfSkpCi0gICAgICAgIGZsZXhJ dGVtLmNsZWFyVHJpbW1lZE1hcmdpbnNNYXJraW5ncygpOwotCi0gICAgaWYgKGZsZXhJdGVtLnNo b3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKLSAgICAgICAgZmxleEl0ZW0uc2V0TmVl ZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2aW9yOjpNYXJrT25seVRoaXMpOwot Ci0gICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9IGZsZXhCYXNlU2l6ZUZvckZsZXhJ dGVtKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKLSAgICBMYXlvdXRVbml0IGJvcmRlckFu ZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4SXRlbS5ob3Jpem9udGFsQm9yZGVy QW5kUGFkZGluZ0V4dGVudCgpIDogZmxleEl0ZW0udmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCk7Ci0gICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4 SXRlbS5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbE1hcmdpbkV4 dGVudCgpOwotICAgIHJldHVybiBGbGV4TGF5b3V0SXRlbShmbGV4SXRlbSwgaW5uZXJGbGV4QmFz ZVNpemUsIGJvcmRlckFuZFBhZGRpbmcsIG1hcmdpbiwgY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFp blNpemVzKGZsZXhJdGVtKSwgZXZlckhhZExheW91dCk7CisgICAgYXV0byBmbGV4QmFzZUNvbnRl bnRTaXplID0gZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oZmxleEl0ZW0sIHJlbGF5b3V0Q2hpbGRy ZW4pOworICAgIGF1dG8gbWluTWF4TWFpblNpemVzID0gY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFp blNpemVzKGZsZXhJdGVtKTsKKyAgICByZXR1cm4geyBmbGV4QmFzZUNvbnRlbnRTaXplLCBzdGQ6 Om1heChtaW5NYXhNYWluU2l6ZXMuZmlyc3QsIHN0ZDo6bWluKGZsZXhCYXNlQ29udGVudFNpemUs IG1pbk1heE1haW5TaXplcy5zZWNvbmQpKSwgbWluTWF4TWFpblNpemVzIH07CiB9CiAgICAgCiB2 b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVlemVWaW9sYXRpb25zKFZlY3RvcjxGbGV4TGF5b3V0 SXRlbSosIDQ+JiB2aW9sYXRpb25zLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRv dWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZsZXhTaHJpbmssIGRvdWJsZSYgdG90 YWxXZWlnaHRlZEZsZXhTaHJpbmspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oCmluZGV4IDVmN2JjYzJjOWE0Ny4uMTM3OTYyODYwNTU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMTIzLDkgKzEyMywx NSBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBTY29wZWRDcm9zc0F4 aXNPdmVycmlkZUZvckZsZXhJdGVtOwogCisgICAgc3RydWN0IEZsZXhCYXNlQW5kSHlwb3RoZXRp Y2FsTWFpblNpemUgeworICAgICAgICBMYXlvdXRVbml0IGZsZXhCYXNlQ29udGVudFNpemU7Cisg ICAgICAgIExheW91dFVuaXQgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplOworICAgICAgICBz dGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gbWluTWF4TWFpblNpemVzOworICAgIH07 CisKICAgICBjbGFzcyBGbGV4TGF5b3V0SXRlbSB7CiAgICAgcHVibGljOgotICAgICAgICBGbGV4 TGF5b3V0SXRlbShSZW5kZXJCb3gmLCBMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBMYXlvdXRVbml0 LCBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4sIGJvb2wpOworICAgICAgICBGbGV4 TGF5b3V0SXRlbShSZW5kZXJCb3gmLCBjb25zdCBGbGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5T aXplJiwgYm9vbCBldmVySGFkTGF5b3V0KTsKIAogICAgICAgICBMYXlvdXRVbml0IE5PREVMRVRF IGh5cG90aGV0aWNhbE1haW5BeGlzTWFyZ2luQm94U2l6ZSgpIGNvbnN0OwogICAgICAgICBMYXlv dXRVbml0IE5PREVMRVRFIGZsZXhCYXNlTWFyZ2luQm94U2l6ZSgpIGNvbnN0OwpAQCAtMjY4LDcg KzI3NCw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlVXNlZE5vbkF1dG9NaW5N YWluU2l6ZShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBTdHlsZTo6TWluaW11bVNpemUmKTsK ICAgICBMYXlvdXRVbml0IGNvbXB1dGVDb250ZW50QmFzZWRNaW5NYWluU2l6ZShSZW5kZXJCb3gm IGZsZXhJdGVtLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IG1heEV4dGVudCk7CiAgICAgTGF5 b3V0VW5pdCBhZGp1c3RGbGV4SXRlbVNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1h eChjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtLCBMYXlvdXRVbml0IGZsZXhJdGVtU2l6ZSk7Ci0g ICAgRmxleExheW91dEl0ZW0gY29uc3RydWN0RmxleExheW91dEl0ZW0oUmVuZGVyQm94JiwgUmVs YXlvdXRDaGlsZHJlbik7CisgICAgRmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSBmbGV4 QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplKFJlbmRlckJveCYsIFJlbGF5b3V0Q2hpbGRyZW4p OwogICAgIAogICAgIHZvaWQgZnJlZXplSW5mbGV4aWJsZUl0ZW1zKEZsZXhTaWduLCBGbGV4TGF5 b3V0SXRlbXMmLCBMYXlvdXRVbml0JiByZW1haW5pbmdGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxG bGV4R3JvdywgZG91YmxlJiB0b3RhbEZsZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZs ZXhTaHJpbmspOwogICAgIGJvb2wgcmVzb2x2ZUZsZXhpYmxlTGVuZ3RocyhGbGV4U2lnbiwgRmxl eExheW91dEl0ZW1zJiwgTGF5b3V0VW5pdCBpbml0aWFsRnJlZVNwYWNlLCBMYXlvdXRVbml0JiBy ZW1haW5pbmdGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZs ZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmspOwo= 479802 2026-05-25 07:53:20 -0700 2026-05-25 09:59:17 -0700 [fast-cq]Patch bug-315439-20260525075319.patch text/plain 9734 zalan RnJvbSA2MWNiZjY2ODU5Y2EwMzBkZGQ2MWIzOTE3N2FiYTdjNTgyOGY2ZTQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjMgTWF5IDIwMjYgMjA6MzQ6MDMgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gU2VwYXJhdGUgZmxleCBiYXNlL2h5cG90aGV0aWNhbCBtYWluIHNpemUKIGRldGVybWluYXRp b24gZnJvbSBGbGV4TGF5b3V0SXRlbSBjb25zdHJ1Y3Rpb24KIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMTU0MzkKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoK Y29uc3RydWN0RmxleExheW91dEl0ZW0gd2FzIGRvaW5nIHR3byB1bnJlbGF0ZWQgdGhpbmdzOiBy dW5uaW5nIHRoZSBzcGVjCnNlY3Rpb24gOS4yLjMgc3RlcCAoZGV0ZXJtaW5lIHRoZSBmbGV4IGJh c2Ugc2l6ZSBhbmQgaHlwb3RoZXRpY2FsIG1haW4gc2l6ZQpvZiBlYWNoIGl0ZW0pIGFuZCBjb25z dHJ1Y3RpbmcgdGhlIEZsZXhMYXlvdXRJdGVtIG9iamVjdCB0aGF0IGNhcnJpZXMgdGhvc2UKc2l6 ZXMgaW50byB0aGUgcmVzdCBvZiB0aGUgZmxleCBhbGdvcml0aG0uIFRoZSBmdW5jdGlvbiBuYW1l IGRlc2NyaWJlZCB0aGUKb3V0cHV0IG9iamVjdCwgbm90IHRoZSBsYXlvdXQgc3RlcC4KClJlbmFt ZWQgdG8gZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSBhbmQgY2hhbmdlZCB0aGUgcmV0 dXJuIHR5cGUgdG8gYQpuZXcgdHlwZWQgc3RydWN0IHRoYXQgbWlycm9ycyB0aGUgc3BlYyBxdWFu dGl0eToKCiAgICBzdHJ1Y3QgRmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSB7CiAgICAg ICAgTGF5b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplOwogICAgICAgIExheW91dFVuaXQgaHlw b3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplOwogICAgICAgIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBM YXlvdXRVbml0PiBtaW5NYXhNYWluU2l6ZXM7CiAgICB9OwoKVGhlIGh5cG90aGV0aWNhbCBtYWlu IGNvbnRlbnQgc2l6ZSBpcyBub3cgY29tcHV0ZWQgaW5zaWRlIHRoYXQgZnVuY3Rpb24gKGl0Cndh cyBwcmV2aW91c2x5IGRlcml2ZWQgaW5zaWRlIEZsZXhMYXlvdXRJdGVtJ3MgY29uc3RydWN0b3Ig YXMKY29uc3RyYWluU2l6ZUJ5TWluTWF4KGZsZXhCYXNlQ29udGVudFNpemUpKS4gRmxleExheW91 dEl0ZW0ncyBjb25zdHJ1Y3RvciBub3cKdGFrZXMgdGhlIHN0cnVjdCBwbHVzIGFuIGV2ZXJIYWRM YXlvdXQgZmxhZywgYW5kIHF1ZXJpZXMgbWFpbkF4aXNCb3JkZXItCkFuZFBhZGRpbmcgLyBtYWlu QXhpc01hcmdpbiBmcm9tIHRoZSBmbGV4IGl0ZW0gaXRzZWxmIHZpYSBhIHNtYWxsCmZsZXhDb250 YWluZXJJc0hvcml6b250YWxGbG93IGhlbHBlciBpbnN0ZWFkIG9mIHJlY2VpdmluZyB0aGVtIGFz IHBhcmFtZXRlcnMuCgpUaHJlZSBwZXItaXRlbSBib29ra2VlcGluZyBzdGVwcyB0aGF0IGxpdmVk IGluc2lkZSBjb25zdHJ1Y3RGbGV4TGF5b3V0SXRlbQoocmVzZXQgZGVmaW5pdGUtaGVpZ2h0IGNh Y2hlIG9uIGEgbmVzdGVkIGZsZXhib3gsIGNsZWFyIHRyaW1tZWQtbWFyZ2luCm1hcmtpbmdzLCBt YXJrIHByZWZlcnJlZC13aWR0aHMgZGlydHkpIHdlcmUgbW92ZWQgaW50byBhIHByZXBhcmVGbGV4 SXRlbQpsYW1iZGEgaW5zaWRlIHBlcmZvcm1GbGV4TGF5b3V0J3Mgc2V0dXAgbG9vcCB3aGVyZSB0 aGV5IGJlbG9uZyAtIHRoZXkgYXJlCm5vdCBwYXJ0IG9mIHRoZSBzaXplIGRldGVybWluYXRpb24u CgpObyBiZWhhdmlvciBjaGFuZ2UuCgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5jcHA6CihXZWJDb3JlOjpmbGV4Q29udGFpbmVySXNIb3Jpem9udGFsRmxvdyk6 CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleExheW91dEl0ZW06OkZsZXhMYXlvdXRJ dGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpwZXJmb3JtRmxleExheW91dCk6CihX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6 ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExheW91dEl0ZW0p OiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o OgotLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgICB8IDU0 ICsrKysrKysrKystLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5oICB8IDEwICsrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwg MjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHAKaW5kZXggNDQ0ODAzM2Y2YWZlLi5mNWI0NDZhMGY2NzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNjcsMTQgKzY3 LDE4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogV1RGX01BS0VfVFpPTkVfQUxMT0NBVEVEX0lN UEwoUmVuZGVyRmxleGlibGVCb3gpOwogCi1SZW5kZXJGbGV4aWJsZUJveDo6RmxleExheW91dEl0 ZW06OkZsZXhMYXlvdXRJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQgZmxleEJh c2VDb250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91 dFVuaXQgbWFpbkF4aXNNYXJnaW4sIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBt aW5NYXhTaXplcywgYm9vbCBldmVySGFkTGF5b3V0KQorc3RhdGljIGJvb2wgZmxleENvbnRhaW5l cklzSG9yaXpvbnRhbEZsb3coY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkKK3sKKyAgICByZXR1 cm4gZG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+KCpmbGV4SXRlbS5wYXJlbnQoKSkuaXNIb3Jp em9udGFsRmxvdygpOworfQorCitSZW5kZXJGbGV4aWJsZUJveDo6RmxleExheW91dEl0ZW06OkZs ZXhMYXlvdXRJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IEZsZXhCYXNlQW5kSHlwb3Ro ZXRpY2FsTWFpblNpemUmIHNpemluZywgYm9vbCBldmVySGFkTGF5b3V0KQogICAgIDogcmVuZGVy ZXIoZmxleEl0ZW0pCi0gICAgLCBmbGV4QmFzZUNvbnRlbnRTaXplKGZsZXhCYXNlQ29udGVudFNp emUpCi0gICAgLCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcobWFpbkF4aXNCb3JkZXJBbmRQYWRk aW5nKQotICAgICwgbWFpbkF4aXNNYXJnaW4obWFpbkF4aXNNYXJnaW4pCi0gICAgLCBtaW5NYXhT aXplcyhtaW5NYXhTaXplcykKLSAgICAsIGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZShjb25z dHJhaW5TaXplQnlNaW5NYXgoZmxleEJhc2VDb250ZW50U2l6ZSkpCi0gICAgLCBmcm96ZW4oZmFs c2UpCisgICAgLCBmbGV4QmFzZUNvbnRlbnRTaXplKHNpemluZy5mbGV4QmFzZUNvbnRlbnRTaXpl KQorICAgICwgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nKGZsZXhDb250YWluZXJJc0hvcml6b250 YWxGbG93KGZsZXhJdGVtKSA/IGZsZXhJdGVtLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSkKKyAgICAs IG1haW5BeGlzTWFyZ2luKGZsZXhDb250YWluZXJJc0hvcml6b250YWxGbG93KGZsZXhJdGVtKSA/ IGZsZXhJdGVtLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGZsZXhJdGVtLnZlcnRpY2FsTWFy Z2luRXh0ZW50KCkpCisgICAgLCBtaW5NYXhTaXplcyhzaXppbmcubWluTWF4TWFpblNpemVzKQor ICAgICwgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplKHNpemluZy5oeXBvdGhldGljYWxNYWlu Q29udGVudFNpemUpCiAgICAgLCBldmVySGFkTGF5b3V0KGV2ZXJIYWRMYXlvdXQpCiB7CiAgICAg QVNTRVJUKCFmbGV4SXRlbS5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CkBAIC0xNjAwLDE1ICsx NjA0LDI2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnBlcmZvcm1GbGV4TGF5b3V0KFJlbGF5 b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKICAgICAvLyBzaG91bGQgd29yayBvZmYgdGhp cyBsaXN0IG9mIGEgc3Vic2V0LgogICAgIC8vIEZJWE1FOiBUaGF0IHNlY29uZCBwYXJ0IGlzIG5v dCB5ZXQgdHJ1ZS4KICAgICBGbGV4TGF5b3V0SXRlbXMgYWxsSXRlbXM7Ci0gICAgZm9yIChhdXRv KiBmbGV4SXRlbSA9IG1fb3JkZXJJdGVyYXRvci5maXJzdCgpOyBmbGV4SXRlbTsgZmxleEl0ZW0g PSBtX29yZGVySXRlcmF0b3IubmV4dCgpKSB7CisgICAgZm9yIChDaGVja2VkUHRyIGZsZXhJdGVt ID0gbV9vcmRlckl0ZXJhdG9yLmZpcnN0KCk7IGZsZXhJdGVtOyBmbGV4SXRlbSA9IG1fb3JkZXJJ dGVyYXRvci5uZXh0KCkpIHsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lw Q2hpbGQoKmZsZXhJdGVtKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4g YXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlm IChmbGV4SXRlbS0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgcHJl cGFyZUZsZXhJdGVtRm9yUG9zaXRpb25lZExheW91dCgqZmxleEl0ZW0pOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgYWxsSXRlbXMuYXBwZW5kKGNvbnN0cnVjdEZs ZXhMYXlvdXRJdGVtKCpmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbikpOwotICAgICAgICAvLyBj b25zdHJ1Y3RGbGV4SXRlbSgpIG1pZ2h0IHNldCB0aGUgb3ZlcnJpZGUgY29udGFpbmluZyBibG9j ayBoZWlnaHQgc28gYW55IHZhbHVlIGNhY2hlZCBmb3IgZGVmaW5pdGVuZXNzIG1pZ2h0IGJlIGlu Y29ycmVjdC4KKyAgICAgICAgYXV0byBwcmVwYXJlRmxleEl0ZW0gPSBbJl0geworICAgICAgICAg ICAgYXV0byBldmVySGFkTGF5b3V0ID0gZmxleEl0ZW0tPmV2ZXJIYWRMYXlvdXQoKTsKKyAgICAg ICAgICAgIGlmIChDaGVja2VkUHRyIGZsZXhpYmxlQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRl ckZsZXhpYmxlQm94PihmbGV4SXRlbS5nZXQoKSkpCisgICAgICAgICAgICAgICAgZmxleGlibGVC b3gtPnJlc2V0SGFzRGVmaW5pdGVIZWlnaHQoKTsKKyAgICAgICAgICAgIGlmIChldmVySGFkTGF5 b3V0ICYmIGZsZXhJdGVtLT5oYXNUcmltbWVkTWFyZ2luKHN0ZDo6b3B0aW9uYWw8U3R5bGU6Ok1h cmdpblRyaW1TaWRlPiB7IH0pKQorICAgICAgICAgICAgICAgIGZsZXhJdGVtLT5jbGVhclRyaW1t ZWRNYXJnaW5zTWFya2luZ3MoKTsKKyAgICAgICAgICAgIGlmIChmbGV4SXRlbS0+c2hvdWxkSW52 YWxpZGF0ZVByZWZlcnJlZFdpZHRocygpKQorICAgICAgICAgICAgICAgIGZsZXhJdGVtLT5zZXRO ZWVkc1ByZWZlcnJlZFdpZHRoc1VwZGF0ZShNYXJraW5nQmVoYXZpb3I6Ok1hcmtPbmx5VGhpcyk7 CisgICAgICAgICAgICByZXR1cm4gZXZlckhhZExheW91dDsKKyAgICAgICAgfTsKKyAgICAgICAg YXV0byBldmVySGFkTGF5b3V0ID0gcHJlcGFyZUZsZXhJdGVtKCk7CisgICAgICAgIGFsbEl0ZW1z LmFwcGVuZCh7ICpmbGV4SXRlbSwgZmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSgqZmxl eEl0ZW0sIHJlbGF5b3V0Q2hpbGRyZW4pLCBldmVySGFkTGF5b3V0IH0pOworICAgICAgICAvLyBm bGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplIG1pZ2h0IHNldCB0aGUgb3ZlcnJpZGUgY29u dGFpbmluZyBibG9jayBoZWlnaHQgc28gYW55IHZhbHVlIGNhY2hlZCBmb3IgZGVmaW5pdGVuZXNz IG1pZ2h0IGJlIGluY29ycmVjdC4KICAgICAgICAgcmVzZXRIYXNEZWZpbml0ZUhlaWdodCgpOwog ICAgIH0KIApAQCAtMjEyMywyMiArMjEzOCwxMSBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpl bnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94Jgog ICAgIG1fcmVsYWlkT3V0RmxleEl0ZW1zLmFkZChmbGV4SXRlbSk7CiB9CiAKLVJlbmRlckZsZXhp YmxlQm94OjpGbGV4TGF5b3V0SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExh eW91dEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENo aWxkcmVuKQorUmVuZGVyRmxleGlibGVCb3g6OkZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNp emUgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUoUmVu ZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuKQogewot ICAgIGF1dG8gZXZlckhhZExheW91dCA9IGZsZXhJdGVtLmV2ZXJIYWRMYXlvdXQoKTsKLSAgICBp ZiAoYXV0byogZmxleGlibGVCb3ggPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+ KGZsZXhJdGVtKSkKLSAgICAgICAgZmxleGlibGVCb3gtPnJlc2V0SGFzRGVmaW5pdGVIZWlnaHQo KTsKLQotICAgIGlmIChldmVySGFkTGF5b3V0ICYmIGZsZXhJdGVtLmhhc1RyaW1tZWRNYXJnaW4o c3RkOjpvcHRpb25hbDxTdHlsZTo6TWFyZ2luVHJpbVNpZGU+IHsgfSkpCi0gICAgICAgIGZsZXhJ dGVtLmNsZWFyVHJpbW1lZE1hcmdpbnNNYXJraW5ncygpOwotCi0gICAgaWYgKGZsZXhJdGVtLnNo b3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKLSAgICAgICAgZmxleEl0ZW0uc2V0TmVl ZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2aW9yOjpNYXJrT25seVRoaXMpOwot Ci0gICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9IGZsZXhCYXNlU2l6ZUZvckZsZXhJ dGVtKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKLSAgICBMYXlvdXRVbml0IGJvcmRlckFu ZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4SXRlbS5ob3Jpem9udGFsQm9yZGVy QW5kUGFkZGluZ0V4dGVudCgpIDogZmxleEl0ZW0udmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCk7Ci0gICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4 SXRlbS5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbE1hcmdpbkV4 dGVudCgpOwotICAgIHJldHVybiBGbGV4TGF5b3V0SXRlbShmbGV4SXRlbSwgaW5uZXJGbGV4QmFz ZVNpemUsIGJvcmRlckFuZFBhZGRpbmcsIG1hcmdpbiwgY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFp blNpemVzKGZsZXhJdGVtKSwgZXZlckhhZExheW91dCk7CisgICAgYXV0byBmbGV4QmFzZUNvbnRl bnRTaXplID0gZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oZmxleEl0ZW0sIHJlbGF5b3V0Q2hpbGRy ZW4pOworICAgIGF1dG8gbWluTWF4TWFpblNpemVzID0gY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFp blNpemVzKGZsZXhJdGVtKTsKKyAgICByZXR1cm4geyBmbGV4QmFzZUNvbnRlbnRTaXplLCBzdGQ6 Om1heChtaW5NYXhNYWluU2l6ZXMuZmlyc3QsIHN0ZDo6bWluKGZsZXhCYXNlQ29udGVudFNpemUs IG1pbk1heE1haW5TaXplcy5zZWNvbmQpKSwgbWluTWF4TWFpblNpemVzIH07CiB9CiAgICAgCiB2 b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVlemVWaW9sYXRpb25zKFZlY3RvcjxGbGV4TGF5b3V0 SXRlbSosIDQ+JiB2aW9sYXRpb25zLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRv dWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZsZXhTaHJpbmssIGRvdWJsZSYgdG90 YWxXZWlnaHRlZEZsZXhTaHJpbmspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oCmluZGV4IDVmN2JjYzJjOWE0Ny4uMTM3OTYyODYwNTU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMTIzLDkgKzEyMywx NSBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBTY29wZWRDcm9zc0F4 aXNPdmVycmlkZUZvckZsZXhJdGVtOwogCisgICAgc3RydWN0IEZsZXhCYXNlQW5kSHlwb3RoZXRp Y2FsTWFpblNpemUgeworICAgICAgICBMYXlvdXRVbml0IGZsZXhCYXNlQ29udGVudFNpemU7Cisg ICAgICAgIExheW91dFVuaXQgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplOworICAgICAgICBz dGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gbWluTWF4TWFpblNpemVzOworICAgIH07 CisKICAgICBjbGFzcyBGbGV4TGF5b3V0SXRlbSB7CiAgICAgcHVibGljOgotICAgICAgICBGbGV4 TGF5b3V0SXRlbShSZW5kZXJCb3gmLCBMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBMYXlvdXRVbml0 LCBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4sIGJvb2wpOworICAgICAgICBGbGV4 TGF5b3V0SXRlbShSZW5kZXJCb3gmLCBjb25zdCBGbGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5T aXplJiwgYm9vbCBldmVySGFkTGF5b3V0KTsKIAogICAgICAgICBMYXlvdXRVbml0IE5PREVMRVRF IGh5cG90aGV0aWNhbE1haW5BeGlzTWFyZ2luQm94U2l6ZSgpIGNvbnN0OwogICAgICAgICBMYXlv dXRVbml0IE5PREVMRVRFIGZsZXhCYXNlTWFyZ2luQm94U2l6ZSgpIGNvbnN0OwpAQCAtMjY4LDcg KzI3NCw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlVXNlZE5vbkF1dG9NaW5N YWluU2l6ZShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBTdHlsZTo6TWluaW11bVNpemUmKTsK ICAgICBMYXlvdXRVbml0IGNvbXB1dGVDb250ZW50QmFzZWRNaW5NYWluU2l6ZShSZW5kZXJCb3gm IGZsZXhJdGVtLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IG1heEV4dGVudCk7CiAgICAgTGF5 b3V0VW5pdCBhZGp1c3RGbGV4SXRlbVNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1h eChjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtLCBMYXlvdXRVbml0IGZsZXhJdGVtU2l6ZSk7Ci0g ICAgRmxleExheW91dEl0ZW0gY29uc3RydWN0RmxleExheW91dEl0ZW0oUmVuZGVyQm94JiwgUmVs YXlvdXRDaGlsZHJlbik7CisgICAgRmxleEJhc2VBbmRIeXBvdGhldGljYWxNYWluU2l6ZSBmbGV4 QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplKFJlbmRlckJveCYsIFJlbGF5b3V0Q2hpbGRyZW4p OwogICAgIAogICAgIHZvaWQgZnJlZXplSW5mbGV4aWJsZUl0ZW1zKEZsZXhTaWduLCBGbGV4TGF5 b3V0SXRlbXMmLCBMYXlvdXRVbml0JiByZW1haW5pbmdGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxG bGV4R3JvdywgZG91YmxlJiB0b3RhbEZsZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZs ZXhTaHJpbmspOwogICAgIGJvb2wgcmVzb2x2ZUZsZXhpYmxlTGVuZ3RocyhGbGV4U2lnbiwgRmxl eExheW91dEl0ZW1zJiwgTGF5b3V0VW5pdCBpbml0aWFsRnJlZVNwYWNlLCBMYXlvdXRVbml0JiBy ZW1haW5pbmdGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZs ZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmspOwo=