313943 2026-05-03 17:43:34 -0700 [cleanup] Move helper lambdas from FloatingContext::constraints to local static functions 2026-05-04 11:57:12 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 313929 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2207048 0 zalan 2026-05-03 17:43:34 -0700 to make FloatingContext::constraints less convoluted 2207049 1 479459 zalan 2026-05-03 17:47:21 -0700 Created attachment 479459 Patch 2207155 2 479462 zalan 2026-05-04 05:34:34 -0700 Created attachment 479462 Patch 2207183 3 479464 zalan 2026-05-04 07:07:35 -0700 Created attachment 479464 Patch 2207202 4 479465 zalan 2026-05-04 08:39:46 -0700 Created attachment 479465 [fast-cq]Patch 2207282 5 ews-feeder 2026-05-04 11:56:35 -0700 Committed 312536@main (d4c0d8e82a83): <https://commits.webkit.org/312536@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479465. 2207285 6 webkit-bug-importer 2026-05-04 11:57:12 -0700 <rdar://problem/176200229> 479459 2026-05-03 17:47:21 -0700 2026-05-04 05:34:32 -0700 Patch bug-313943-20260503174720.patch text/plain 7682 zalan RnJvbSA5MTk1NDlmNWQxOThhZTU2ODNiM2FmMThmYjdhNDgxOGQwY2E1NzNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBNYXkgMjAyNiAxNzo0NTo0NiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtjbGVhbnVw XSBNb3ZlIGhlbHBlciBsYW1iZGFzIGZyb20KIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMg dG8gbG9jYWwgc3RhdGljIGZ1bmN0aW9ucwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMxMzk0MwoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpUaGUgRmxvYXRp bmdDb250ZXh0Ojpjb25zdHJhaW50cyBmdW5jdGlvbiBoYWQgdHdvIGhlbHBlciBsYW1iZGFzIChg Y29udGFpbnNgIGFuZApgY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbWApIGRlZmluZWQgaW5saW5l LiBUaGVzZSBsYW1iZGFzIGNhcHR1cmVkIGxvY2FsIHZhcmlhYmxlcwphbmQgbWFkZSB0aGUgYWxy ZWFkeSBsb25nIGZ1bmN0aW9uIGhhcmRlciB0byByZWFkLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OmZsb2F0Q29u dGFpbnNMaW5lKToKKFdlYkNvcmU6OkxheW91dDo6Y29tcHV0ZVNoYXBlRWRnZSk6CihXZWJDb3Jl OjpMYXlvdXQ6OmNvbXB1dGVGbG9hdEVkZ2VBbmRCb3R0b20pOgooV2ViQ29yZTo6TGF5b3V0OjpG bG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzKToKLS0tCiAuLi4vV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAgfCAxMDEgKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCmluZGV4IGM4MjQzM2Ez MjNkNy4uMzlkNzZhYmEzZGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0 cy9GbG9hdGluZ0NvbnRleHQuY3BwCkBAIC0zNDksNiArMzQ5LDU2IEBAIHN0ZDo6b3B0aW9uYWw8 RmxvYXRpbmdDb250ZXh0OjpCbG9ja0F4aXNQb3NpdGlvbldpdGhDbGVhcmFuY2U+IEZsb2F0aW5n Q29udGV4dDo6CiAgICAgcmV0dXJuIHsgfTsKIH0KIAorc3RhdGljIGJvb2wgZmxvYXRDb250YWlu c0xpbmUoY29uc3QgUmVjdCYgZmxvYXRCb3hSZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwg TGF5b3V0VW5pdCBjYW5kaWRhdGVCb3R0b20sIExheW91dFVuaXQgY2FuZGlkYXRlSGVpZ2h0KQor eworICAgIGlmIChmbG9hdEJveFJlY3QuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFjYW5kaWRhdGVIZWlnaHQpCisgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3Qu dG9wKCkgPD0gY2FuZGlkYXRlVG9wICYmIGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0 ZVRvcDsKKyAgICByZXR1cm4gZmxvYXRCb3hSZWN0LnRvcCgpIDwgY2FuZGlkYXRlQm90dG9tICYm IGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0ZVRvcDsKK30KKworc3RhdGljIHN0ZDo6 b3B0aW9uYWw8c3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+PiBjb21wdXRlU2hhcGVF ZGdlKGNvbnN0IFBsYWNlZEZsb2F0czo6SXRlbSYgZmxvYXRJdGVtLCBjb25zdCBSZWN0JiBtYXJn aW5SZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwgTGF5b3V0VW5pdCBjYW5kaWRhdGVIZWln aHQpCit7CisgICAgYXV0byogc2hhcGUgPSBmbG9hdEl0ZW0uc2hhcGUoKTsKKyAgICBpZiAoIXNo YXBlKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgYXV0byBib3JkZXJSZWN0ID0gZmxvYXRJ dGVtLmFic29sdXRlQm9yZGVyQm94UmVjdCgpOworICAgIGF1dG8gcG9zaXRpb25JblNoYXBlID0g Y2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKKworICAgIGlmICghc2hhcGUtPmxpbmVP dmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKHBvc2l0aW9uSW5TaGFwZSwgY2FuZGlkYXRlSGVpZ2h0 KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1 c2VkIHdoZW4gcGFzc2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgorICAg IGF1dG8gc2VnbWVudCA9IHNoYXBlLT5nZXRFeGNsdWRlZEludGVydmFsKHBvc2l0aW9uSW5TaGFw ZSwgc3RkOjptYXgoY2FuZGlkYXRlSGVpZ2h0LCAxX2x1KSk7CisgICAgaWYgKCFzZWdtZW50Lmlz VmFsaWQpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBwb3Rl bnRpYWxseSBzbG93LgorICAgIGF1dG8gYm90dG9tID0gY2FuZGlkYXRlVG9wICsgMV9sdTsKKwor ICAgIGlmIChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgeworICAgICAgICBhdXRvIHNo YXBlUmlnaHQgPSBib3JkZXJSZWN0LmxlZnQoKSArIExheW91dFVuaXQgeyBzZWdtZW50LmxvZ2lj YWxSaWdodCB9OworICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3RkOjptaW4oc2hhcGVSaWdo dCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07CisgICAgfQorICAgIGF1dG8gc2hhcGVM ZWZ0ID0gYm9yZGVyUmVjdC5sZWZ0KCkgKyBMYXlvdXRVbml0IHsgc2VnbWVudC5sb2dpY2FsTGVm dCB9OworICAgIHJldHVybiBzdGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJl Y3QubGVmdCgpKSwgYm90dG9tIH07Cit9CisKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPHN0ZDo6cGFp cjxMYXlvdXRVbml0LCBMYXlvdXRVbml0Pj4gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShjb25z dCBQbGFjZWRGbG9hdHM6Okl0ZW0mIGZsb2F0SXRlbSwgTGF5b3V0VW5pdCBjYW5kaWRhdGVUb3As IExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBMYXlvdXRVbml0IGNhbmRpZGF0ZUhlaWdodCkK K3sKKyAgICBhdXRvIG1hcmdpblJlY3QgPSBmbG9hdEl0ZW0uYWJzb2x1dGVSZWN0V2l0aE1hcmdp bigpOworICAgIGlmICghZmxvYXRDb250YWluc0xpbmUobWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9w LCBjYW5kaWRhdGVCb3R0b20sIGNhbmRpZGF0ZUhlaWdodCkpCisgICAgICAgIHJldHVybiB7IH07 CisKKyAgICBpZiAoYXV0byBzaGFwZUVkZ2UgPSBjb21wdXRlU2hhcGVFZGdlKGZsb2F0SXRlbSwg bWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9wLCBjYW5kaWRhdGVIZWlnaHQpKQorICAgICAgICByZXR1 cm4gc2hhcGVFZGdlOworCisgICAgYXV0byBlZGdlID0gZmxvYXRJdGVtLmlzU3RhcnRQb3NpdGlv bmVkKCkgPyBtYXJnaW5SZWN0LnJpZ2h0KCkgOiBtYXJnaW5SZWN0LmxlZnQoKTsKKyAgICByZXR1 cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OworfQorCiBGbG9hdGlu Z0NvbnRleHQ6OkNvbnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMoTGF5b3V0 VW5pdCBjYW5kaWRhdGVUb3AsIExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBNYXlCZUFib3Zl TGFzdEZsb2F0IG1heUJlQWJvdmVMYXN0RmxvYXQpIGNvbnN0CiB7CiAgICAgaWYgKGlzRW1wdHko KSkKQEAgLTM2OCw1NiArNDE4LDEzIEBAIEZsb2F0aW5nQ29udGV4dDo6Q29uc3RyYWludHMgRmxv YXRpbmdDb250ZXh0Ojpjb25zdHJhaW50cyhMYXlvdXRVbml0IGNhbmRpZGF0ZVRvCiAgICAgYXV0 byBhZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wICsgKGNhbmRp ZGF0ZUJvdHRvbSAtIGNhbmRpZGF0ZVRvcCk7CiAgICAgYXV0byBjYW5kaWRhdGVIZWlnaHQgPSBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSAtIGFkanVzdGVkQ2FuZGlkYXRlVG9wOwogCi0gICAgYXV0 byBjb250YWlucyA9IFsmXSAoYXV0byYgZmxvYXRCb3hSZWN0KSB7Ci0gICAgICAgIGlmIChmbG9h dEJveFJlY3QuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBp ZiAoIWNhbmRpZGF0ZUhlaWdodCkKLSAgICAgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9w KCkgPD0gYWRqdXN0ZWRDYW5kaWRhdGVUb3AgJiYgZmxvYXRCb3hSZWN0LmJvdHRvbSgpID4gYWRq dXN0ZWRDYW5kaWRhdGVUb3A7Ci0gICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9wKCkgPCBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSAmJiBmbG9hdEJveFJlY3QuYm90dG9tKCkgPiBhZGp1c3Rl ZENhbmRpZGF0ZVRvcDsKLSAgICB9OwotCi0gICAgYXV0byBjb21wdXRlRmxvYXRFZGdlQW5kQm90 dG9tID0gWyZdKGF1dG8mIGZsb2F0SXRlbSkgLT4gc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8TGF5 b3V0VW5pdCwgTGF5b3V0VW5pdD4+IHsKLSAgICAgICAgYXV0byBtYXJnaW5SZWN0ID0gZmxvYXRJ dGVtLmFic29sdXRlUmVjdFdpdGhNYXJnaW4oKTsKLSAgICAgICAgaWYgKCFjb250YWlucyhtYXJn aW5SZWN0KSkKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgaWYgKGF1dG8qIHNo YXBlID0gZmxvYXRJdGVtLnNoYXBlKCkpIHsKLSAgICAgICAgICAgIC8vIFNoYXBlcyBhcmUgcmVs YXRpdmUgdG8gdGhlIGJvcmRlciBib3guCi0gICAgICAgICAgICBhdXRvIGJvcmRlclJlY3QgPSBm bG9hdEl0ZW0uYWJzb2x1dGVCb3JkZXJCb3hSZWN0KCk7Ci0gICAgICAgICAgICBhdXRvIHBvc2l0 aW9uSW5TaGFwZSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKLQot ICAgICAgICAgICAgaWYgKCFzaGFwZS0+bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMocG9z aXRpb25JblNoYXBlLCBjYW5kaWRhdGVIZWlnaHQpKQotICAgICAgICAgICAgICAgIHJldHVybiB7 IH07Ci0KLSAgICAgICAgICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1c2VkIHdoZW4gcGFz c2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgotICAgICAgICAgICAgYXV0 byBzZWdtZW50ID0gc2hhcGUtPmdldEV4Y2x1ZGVkSW50ZXJ2YWwocG9zaXRpb25JblNoYXBlLCBz dGQ6Om1heChjYW5kaWRhdGVIZWlnaHQsIDFfbHUpKTsKLSAgICAgICAgICAgIGlmICghc2VnbWVu dC5pc1ZhbGlkKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgICAgIC8v IEJvdHRvbSBpcyB1c2VkIHRvIGRlY2lkZSB0aGUgbmV4dCBsaW5lIHRvcCBpZiBub3RoaW5nIGZp dHMuIFdpdGggc2hhcGUgd2UnbGwganVzdCBzYW1wbGUgb25lIHBpeGVsIGRvd24uCi0gICAgICAg ICAgICAvLyBGSVhNRTogVGhpcyBpcyBwb3RlbnRpYWxseSBzbG93LgotICAgICAgICAgICAgYXV0 byBib3R0b20gPSBhZGp1c3RlZENhbmRpZGF0ZVRvcCArIDFfbHU7Ci0KLSAgICAgICAgICAgIGlm IChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgewotICAgICAgICAgICAgICAgIGF1dG8g c2hhcGVSaWdodCA9IGJvcmRlclJlY3QubGVmdCgpICsgTGF5b3V0VW5pdCB7IHNlZ21lbnQubG9n aWNhbFJpZ2h0IH07Ci0gICAgICAgICAgICAgICAgLy8gU2hhcGUgY2FuJ3QgZXh0ZW5kIGJleW9u ZCB0aGUgbWFyZ2luIGJveC4KLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3Rk OjptaW4oc2hhcGVSaWdodCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIHNoYXBlTGVmdCA9IGJvcmRlclJlY3QubGVmdCgpICsg TGF5b3V0VW5pdCB7IHNlZ21lbnQubG9naWNhbExlZnQgfTsKLSAgICAgICAgICAgIHJldHVybiBz dGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJlY3QubGVmdCgpKSwgYm90dG9t IH07Ci0gICAgICAgIH0KLQotICAgICAgICBhdXRvIGVkZ2UgPSBmbG9hdEl0ZW0uaXNTdGFydFBv c2l0aW9uZWQoKSA/IG1hcmdpblJlY3QucmlnaHQoKSA6IG1hcmdpblJlY3QubGVmdCgpOwotICAg ICAgICByZXR1cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OwotICAg IH07Ci0KICAgICBhdXRvIGNvbnN0cmFpbnRzID0gQ29uc3RyYWludHMgeyB9OwogICAgIGlmICht YXlCZUFib3ZlTGFzdEZsb2F0ID09IE1heUJlQWJvdmVMYXN0RmxvYXQ6Ok5vKSB7CiAgICAgICAg IGZvciAoYXV0byYgZmxvYXRJdGVtIDogcGxhY2VkRmxvYXRzLmxpc3QoKSB8IHN0ZDo6dmlld3M6 OnJldmVyc2UpIHsKICAgICAgICAgICAgIGlmICgoY29uc3RyYWludHMuc3RhcnQgJiYgZmxvYXRJ dGVtLmlzU3RhcnRQb3NpdGlvbmVkKCkpIHx8IChjb25zdHJhaW50cy5lbmQgJiYgIWZsb2F0SXRl bS5pc1N0YXJ0UG9zaXRpb25lZCgpKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAg ICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShm bG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0 RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1c3RlZENh bmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICghZWRnZUFu ZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtNDI4LDE0ICs0MzUsMTIg QEAgRmxvYXRpbmdDb250ZXh0OjpDb25zdHJhaW50cyBGbG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFp bnRzKExheW91dFVuaXQgY2FuZGlkYXRlVG8KICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICBjb25zdHJhaW50cy5lbmQgPSBQb2ludEluQ29udGV4dFJvb3QgeyBlZGdlLCBib3R0b20g fTsKIAotICAgICAgICAgICAgaWYgKChjb25zdHJhaW50cy5zdGFydCAmJiBjb25zdHJhaW50cy5l bmQpCi0gICAgICAgICAgICAgICAgfHwgKGNvbnN0cmFpbnRzLnN0YXJ0ICYmICFwbGFjZWRGbG9h dHMuaGFzRW5kUG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgIHx8IChjb25zdHJhaW50cy5l bmQgJiYgIXBsYWNlZEZsb2F0cy5oYXNTdGFydFBvc2l0aW9uZWQoKSkpCisgICAgICAgICAgICBp ZiAoKGNvbnN0cmFpbnRzLnN0YXJ0ICYmIGNvbnN0cmFpbnRzLmVuZCkgfHwgKGNvbnN0cmFpbnRz LnN0YXJ0ICYmICFwbGFjZWRGbG9hdHMuaGFzRW5kUG9zaXRpb25lZCgpKSB8fCAoY29uc3RyYWlu dHMuZW5kICYmICFwbGFjZWRGbG9hdHMuaGFzU3RhcnRQb3NpdGlvbmVkKCkpKQogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChhdXRv JiBmbG9hdEl0ZW0gOiBwbGFjZWRGbG9hdHMubGlzdCgpIHwgc3RkOjp2aWV3czo6cmV2ZXJzZSkg ewotICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJv dHRvbShmbG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0 ZUZsb2F0RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1 c3RlZENhbmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICgh ZWRnZUFuZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAo= 479462 2026-05-04 05:34:34 -0700 2026-05-04 07:19:06 -0700 Patch bug-313943-20260504053434.patch text/plain 7682 zalan RnJvbSBlOTQxZTI5NTU1YzM0ZGJkODIwOTQxZjVjNjk5NDhjNDhmNzRkZDFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBNYXkgMjAyNiAxNzo0NTo0NiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtjbGVhbnVw XSBNb3ZlIGhlbHBlciBsYW1iZGFzIGZyb20KIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMg dG8gbG9jYWwgc3RhdGljIGZ1bmN0aW9ucwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMxMzk0MwoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgpUaGUgRmxvYXRp bmdDb250ZXh0Ojpjb25zdHJhaW50cyBmdW5jdGlvbiBoYWQgdHdvIGhlbHBlciBsYW1iZGFzIChg Y29udGFpbnNgIGFuZApgY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbWApIGRlZmluZWQgaW5saW5l LiBUaGVzZSBsYW1iZGFzIGNhcHR1cmVkIGxvY2FsIHZhcmlhYmxlcwphbmQgbWFkZSB0aGUgYWxy ZWFkeSBsb25nIGZ1bmN0aW9uIGhhcmRlciB0byByZWFkLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OmZsb2F0Q29u dGFpbnNMaW5lKToKKFdlYkNvcmU6OkxheW91dDo6Y29tcHV0ZVNoYXBlRWRnZSk6CihXZWJDb3Jl OjpMYXlvdXQ6OmNvbXB1dGVGbG9hdEVkZ2VBbmRCb3R0b20pOgooV2ViQ29yZTo6TGF5b3V0OjpG bG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzKToKLS0tCiAuLi4vV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAgfCAxMDEgKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCmluZGV4IGM4MjQzM2Ez MjNkNy4uMzlkNzZhYmEzZGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0 cy9GbG9hdGluZ0NvbnRleHQuY3BwCkBAIC0zNDksNiArMzQ5LDU2IEBAIHN0ZDo6b3B0aW9uYWw8 RmxvYXRpbmdDb250ZXh0OjpCbG9ja0F4aXNQb3NpdGlvbldpdGhDbGVhcmFuY2U+IEZsb2F0aW5n Q29udGV4dDo6CiAgICAgcmV0dXJuIHsgfTsKIH0KIAorc3RhdGljIGJvb2wgZmxvYXRDb250YWlu c0xpbmUoY29uc3QgUmVjdCYgZmxvYXRCb3hSZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwg TGF5b3V0VW5pdCBjYW5kaWRhdGVCb3R0b20sIExheW91dFVuaXQgY2FuZGlkYXRlSGVpZ2h0KQor eworICAgIGlmIChmbG9hdEJveFJlY3QuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFjYW5kaWRhdGVIZWlnaHQpCisgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3Qu dG9wKCkgPD0gY2FuZGlkYXRlVG9wICYmIGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0 ZVRvcDsKKyAgICByZXR1cm4gZmxvYXRCb3hSZWN0LnRvcCgpIDwgY2FuZGlkYXRlQm90dG9tICYm IGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0ZVRvcDsKK30KKworc3RhdGljIHN0ZDo6 b3B0aW9uYWw8c3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+PiBjb21wdXRlU2hhcGVF ZGdlKGNvbnN0IFBsYWNlZEZsb2F0czo6SXRlbSYgZmxvYXRJdGVtLCBjb25zdCBSZWN0JiBtYXJn aW5SZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwgTGF5b3V0VW5pdCBjYW5kaWRhdGVIZWln aHQpCit7CisgICAgYXV0byogc2hhcGUgPSBmbG9hdEl0ZW0uc2hhcGUoKTsKKyAgICBpZiAoIXNo YXBlKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgYXV0byBib3JkZXJSZWN0ID0gZmxvYXRJ dGVtLmFic29sdXRlQm9yZGVyQm94UmVjdCgpOworICAgIGF1dG8gcG9zaXRpb25JblNoYXBlID0g Y2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKKworICAgIGlmICghc2hhcGUtPmxpbmVP dmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKHBvc2l0aW9uSW5TaGFwZSwgY2FuZGlkYXRlSGVpZ2h0 KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1 c2VkIHdoZW4gcGFzc2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgorICAg IGF1dG8gc2VnbWVudCA9IHNoYXBlLT5nZXRFeGNsdWRlZEludGVydmFsKHBvc2l0aW9uSW5TaGFw ZSwgc3RkOjptYXgoY2FuZGlkYXRlSGVpZ2h0LCAxX2x1KSk7CisgICAgaWYgKCFzZWdtZW50Lmlz VmFsaWQpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBwb3Rl bnRpYWxseSBzbG93LgorICAgIGF1dG8gYm90dG9tID0gY2FuZGlkYXRlVG9wICsgMV9sdTsKKwor ICAgIGlmIChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgeworICAgICAgICBhdXRvIHNo YXBlUmlnaHQgPSBib3JkZXJSZWN0LmxlZnQoKSArIExheW91dFVuaXQgeyBzZWdtZW50LmxvZ2lj YWxSaWdodCB9OworICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3RkOjptaW4oc2hhcGVSaWdo dCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07CisgICAgfQorICAgIGF1dG8gc2hhcGVM ZWZ0ID0gYm9yZGVyUmVjdC5sZWZ0KCkgKyBMYXlvdXRVbml0IHsgc2VnbWVudC5sb2dpY2FsTGVm dCB9OworICAgIHJldHVybiBzdGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJl Y3QubGVmdCgpKSwgYm90dG9tIH07Cit9CisKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPHN0ZDo6cGFp cjxMYXlvdXRVbml0LCBMYXlvdXRVbml0Pj4gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShjb25z dCBQbGFjZWRGbG9hdHM6Okl0ZW0mIGZsb2F0SXRlbSwgTGF5b3V0VW5pdCBjYW5kaWRhdGVUb3As IExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBMYXlvdXRVbml0IGNhbmRpZGF0ZUhlaWdodCkK K3sKKyAgICBhdXRvIG1hcmdpblJlY3QgPSBmbG9hdEl0ZW0uYWJzb2x1dGVSZWN0V2l0aE1hcmdp bigpOworICAgIGlmICghZmxvYXRDb250YWluc0xpbmUobWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9w LCBjYW5kaWRhdGVCb3R0b20sIGNhbmRpZGF0ZUhlaWdodCkpCisgICAgICAgIHJldHVybiB7IH07 CisKKyAgICBpZiAoYXV0byBzaGFwZUVkZ2UgPSBjb21wdXRlU2hhcGVFZGdlKGZsb2F0SXRlbSwg bWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9wLCBjYW5kaWRhdGVIZWlnaHQpKQorICAgICAgICByZXR1 cm4gc2hhcGVFZGdlOworCisgICAgYXV0byBlZGdlID0gZmxvYXRJdGVtLmlzU3RhcnRQb3NpdGlv bmVkKCkgPyBtYXJnaW5SZWN0LnJpZ2h0KCkgOiBtYXJnaW5SZWN0LmxlZnQoKTsKKyAgICByZXR1 cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OworfQorCiBGbG9hdGlu Z0NvbnRleHQ6OkNvbnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMoTGF5b3V0 VW5pdCBjYW5kaWRhdGVUb3AsIExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBNYXlCZUFib3Zl TGFzdEZsb2F0IG1heUJlQWJvdmVMYXN0RmxvYXQpIGNvbnN0CiB7CiAgICAgaWYgKGlzRW1wdHko KSkKQEAgLTM2OCw1NiArNDE4LDEzIEBAIEZsb2F0aW5nQ29udGV4dDo6Q29uc3RyYWludHMgRmxv YXRpbmdDb250ZXh0Ojpjb25zdHJhaW50cyhMYXlvdXRVbml0IGNhbmRpZGF0ZVRvCiAgICAgYXV0 byBhZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wICsgKGNhbmRp ZGF0ZUJvdHRvbSAtIGNhbmRpZGF0ZVRvcCk7CiAgICAgYXV0byBjYW5kaWRhdGVIZWlnaHQgPSBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSAtIGFkanVzdGVkQ2FuZGlkYXRlVG9wOwogCi0gICAgYXV0 byBjb250YWlucyA9IFsmXSAoYXV0byYgZmxvYXRCb3hSZWN0KSB7Ci0gICAgICAgIGlmIChmbG9h dEJveFJlY3QuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBp ZiAoIWNhbmRpZGF0ZUhlaWdodCkKLSAgICAgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9w KCkgPD0gYWRqdXN0ZWRDYW5kaWRhdGVUb3AgJiYgZmxvYXRCb3hSZWN0LmJvdHRvbSgpID4gYWRq dXN0ZWRDYW5kaWRhdGVUb3A7Ci0gICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9wKCkgPCBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSAmJiBmbG9hdEJveFJlY3QuYm90dG9tKCkgPiBhZGp1c3Rl ZENhbmRpZGF0ZVRvcDsKLSAgICB9OwotCi0gICAgYXV0byBjb21wdXRlRmxvYXRFZGdlQW5kQm90 dG9tID0gWyZdKGF1dG8mIGZsb2F0SXRlbSkgLT4gc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8TGF5 b3V0VW5pdCwgTGF5b3V0VW5pdD4+IHsKLSAgICAgICAgYXV0byBtYXJnaW5SZWN0ID0gZmxvYXRJ dGVtLmFic29sdXRlUmVjdFdpdGhNYXJnaW4oKTsKLSAgICAgICAgaWYgKCFjb250YWlucyhtYXJn aW5SZWN0KSkKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgaWYgKGF1dG8qIHNo YXBlID0gZmxvYXRJdGVtLnNoYXBlKCkpIHsKLSAgICAgICAgICAgIC8vIFNoYXBlcyBhcmUgcmVs YXRpdmUgdG8gdGhlIGJvcmRlciBib3guCi0gICAgICAgICAgICBhdXRvIGJvcmRlclJlY3QgPSBm bG9hdEl0ZW0uYWJzb2x1dGVCb3JkZXJCb3hSZWN0KCk7Ci0gICAgICAgICAgICBhdXRvIHBvc2l0 aW9uSW5TaGFwZSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKLQot ICAgICAgICAgICAgaWYgKCFzaGFwZS0+bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMocG9z aXRpb25JblNoYXBlLCBjYW5kaWRhdGVIZWlnaHQpKQotICAgICAgICAgICAgICAgIHJldHVybiB7 IH07Ci0KLSAgICAgICAgICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1c2VkIHdoZW4gcGFz c2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgotICAgICAgICAgICAgYXV0 byBzZWdtZW50ID0gc2hhcGUtPmdldEV4Y2x1ZGVkSW50ZXJ2YWwocG9zaXRpb25JblNoYXBlLCBz dGQ6Om1heChjYW5kaWRhdGVIZWlnaHQsIDFfbHUpKTsKLSAgICAgICAgICAgIGlmICghc2VnbWVu dC5pc1ZhbGlkKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgICAgIC8v IEJvdHRvbSBpcyB1c2VkIHRvIGRlY2lkZSB0aGUgbmV4dCBsaW5lIHRvcCBpZiBub3RoaW5nIGZp dHMuIFdpdGggc2hhcGUgd2UnbGwganVzdCBzYW1wbGUgb25lIHBpeGVsIGRvd24uCi0gICAgICAg ICAgICAvLyBGSVhNRTogVGhpcyBpcyBwb3RlbnRpYWxseSBzbG93LgotICAgICAgICAgICAgYXV0 byBib3R0b20gPSBhZGp1c3RlZENhbmRpZGF0ZVRvcCArIDFfbHU7Ci0KLSAgICAgICAgICAgIGlm IChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgewotICAgICAgICAgICAgICAgIGF1dG8g c2hhcGVSaWdodCA9IGJvcmRlclJlY3QubGVmdCgpICsgTGF5b3V0VW5pdCB7IHNlZ21lbnQubG9n aWNhbFJpZ2h0IH07Ci0gICAgICAgICAgICAgICAgLy8gU2hhcGUgY2FuJ3QgZXh0ZW5kIGJleW9u ZCB0aGUgbWFyZ2luIGJveC4KLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3Rk OjptaW4oc2hhcGVSaWdodCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIHNoYXBlTGVmdCA9IGJvcmRlclJlY3QubGVmdCgpICsg TGF5b3V0VW5pdCB7IHNlZ21lbnQubG9naWNhbExlZnQgfTsKLSAgICAgICAgICAgIHJldHVybiBz dGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJlY3QubGVmdCgpKSwgYm90dG9t IH07Ci0gICAgICAgIH0KLQotICAgICAgICBhdXRvIGVkZ2UgPSBmbG9hdEl0ZW0uaXNTdGFydFBv c2l0aW9uZWQoKSA/IG1hcmdpblJlY3QucmlnaHQoKSA6IG1hcmdpblJlY3QubGVmdCgpOwotICAg ICAgICByZXR1cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OwotICAg IH07Ci0KICAgICBhdXRvIGNvbnN0cmFpbnRzID0gQ29uc3RyYWludHMgeyB9OwogICAgIGlmICht YXlCZUFib3ZlTGFzdEZsb2F0ID09IE1heUJlQWJvdmVMYXN0RmxvYXQ6Ok5vKSB7CiAgICAgICAg IGZvciAoYXV0byYgZmxvYXRJdGVtIDogcGxhY2VkRmxvYXRzLmxpc3QoKSB8IHN0ZDo6dmlld3M6 OnJldmVyc2UpIHsKICAgICAgICAgICAgIGlmICgoY29uc3RyYWludHMuc3RhcnQgJiYgZmxvYXRJ dGVtLmlzU3RhcnRQb3NpdGlvbmVkKCkpIHx8IChjb25zdHJhaW50cy5lbmQgJiYgIWZsb2F0SXRl bS5pc1N0YXJ0UG9zaXRpb25lZCgpKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAg ICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShm bG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0 RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1c3RlZENh bmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICghZWRnZUFu ZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtNDI4LDE0ICs0MzUsMTIg QEAgRmxvYXRpbmdDb250ZXh0OjpDb25zdHJhaW50cyBGbG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFp bnRzKExheW91dFVuaXQgY2FuZGlkYXRlVG8KICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICBjb25zdHJhaW50cy5lbmQgPSBQb2ludEluQ29udGV4dFJvb3QgeyBlZGdlLCBib3R0b20g fTsKIAotICAgICAgICAgICAgaWYgKChjb25zdHJhaW50cy5zdGFydCAmJiBjb25zdHJhaW50cy5l bmQpCi0gICAgICAgICAgICAgICAgfHwgKGNvbnN0cmFpbnRzLnN0YXJ0ICYmICFwbGFjZWRGbG9h dHMuaGFzRW5kUG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgIHx8IChjb25zdHJhaW50cy5l bmQgJiYgIXBsYWNlZEZsb2F0cy5oYXNTdGFydFBvc2l0aW9uZWQoKSkpCisgICAgICAgICAgICBp ZiAoKGNvbnN0cmFpbnRzLnN0YXJ0ICYmIGNvbnN0cmFpbnRzLmVuZCkgfHwgKGNvbnN0cmFpbnRz LnN0YXJ0ICYmICFwbGFjZWRGbG9hdHMuaGFzRW5kUG9zaXRpb25lZCgpKSB8fCAoY29uc3RyYWlu dHMuZW5kICYmICFwbGFjZWRGbG9hdHMuaGFzU3RhcnRQb3NpdGlvbmVkKCkpKQogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChhdXRv JiBmbG9hdEl0ZW0gOiBwbGFjZWRGbG9hdHMubGlzdCgpIHwgc3RkOjp2aWV3czo6cmV2ZXJzZSkg ewotICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJv dHRvbShmbG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0 ZUZsb2F0RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1 c3RlZENhbmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICgh ZWRnZUFuZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAo= 479464 2026-05-04 07:07:35 -0700 2026-05-04 08:51:34 -0700 Patch bug-313943-20260504070734.patch text/plain 7682 zalan RnJvbSBlOTQxZTI5NTU1YzM0ZGJkODIwOTQxZjVjNjk5NDhjNDhmNzRkZDFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBNYXkgMjAyNiAxNzo0NTo0NiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtjbGVhbnVw XSBNb3ZlIGhlbHBlciBsYW1iZGFzIGZyb20KIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMg dG8gbG9jYWwgc3RhdGljIGZ1bmN0aW9ucwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMxMzk0MwoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgpUaGUgRmxvYXRp bmdDb250ZXh0Ojpjb25zdHJhaW50cyBmdW5jdGlvbiBoYWQgdHdvIGhlbHBlciBsYW1iZGFzIChg Y29udGFpbnNgIGFuZApgY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbWApIGRlZmluZWQgaW5saW5l LiBUaGVzZSBsYW1iZGFzIGNhcHR1cmVkIGxvY2FsIHZhcmlhYmxlcwphbmQgbWFkZSB0aGUgYWxy ZWFkeSBsb25nIGZ1bmN0aW9uIGhhcmRlciB0byByZWFkLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OmZsb2F0Q29u dGFpbnNMaW5lKToKKFdlYkNvcmU6OkxheW91dDo6Y29tcHV0ZVNoYXBlRWRnZSk6CihXZWJDb3Jl OjpMYXlvdXQ6OmNvbXB1dGVGbG9hdEVkZ2VBbmRCb3R0b20pOgooV2ViQ29yZTo6TGF5b3V0OjpG bG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzKToKLS0tCiAuLi4vV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAgfCAxMDEgKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCmluZGV4IGM4MjQzM2Ez MjNkNy4uMzlkNzZhYmEzZGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxv YXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0 cy9GbG9hdGluZ0NvbnRleHQuY3BwCkBAIC0zNDksNiArMzQ5LDU2IEBAIHN0ZDo6b3B0aW9uYWw8 RmxvYXRpbmdDb250ZXh0OjpCbG9ja0F4aXNQb3NpdGlvbldpdGhDbGVhcmFuY2U+IEZsb2F0aW5n Q29udGV4dDo6CiAgICAgcmV0dXJuIHsgfTsKIH0KIAorc3RhdGljIGJvb2wgZmxvYXRDb250YWlu c0xpbmUoY29uc3QgUmVjdCYgZmxvYXRCb3hSZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwg TGF5b3V0VW5pdCBjYW5kaWRhdGVCb3R0b20sIExheW91dFVuaXQgY2FuZGlkYXRlSGVpZ2h0KQor eworICAgIGlmIChmbG9hdEJveFJlY3QuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFjYW5kaWRhdGVIZWlnaHQpCisgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3Qu dG9wKCkgPD0gY2FuZGlkYXRlVG9wICYmIGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0 ZVRvcDsKKyAgICByZXR1cm4gZmxvYXRCb3hSZWN0LnRvcCgpIDwgY2FuZGlkYXRlQm90dG9tICYm IGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0ZVRvcDsKK30KKworc3RhdGljIHN0ZDo6 b3B0aW9uYWw8c3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+PiBjb21wdXRlU2hhcGVF ZGdlKGNvbnN0IFBsYWNlZEZsb2F0czo6SXRlbSYgZmxvYXRJdGVtLCBjb25zdCBSZWN0JiBtYXJn aW5SZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwgTGF5b3V0VW5pdCBjYW5kaWRhdGVIZWln aHQpCit7CisgICAgYXV0byogc2hhcGUgPSBmbG9hdEl0ZW0uc2hhcGUoKTsKKyAgICBpZiAoIXNo YXBlKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgYXV0byBib3JkZXJSZWN0ID0gZmxvYXRJ dGVtLmFic29sdXRlQm9yZGVyQm94UmVjdCgpOworICAgIGF1dG8gcG9zaXRpb25JblNoYXBlID0g Y2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKKworICAgIGlmICghc2hhcGUtPmxpbmVP dmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKHBvc2l0aW9uSW5TaGFwZSwgY2FuZGlkYXRlSGVpZ2h0 KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1 c2VkIHdoZW4gcGFzc2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgorICAg IGF1dG8gc2VnbWVudCA9IHNoYXBlLT5nZXRFeGNsdWRlZEludGVydmFsKHBvc2l0aW9uSW5TaGFw ZSwgc3RkOjptYXgoY2FuZGlkYXRlSGVpZ2h0LCAxX2x1KSk7CisgICAgaWYgKCFzZWdtZW50Lmlz VmFsaWQpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBwb3Rl bnRpYWxseSBzbG93LgorICAgIGF1dG8gYm90dG9tID0gY2FuZGlkYXRlVG9wICsgMV9sdTsKKwor ICAgIGlmIChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgeworICAgICAgICBhdXRvIHNo YXBlUmlnaHQgPSBib3JkZXJSZWN0LmxlZnQoKSArIExheW91dFVuaXQgeyBzZWdtZW50LmxvZ2lj YWxSaWdodCB9OworICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3RkOjptaW4oc2hhcGVSaWdo dCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07CisgICAgfQorICAgIGF1dG8gc2hhcGVM ZWZ0ID0gYm9yZGVyUmVjdC5sZWZ0KCkgKyBMYXlvdXRVbml0IHsgc2VnbWVudC5sb2dpY2FsTGVm dCB9OworICAgIHJldHVybiBzdGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJl Y3QubGVmdCgpKSwgYm90dG9tIH07Cit9CisKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPHN0ZDo6cGFp cjxMYXlvdXRVbml0LCBMYXlvdXRVbml0Pj4gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShjb25z dCBQbGFjZWRGbG9hdHM6Okl0ZW0mIGZsb2F0SXRlbSwgTGF5b3V0VW5pdCBjYW5kaWRhdGVUb3As IExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBMYXlvdXRVbml0IGNhbmRpZGF0ZUhlaWdodCkK K3sKKyAgICBhdXRvIG1hcmdpblJlY3QgPSBmbG9hdEl0ZW0uYWJzb2x1dGVSZWN0V2l0aE1hcmdp bigpOworICAgIGlmICghZmxvYXRDb250YWluc0xpbmUobWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9w LCBjYW5kaWRhdGVCb3R0b20sIGNhbmRpZGF0ZUhlaWdodCkpCisgICAgICAgIHJldHVybiB7IH07 CisKKyAgICBpZiAoYXV0byBzaGFwZUVkZ2UgPSBjb21wdXRlU2hhcGVFZGdlKGZsb2F0SXRlbSwg bWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9wLCBjYW5kaWRhdGVIZWlnaHQpKQorICAgICAgICByZXR1 cm4gc2hhcGVFZGdlOworCisgICAgYXV0byBlZGdlID0gZmxvYXRJdGVtLmlzU3RhcnRQb3NpdGlv bmVkKCkgPyBtYXJnaW5SZWN0LnJpZ2h0KCkgOiBtYXJnaW5SZWN0LmxlZnQoKTsKKyAgICByZXR1 cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OworfQorCiBGbG9hdGlu Z0NvbnRleHQ6OkNvbnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMoTGF5b3V0 VW5pdCBjYW5kaWRhdGVUb3AsIExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBNYXlCZUFib3Zl TGFzdEZsb2F0IG1heUJlQWJvdmVMYXN0RmxvYXQpIGNvbnN0CiB7CiAgICAgaWYgKGlzRW1wdHko KSkKQEAgLTM2OCw1NiArNDE4LDEzIEBAIEZsb2F0aW5nQ29udGV4dDo6Q29uc3RyYWludHMgRmxv YXRpbmdDb250ZXh0Ojpjb25zdHJhaW50cyhMYXlvdXRVbml0IGNhbmRpZGF0ZVRvCiAgICAgYXV0 byBhZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wICsgKGNhbmRp ZGF0ZUJvdHRvbSAtIGNhbmRpZGF0ZVRvcCk7CiAgICAgYXV0byBjYW5kaWRhdGVIZWlnaHQgPSBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSAtIGFkanVzdGVkQ2FuZGlkYXRlVG9wOwogCi0gICAgYXV0 byBjb250YWlucyA9IFsmXSAoYXV0byYgZmxvYXRCb3hSZWN0KSB7Ci0gICAgICAgIGlmIChmbG9h dEJveFJlY3QuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBp ZiAoIWNhbmRpZGF0ZUhlaWdodCkKLSAgICAgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9w KCkgPD0gYWRqdXN0ZWRDYW5kaWRhdGVUb3AgJiYgZmxvYXRCb3hSZWN0LmJvdHRvbSgpID4gYWRq dXN0ZWRDYW5kaWRhdGVUb3A7Ci0gICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9wKCkgPCBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSAmJiBmbG9hdEJveFJlY3QuYm90dG9tKCkgPiBhZGp1c3Rl ZENhbmRpZGF0ZVRvcDsKLSAgICB9OwotCi0gICAgYXV0byBjb21wdXRlRmxvYXRFZGdlQW5kQm90 dG9tID0gWyZdKGF1dG8mIGZsb2F0SXRlbSkgLT4gc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8TGF5 b3V0VW5pdCwgTGF5b3V0VW5pdD4+IHsKLSAgICAgICAgYXV0byBtYXJnaW5SZWN0ID0gZmxvYXRJ dGVtLmFic29sdXRlUmVjdFdpdGhNYXJnaW4oKTsKLSAgICAgICAgaWYgKCFjb250YWlucyhtYXJn aW5SZWN0KSkKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgaWYgKGF1dG8qIHNo YXBlID0gZmxvYXRJdGVtLnNoYXBlKCkpIHsKLSAgICAgICAgICAgIC8vIFNoYXBlcyBhcmUgcmVs YXRpdmUgdG8gdGhlIGJvcmRlciBib3guCi0gICAgICAgICAgICBhdXRvIGJvcmRlclJlY3QgPSBm bG9hdEl0ZW0uYWJzb2x1dGVCb3JkZXJCb3hSZWN0KCk7Ci0gICAgICAgICAgICBhdXRvIHBvc2l0 aW9uSW5TaGFwZSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKLQot ICAgICAgICAgICAgaWYgKCFzaGFwZS0+bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMocG9z aXRpb25JblNoYXBlLCBjYW5kaWRhdGVIZWlnaHQpKQotICAgICAgICAgICAgICAgIHJldHVybiB7 IH07Ci0KLSAgICAgICAgICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1c2VkIHdoZW4gcGFz c2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgotICAgICAgICAgICAgYXV0 byBzZWdtZW50ID0gc2hhcGUtPmdldEV4Y2x1ZGVkSW50ZXJ2YWwocG9zaXRpb25JblNoYXBlLCBz dGQ6Om1heChjYW5kaWRhdGVIZWlnaHQsIDFfbHUpKTsKLSAgICAgICAgICAgIGlmICghc2VnbWVu dC5pc1ZhbGlkKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgICAgIC8v IEJvdHRvbSBpcyB1c2VkIHRvIGRlY2lkZSB0aGUgbmV4dCBsaW5lIHRvcCBpZiBub3RoaW5nIGZp dHMuIFdpdGggc2hhcGUgd2UnbGwganVzdCBzYW1wbGUgb25lIHBpeGVsIGRvd24uCi0gICAgICAg ICAgICAvLyBGSVhNRTogVGhpcyBpcyBwb3RlbnRpYWxseSBzbG93LgotICAgICAgICAgICAgYXV0 byBib3R0b20gPSBhZGp1c3RlZENhbmRpZGF0ZVRvcCArIDFfbHU7Ci0KLSAgICAgICAgICAgIGlm IChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgewotICAgICAgICAgICAgICAgIGF1dG8g c2hhcGVSaWdodCA9IGJvcmRlclJlY3QubGVmdCgpICsgTGF5b3V0VW5pdCB7IHNlZ21lbnQubG9n aWNhbFJpZ2h0IH07Ci0gICAgICAgICAgICAgICAgLy8gU2hhcGUgY2FuJ3QgZXh0ZW5kIGJleW9u ZCB0aGUgbWFyZ2luIGJveC4KLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3Rk OjptaW4oc2hhcGVSaWdodCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIHNoYXBlTGVmdCA9IGJvcmRlclJlY3QubGVmdCgpICsg TGF5b3V0VW5pdCB7IHNlZ21lbnQubG9naWNhbExlZnQgfTsKLSAgICAgICAgICAgIHJldHVybiBz dGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJlY3QubGVmdCgpKSwgYm90dG9t IH07Ci0gICAgICAgIH0KLQotICAgICAgICBhdXRvIGVkZ2UgPSBmbG9hdEl0ZW0uaXNTdGFydFBv c2l0aW9uZWQoKSA/IG1hcmdpblJlY3QucmlnaHQoKSA6IG1hcmdpblJlY3QubGVmdCgpOwotICAg ICAgICByZXR1cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OwotICAg IH07Ci0KICAgICBhdXRvIGNvbnN0cmFpbnRzID0gQ29uc3RyYWludHMgeyB9OwogICAgIGlmICht YXlCZUFib3ZlTGFzdEZsb2F0ID09IE1heUJlQWJvdmVMYXN0RmxvYXQ6Ok5vKSB7CiAgICAgICAg IGZvciAoYXV0byYgZmxvYXRJdGVtIDogcGxhY2VkRmxvYXRzLmxpc3QoKSB8IHN0ZDo6dmlld3M6 OnJldmVyc2UpIHsKICAgICAgICAgICAgIGlmICgoY29uc3RyYWludHMuc3RhcnQgJiYgZmxvYXRJ dGVtLmlzU3RhcnRQb3NpdGlvbmVkKCkpIHx8IChjb25zdHJhaW50cy5lbmQgJiYgIWZsb2F0SXRl bS5pc1N0YXJ0UG9zaXRpb25lZCgpKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAg ICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShm bG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0 RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1c3RlZENh bmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICghZWRnZUFu ZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtNDI4LDE0ICs0MzUsMTIg QEAgRmxvYXRpbmdDb250ZXh0OjpDb25zdHJhaW50cyBGbG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFp bnRzKExheW91dFVuaXQgY2FuZGlkYXRlVG8KICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICBjb25zdHJhaW50cy5lbmQgPSBQb2ludEluQ29udGV4dFJvb3QgeyBlZGdlLCBib3R0b20g fTsKIAotICAgICAgICAgICAgaWYgKChjb25zdHJhaW50cy5zdGFydCAmJiBjb25zdHJhaW50cy5l bmQpCi0gICAgICAgICAgICAgICAgfHwgKGNvbnN0cmFpbnRzLnN0YXJ0ICYmICFwbGFjZWRGbG9h dHMuaGFzRW5kUG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgIHx8IChjb25zdHJhaW50cy5l bmQgJiYgIXBsYWNlZEZsb2F0cy5oYXNTdGFydFBvc2l0aW9uZWQoKSkpCisgICAgICAgICAgICBp ZiAoKGNvbnN0cmFpbnRzLnN0YXJ0ICYmIGNvbnN0cmFpbnRzLmVuZCkgfHwgKGNvbnN0cmFpbnRz LnN0YXJ0ICYmICFwbGFjZWRGbG9hdHMuaGFzRW5kUG9zaXRpb25lZCgpKSB8fCAoY29uc3RyYWlu dHMuZW5kICYmICFwbGFjZWRGbG9hdHMuaGFzU3RhcnRQb3NpdGlvbmVkKCkpKQogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChhdXRv JiBmbG9hdEl0ZW0gOiBwbGFjZWRGbG9hdHMubGlzdCgpIHwgc3RkOjp2aWV3czo6cmV2ZXJzZSkg ewotICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJv dHRvbShmbG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0 ZUZsb2F0RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1 c3RlZENhbmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICgh ZWRnZUFuZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAo= 479465 2026-05-04 08:39:46 -0700 2026-05-04 11:56:35 -0700 [fast-cq]Patch bug-313943-20260504083946.patch text/plain 7679 zalan RnJvbSA2MTgyYzc2ZTRjNGZmMzZhYmE3Zjk1NzUyZTRiNzZiODU4OGNiMGExIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMyBNYXkgMjAyNiAxNzo0NTo0NiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtjbGVhbnVw XSBNb3ZlIGhlbHBlciBsYW1iZGFzIGZyb20KIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMg dG8gbG9jYWwgc3RhdGljIGZ1bmN0aW9ucwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMxMzk0MwoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgpUaGUgRmxvYXRp bmdDb250ZXh0Ojpjb25zdHJhaW50cyBmdW5jdGlvbiBoYWQgdHdvIGhlbHBlciBsYW1iZGFzIChg Y29udGFpbnNgIGFuZApgY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbWApIGRlZmluZWQgaW5saW5l LiBUaGVzZSBsYW1iZGFzIGNhcHR1cmVkIGxvY2FsIHZhcmlhYmxlcwphbmQgbWFkZSB0aGUgYWxy ZWFkeSBsb25nIGZ1bmN0aW9uIGhhcmRlciB0byByZWFkLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OmZsb2F0Q29u dGFpbnNMaW5lKToKKFdlYkNvcmU6OkxheW91dDo6Y29tcHV0ZVNoYXBlRWRnZSk6CihXZWJDb3Jl OjpMYXlvdXQ6OmNvbXB1dGVGbG9hdEVkZ2VBbmRCb3R0b20pOgooV2ViQ29yZTo6TGF5b3V0OjpG bG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzIGNvbnN0KToKLS0tCiAuLi4vV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAgfCAxMDEgKysrKysrKysrLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCmluZGV4IGM4 MjQzM2EzMjNkNy4uNjczZDA3NTAyYzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCkBAIC0zNDksNiArMzQ5LDU2IEBAIHN0ZDo6b3B0 aW9uYWw8RmxvYXRpbmdDb250ZXh0OjpCbG9ja0F4aXNQb3NpdGlvbldpdGhDbGVhcmFuY2U+IEZs b2F0aW5nQ29udGV4dDo6CiAgICAgcmV0dXJuIHsgfTsKIH0KIAorc3RhdGljIGJvb2wgZmxvYXRD b250YWluc0xpbmUoY29uc3QgUmVjdCYgZmxvYXRCb3hSZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0 ZVRvcCwgTGF5b3V0VW5pdCBjYW5kaWRhdGVCb3R0b20sIExheW91dFVuaXQgY2FuZGlkYXRlSGVp Z2h0KQoreworICAgIGlmIChmbG9hdEJveFJlY3QuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgaWYgKCFjYW5kaWRhdGVIZWlnaHQpCisgICAgICAgIHJldHVybiBmbG9hdEJv eFJlY3QudG9wKCkgPD0gY2FuZGlkYXRlVG9wICYmIGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNh bmRpZGF0ZVRvcDsKKyAgICByZXR1cm4gZmxvYXRCb3hSZWN0LnRvcCgpIDwgY2FuZGlkYXRlQm90 dG9tICYmIGZsb2F0Qm94UmVjdC5ib3R0b20oKSA+IGNhbmRpZGF0ZVRvcDsKK30KKworc3RhdGlj IHN0ZDo6b3B0aW9uYWw8c3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+PiBjb21wdXRl U2hhcGVFZGdlKGNvbnN0IFBsYWNlZEZsb2F0czo6SXRlbSYgZmxvYXRJdGVtLCBjb25zdCBSZWN0 JiBtYXJnaW5SZWN0LCBMYXlvdXRVbml0IGNhbmRpZGF0ZVRvcCwgTGF5b3V0VW5pdCBjYW5kaWRh dGVIZWlnaHQpCit7CisgICAgYXV0byogc2hhcGUgPSBmbG9hdEl0ZW0uc2hhcGUoKTsKKyAgICBp ZiAoIXNoYXBlKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgYXV0byBib3JkZXJSZWN0ID0g ZmxvYXRJdGVtLmFic29sdXRlQm9yZGVyQm94UmVjdCgpOworICAgIGF1dG8gcG9zaXRpb25JblNo YXBlID0gY2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKKworICAgIGlmICghc2hhcGUt PmxpbmVPdmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKHBvc2l0aW9uSW5TaGFwZSwgY2FuZGlkYXRl SGVpZ2h0KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIC8vIFBvbHlnb25TaGFwZSBnZXRz IGNvbmZ1c2VkIHdoZW4gcGFzc2luZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2Vz LgorICAgIGF1dG8gc2VnbWVudCA9IHNoYXBlLT5nZXRFeGNsdWRlZEludGVydmFsKHBvc2l0aW9u SW5TaGFwZSwgc3RkOjptYXgoY2FuZGlkYXRlSGVpZ2h0LCAxX2x1KSk7CisgICAgaWYgKCFzZWdt ZW50LmlzVmFsaWQpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICAvLyBGSVhNRTogVGhpcyBp cyBwb3RlbnRpYWxseSBzbG93LgorICAgIGF1dG8gYm90dG9tID0gY2FuZGlkYXRlVG9wICsgMV9s dTsKKworICAgIGlmIChmbG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgeworICAgICAgICBh dXRvIHNoYXBlUmlnaHQgPSBib3JkZXJSZWN0LmxlZnQoKSArIExheW91dFVuaXQgeyBzZWdtZW50 LmxvZ2ljYWxSaWdodCB9OworICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3RkOjptaW4oc2hh cGVSaWdodCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07CisgICAgfQorICAgIGF1dG8g c2hhcGVMZWZ0ID0gYm9yZGVyUmVjdC5sZWZ0KCkgKyBMYXlvdXRVbml0IHsgc2VnbWVudC5sb2dp Y2FsTGVmdCB9OworICAgIHJldHVybiBzdGQ6OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1h cmdpblJlY3QubGVmdCgpKSwgYm90dG9tIH07Cit9CisKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPHN0 ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0Pj4gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRv bShjb25zdCBQbGFjZWRGbG9hdHM6Okl0ZW0mIGZsb2F0SXRlbSwgTGF5b3V0VW5pdCBjYW5kaWRh dGVUb3AsIExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBMYXlvdXRVbml0IGNhbmRpZGF0ZUhl aWdodCkKK3sKKyAgICBhdXRvIG1hcmdpblJlY3QgPSBmbG9hdEl0ZW0uYWJzb2x1dGVSZWN0V2l0 aE1hcmdpbigpOworICAgIGlmICghZmxvYXRDb250YWluc0xpbmUobWFyZ2luUmVjdCwgY2FuZGlk YXRlVG9wLCBjYW5kaWRhdGVCb3R0b20sIGNhbmRpZGF0ZUhlaWdodCkpCisgICAgICAgIHJldHVy biB7IH07CisKKyAgICBpZiAoZmxvYXRJdGVtLnNoYXBlKCkpCisgICAgICAgIHJldHVybiBjb21w dXRlU2hhcGVFZGdlKGZsb2F0SXRlbSwgbWFyZ2luUmVjdCwgY2FuZGlkYXRlVG9wLCBjYW5kaWRh dGVIZWlnaHQpOworCisgICAgYXV0byBlZGdlID0gZmxvYXRJdGVtLmlzU3RhcnRQb3NpdGlvbmVk KCkgPyBtYXJnaW5SZWN0LnJpZ2h0KCkgOiBtYXJnaW5SZWN0LmxlZnQoKTsKKyAgICByZXR1cm4g c3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OworfQorCiBGbG9hdGluZ0Nv bnRleHQ6OkNvbnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMoTGF5b3V0VW5p dCBjYW5kaWRhdGVUb3AsIExheW91dFVuaXQgY2FuZGlkYXRlQm90dG9tLCBNYXlCZUFib3ZlTGFz dEZsb2F0IG1heUJlQWJvdmVMYXN0RmxvYXQpIGNvbnN0CiB7CiAgICAgaWYgKGlzRW1wdHkoKSkK QEAgLTM2OCw1NiArNDE4LDEzIEBAIEZsb2F0aW5nQ29udGV4dDo6Q29uc3RyYWludHMgRmxvYXRp bmdDb250ZXh0Ojpjb25zdHJhaW50cyhMYXlvdXRVbml0IGNhbmRpZGF0ZVRvCiAgICAgYXV0byBh ZGp1c3RlZENhbmRpZGF0ZUJvdHRvbSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wICsgKGNhbmRpZGF0 ZUJvdHRvbSAtIGNhbmRpZGF0ZVRvcCk7CiAgICAgYXV0byBjYW5kaWRhdGVIZWlnaHQgPSBhZGp1 c3RlZENhbmRpZGF0ZUJvdHRvbSAtIGFkanVzdGVkQ2FuZGlkYXRlVG9wOwogCi0gICAgYXV0byBj b250YWlucyA9IFsmXSAoYXV0byYgZmxvYXRCb3hSZWN0KSB7Ci0gICAgICAgIGlmIChmbG9hdEJv eFJlY3QuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAo IWNhbmRpZGF0ZUhlaWdodCkKLSAgICAgICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9wKCkg PD0gYWRqdXN0ZWRDYW5kaWRhdGVUb3AgJiYgZmxvYXRCb3hSZWN0LmJvdHRvbSgpID4gYWRqdXN0 ZWRDYW5kaWRhdGVUb3A7Ci0gICAgICAgIHJldHVybiBmbG9hdEJveFJlY3QudG9wKCkgPCBhZGp1 c3RlZENhbmRpZGF0ZUJvdHRvbSAmJiBmbG9hdEJveFJlY3QuYm90dG9tKCkgPiBhZGp1c3RlZENh bmRpZGF0ZVRvcDsKLSAgICB9OwotCi0gICAgYXV0byBjb21wdXRlRmxvYXRFZGdlQW5kQm90dG9t ID0gWyZdKGF1dG8mIGZsb2F0SXRlbSkgLT4gc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8TGF5b3V0 VW5pdCwgTGF5b3V0VW5pdD4+IHsKLSAgICAgICAgYXV0byBtYXJnaW5SZWN0ID0gZmxvYXRJdGVt LmFic29sdXRlUmVjdFdpdGhNYXJnaW4oKTsKLSAgICAgICAgaWYgKCFjb250YWlucyhtYXJnaW5S ZWN0KSkKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgaWYgKGF1dG8qIHNoYXBl ID0gZmxvYXRJdGVtLnNoYXBlKCkpIHsKLSAgICAgICAgICAgIC8vIFNoYXBlcyBhcmUgcmVsYXRp dmUgdG8gdGhlIGJvcmRlciBib3guCi0gICAgICAgICAgICBhdXRvIGJvcmRlclJlY3QgPSBmbG9h dEl0ZW0uYWJzb2x1dGVCb3JkZXJCb3hSZWN0KCk7Ci0gICAgICAgICAgICBhdXRvIHBvc2l0aW9u SW5TaGFwZSA9IGFkanVzdGVkQ2FuZGlkYXRlVG9wIC0gYm9yZGVyUmVjdC50b3AoKTsKLQotICAg ICAgICAgICAgaWYgKCFzaGFwZS0+bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMocG9zaXRp b25JblNoYXBlLCBjYW5kaWRhdGVIZWlnaHQpKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07 Ci0KLSAgICAgICAgICAgIC8vIFBvbHlnb25TaGFwZSBnZXRzIGNvbmZ1c2VkIHdoZW4gcGFzc2lu ZyBpbiAwcHggaGVpZ2h0IGludGVydmFsIGF0IHZlcnRpY2VzLgotICAgICAgICAgICAgYXV0byBz ZWdtZW50ID0gc2hhcGUtPmdldEV4Y2x1ZGVkSW50ZXJ2YWwocG9zaXRpb25JblNoYXBlLCBzdGQ6 Om1heChjYW5kaWRhdGVIZWlnaHQsIDFfbHUpKTsKLSAgICAgICAgICAgIGlmICghc2VnbWVudC5p c1ZhbGlkKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAgICAgICAgIC8vIEJv dHRvbSBpcyB1c2VkIHRvIGRlY2lkZSB0aGUgbmV4dCBsaW5lIHRvcCBpZiBub3RoaW5nIGZpdHMu IFdpdGggc2hhcGUgd2UnbGwganVzdCBzYW1wbGUgb25lIHBpeGVsIGRvd24uCi0gICAgICAgICAg ICAvLyBGSVhNRTogVGhpcyBpcyBwb3RlbnRpYWxseSBzbG93LgotICAgICAgICAgICAgYXV0byBi b3R0b20gPSBhZGp1c3RlZENhbmRpZGF0ZVRvcCArIDFfbHU7Ci0KLSAgICAgICAgICAgIGlmIChm bG9hdEl0ZW0uaXNTdGFydFBvc2l0aW9uZWQoKSkgewotICAgICAgICAgICAgICAgIGF1dG8gc2hh cGVSaWdodCA9IGJvcmRlclJlY3QubGVmdCgpICsgTGF5b3V0VW5pdCB7IHNlZ21lbnQubG9naWNh bFJpZ2h0IH07Ci0gICAgICAgICAgICAgICAgLy8gU2hhcGUgY2FuJ3QgZXh0ZW5kIGJleW9uZCB0 aGUgbWFyZ2luIGJveC4KLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpwYWlyIHsgc3RkOjpt aW4oc2hhcGVSaWdodCwgbWFyZ2luUmVjdC5yaWdodCgpKSwgYm90dG9tIH07Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICBhdXRvIHNoYXBlTGVmdCA9IGJvcmRlclJlY3QubGVmdCgpICsgTGF5 b3V0VW5pdCB7IHNlZ21lbnQubG9naWNhbExlZnQgfTsKLSAgICAgICAgICAgIHJldHVybiBzdGQ6 OnBhaXIgeyBzdGQ6Om1heChzaGFwZUxlZnQsIG1hcmdpblJlY3QubGVmdCgpKSwgYm90dG9tIH07 Ci0gICAgICAgIH0KLQotICAgICAgICBhdXRvIGVkZ2UgPSBmbG9hdEl0ZW0uaXNTdGFydFBvc2l0 aW9uZWQoKSA/IG1hcmdpblJlY3QucmlnaHQoKSA6IG1hcmdpblJlY3QubGVmdCgpOwotICAgICAg ICByZXR1cm4gc3RkOjpwYWlyIHsgZWRnZSwgbWFyZ2luUmVjdC5ib3R0b20oKSB9OwotICAgIH07 Ci0KICAgICBhdXRvIGNvbnN0cmFpbnRzID0gQ29uc3RyYWludHMgeyB9OwogICAgIGlmIChtYXlC ZUFib3ZlTGFzdEZsb2F0ID09IE1heUJlQWJvdmVMYXN0RmxvYXQ6Ok5vKSB7CiAgICAgICAgIGZv ciAoYXV0byYgZmxvYXRJdGVtIDogcGxhY2VkRmxvYXRzLmxpc3QoKSB8IHN0ZDo6dmlld3M6OnJl dmVyc2UpIHsKICAgICAgICAgICAgIGlmICgoY29uc3RyYWludHMuc3RhcnQgJiYgZmxvYXRJdGVt LmlzU3RhcnRQb3NpdGlvbmVkKCkpIHx8IChjb25zdHJhaW50cy5lbmQgJiYgIWZsb2F0SXRlbS5p c1N0YXJ0UG9zaXRpb25lZCgpKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAg ICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRvbShmbG9h dEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRn ZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1c3RlZENhbmRp ZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICghZWRnZUFuZEJv dHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtNDI4LDE0ICs0MzUsMTIgQEAg RmxvYXRpbmdDb250ZXh0OjpDb25zdHJhaW50cyBGbG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRz KExheW91dFVuaXQgY2FuZGlkYXRlVG8KICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICBjb25zdHJhaW50cy5lbmQgPSBQb2ludEluQ29udGV4dFJvb3QgeyBlZGdlLCBib3R0b20gfTsK IAotICAgICAgICAgICAgaWYgKChjb25zdHJhaW50cy5zdGFydCAmJiBjb25zdHJhaW50cy5lbmQp Ci0gICAgICAgICAgICAgICAgfHwgKGNvbnN0cmFpbnRzLnN0YXJ0ICYmICFwbGFjZWRGbG9hdHMu aGFzRW5kUG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgIHx8IChjb25zdHJhaW50cy5lbmQg JiYgIXBsYWNlZEZsb2F0cy5oYXNTdGFydFBvc2l0aW9uZWQoKSkpCisgICAgICAgICAgICBpZiAo KGNvbnN0cmFpbnRzLnN0YXJ0ICYmIGNvbnN0cmFpbnRzLmVuZCkgfHwgKGNvbnN0cmFpbnRzLnN0 YXJ0ICYmICFwbGFjZWRGbG9hdHMuaGFzRW5kUG9zaXRpb25lZCgpKSB8fCAoY29uc3RyYWludHMu ZW5kICYmICFwbGFjZWRGbG9hdHMuaGFzU3RhcnRQb3NpdGlvbmVkKCkpKQogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChhdXRvJiBm bG9hdEl0ZW0gOiBwbGFjZWRGbG9hdHMubGlzdCgpIHwgc3RkOjp2aWV3czo6cmV2ZXJzZSkgewot ICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZsb2F0RWRnZUFuZEJvdHRv bShmbG9hdEl0ZW0pOworICAgICAgICAgICAgYXV0byBlZGdlQW5kQm90dG9tID0gY29tcHV0ZUZs b2F0RWRnZUFuZEJvdHRvbShmbG9hdEl0ZW0sIGFkanVzdGVkQ2FuZGlkYXRlVG9wLCBhZGp1c3Rl ZENhbmRpZGF0ZUJvdHRvbSwgY2FuZGlkYXRlSGVpZ2h0KTsKICAgICAgICAgICAgIGlmICghZWRn ZUFuZEJvdHRvbSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAo=