315431 2026-05-23 14:39:16 -0700 [cleanup] Separate layout-forcing from size querying in RenderFlexibleBox flex base path 2026-05-25 07:49:12 -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 2213560 0 zalan 2026-05-23 14:39:16 -0700 ssia 2213563 1 479786 zalan 2026-05-23 14:41:07 -0700 Created attachment 479786 Patch 2213818 2 479795 zalan 2026-05-25 05:55:53 -0700 Created attachment 479795 [fast-cq]Patch 2213846 3 ews-feeder 2026-05-25 07:48:19 -0700 Committed 313844@main (812f3d065085): <https://commits.webkit.org/313844@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479795. 2213847 4 webkit-bug-importer 2026-05-25 07:49:12 -0700 <rdar://problem/177877663> 479786 2026-05-23 14:41:07 -0700 2026-05-25 05:55:51 -0700 Patch bug-315431-20260523144106.patch text/plain 10008 zalan RnJvbSBjOWM2MjgwYTliYjVlYjhkZTcyNmRiMDE5Y2M0NDIxMjhmMDg2M2NhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjMgTWF5IDIwMjYgMTQ6Mzk6NTcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gU2VwYXJhdGUgbGF5b3V0LWZvcmNpbmcgZnJvbSBzaXplIHF1ZXJ5aW5nIGluCiBSZW5kZXJG bGV4aWJsZUJveCBmbGV4IGJhc2UgcGF0aAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMxNTQzMQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpibG9ja0F4aXNT aXplRm9yRmxleEl0ZW0gZGlkIHR3byB0aGluZ3MgaW4gb25lIGNhbGw6IGl0IGZvcmNlZCBsYXlv dXRJZk5lZWRlZApvbiB0aGUgZmxleCBpdGVtLCBwb3B1bGF0ZWQgbV9ibG9ja0F4aXNTaXplIGFz IGEgc2lkZSBlZmZlY3QsIGFuZCByZXR1cm5lZCB0aGUKY2FjaGVkIHZhbHVlLiBUaGF0IGJsdXJy ZWQgdGhlIGFjdGlvbiAoZm9yY2UgbGF5b3V0KSBhbmQgdGhlIHF1ZXJ5IChyZWFkIHRoZQpjYWNo ZWQgc2l6ZSkgaW50byBhIHNpbmdsZSBuYW1lZCBvcGVyYXRpb24sIGFuZCB0aGUgcHJlZGljYXRl IHRoYXQgZ2F0ZWQgaXQKKGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKSBzb3VuZGVkIGxpa2Ug YSBnZW5lcmljIHF1ZXN0aW9uIGFib3V0IHRoZSBpdGVtCndoZW4gaXQgcmVhbGx5IG9ubHkgbWF0 dGVyZWQgZm9yIHRoZSBmbGV4IGJhc2Ugc2l6ZSBjb21wdXRhdGlvbi4KCkV4dHJhY3RlZCB0aGUg bGF5b3V0LWZvcmNpbmcgc2lkZSBpbnRvIGVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxl eEl0ZW1JZk5lZWRlZCwKd2hpY2ggc2VsZi1nYXRlcyBvbiB0aGUgcmVuYW1lZCBwcmVkaWNhdGUg ZmxleEJhc2VTaXplTmVlZHNCbG9ja0F4aXNDb250ZW50U2l6ZS4KZmxleEJhc2VTaXplRm9yRmxl eEl0ZW0gbm93IGNhbGxzIHRoZSBlbnN1cmUgaGVscGVyIHVuY29uZGl0aW9uYWxseSBhbmQgcmVh ZHMKbV9ibG9ja0F4aXNTaXplIGRpcmVjdGx5IGF0IHRoZSBvbmUgdXNlIHNpdGUuIENvbW1lbnRz IGF0IHRoZSByZWFkIHNpdGUgaW4KY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yRmxleEl0ZW0gc3Bs aXQgaW50byB0d286IG9uZSBhYm91dCBjb21wdXRlQ29udGVudC0KTG9naWNhbEhlaWdodCBoYW5k bGluZyBhdXRvLCBvbmUgYWJvdXQgdGhlIHN0YWxlbmVzcyBjb250cmFjdCBmb3IKc2Nyb2xsYmFy TG9naWNhbEhlaWdodC4KCk5vIGJlaGF2aW9yIGNoYW5nZS4KCiogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JGbGV4SXRlbSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6ZmxleEJhc2VTaXplRm9yRmxleEl0ZW0pOgooV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRlZCk6CihX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplTmVlZHNCbG9ja0F4aXNDb250 ZW50U2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YmxvY2tBeGlzU2l6ZUZvckZs ZXhJdGVtKTogRGVsZXRlZC4KKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbU5l ZWRzQmxvY2tBeGlzU2l6ZSk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94Lmg6Ci0tLQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcCAgIHwgNDYgKysrKysrKysrLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggIHwgIDQgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjQg aW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNDVmNjZkMTgwOGM0Li4wNDg2Y2RlNWJk NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cApAQCAtOTIzLDIzICs5MjMsMjYgQEAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IHN0ZDo6 b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGUKICAgICAvLyBo b3Jpem9udGFsIGZsb3cgYW5kIGhvcml6b250YWwgd3JpdGluZyBtb2RlLCBvciB2ZXJ0aWNhbCBm bG93IGFuZCB2ZXJ0aWNhbAogICAgIC8vIHdyaXRpbmcgbW9kZS4gT3RoZXJ3aXNlIHdlIG5lZWQg dGhlIGxvZ2ljYWwgaGVpZ2h0LgogICAgIGlmICghbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhp cyhmbGV4SXRlbSkpIHsKLSAgICAgICAgLy8gV2UgZG9uJ3QgaGF2ZSB0byBjaGVjayBmb3IgImF1 dG8iIGhlcmUgLSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQKLSAgICAgICAgLy8gd2lsbCBq dXN0IHJldHVybiBhIG51bGwgT3B0aW9uYWwgZm9yIHRoYXQgY2FzZSBhbnl3YXkuIGZsZXhCYXNl U2l6ZUZvckZsZXhJdGVtCi0gICAgICAgIC8vIGNhbGxzIGJsb2NrQXhpc1NpemVGb3JGbGV4SXRl bSAod2hpY2ggZm9yY2VzIGxheW91dCB2aWEgbGF5b3V0SWZOZWVkZWQpIHdoZW4KLSAgICAgICAg Ly8gZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUgaXMgdHJ1ZTsgb24gdGhlIHBhdGggd2hlcmUg aXQgcmV0dXJucyBmYWxzZSAoZS5nLgotICAgICAgICAvLyBkZWZpbml0ZSBmbGV4LWJhc2lzIHdp dGggbm9uLWF1dG8gbWluLXNpemUgYW5kIG5vbi12aXNpYmxlL2NsaXAgb3ZlcmZsb3cpLAotICAg ICAgICAvLyB0aGUgY2hpbGQgbWF5IG5vdCB5ZXQgaGF2ZSBiZWVuIGxhaWQgb3V0LCBzbyBzY3Jv bGxiYXJMb2dpY2FsSGVpZ2h0KCkgY2FuCi0gICAgICAgIC8vIHJldHVybiAwIGhlcmUuIFRoYXQg aGFwcGVucyB0byBjb2luY2lkZSB3aXRoIHRoZSBzcGVjLCB3aGljaCBkb2Vzbid0Ci0gICAgICAg IC8vIGF0dHJpYnV0ZSBhIHNjcm9sbGJhciBjb250cmlidXRpb24gdG8gdGhlIGZsZXggYmFzZSBz aXplIG9uIHRoaXMgcGF0aC4KKyAgICAgICAgLy8gTm8gImF1dG8iIGNoZWNrIG5lZWRlZDogY29t cHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0IHJldHVybnMgbnVsbG9wdCBmb3IKKyAgICAgICAgLy8g YXV0byBhbmQgd2UgcHJvcGFnYXRlIHRoYXQgYmVsb3cuCiAgICAgICAgIGF1dG8gaGVpZ2h0ID0g ZmxleEl0ZW0uY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KHNpemUsIGZsZXhJdGVtQ29udGVu dExvZ2ljYWxIZWlnaHQoZmxleEl0ZW0pKTsKICAgICAgICAgaWYgKCFoZWlnaHQpCiAgICAgICAg ICAgICByZXR1cm4gaGVpZ2h0OworCiAgICAgICAgIC8vIFRhYmxlcyBpbnRlcnByZXQgb3ZlcnJp ZGluZyBzaXplcyBhcyB0aGUgc2l6ZSBvZiBjYXB0aW9ucyArIHJvd3MuIEhvd2V2ZXIgdGhlIHNw ZWNpZmllZCBoZWlnaHQgb2YgYSB0YWJsZQogICAgICAgICAvLyBvbmx5IGluY2x1ZGVzIHRoZSBz aXplIG9mIHRoZSByb3dzLiBUaGF0J3Mgd2h5IHdlIG5lZWQgdG8gYWRkIHRoZSBzaXplIG9mIHRo ZSBjYXB0aW9ucyBoZXJlIHNvIHRoYXQgdGhlIHRhYmxlCiAgICAgICAgIC8vIGxheW91dCBhbGdv cml0aG0gYmVoYXZlcyBhcHByb3ByaWF0ZWx5LgogICAgICAgICBMYXlvdXRVbml0IGNhcHRpb25z SGVpZ2h0OwogICAgICAgICBpZiAoQ2hlY2tlZFB0ciB0YWJsZSA9IGR5bmFtaWNEb3duY2FzdDxS ZW5kZXJUYWJsZT4oZmxleEl0ZW0pOyB0YWJsZSAmJiBmbGV4SXRlbU1haW5TaXplSXNEZWZpbml0 ZShmbGV4SXRlbSwgc2l6ZSkpCiAgICAgICAgICAgICBjYXB0aW9uc0hlaWdodCA9IHRhYmxlLT5z dW1DYXB0aW9uc0xvZ2ljYWxIZWlnaHQoKTsKKworICAgICAgICAvLyBzY3JvbGxiYXJMb2dpY2Fs SGVpZ2h0IGRlcGVuZHMgb24gbGF5b3V0IGhhdmluZyBydW4uIGZsZXhCYXNlU2l6ZUZvckZsZXhJ dGVtCisgICAgICAgIC8vIGNhbGxzIGVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0 ZW1JZk5lZWRlZCBiZWZvcmUgcmVhY2hpbmcgaGVyZSwKKyAgICAgICAgLy8gd2hpY2ggZm9yY2Vz IGxheW91dCB3aGVuIGZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNpemUgaXMgdHJ1 ZS4gT24KKyAgICAgICAgLy8gdGhlIGZhbHNlIHBhdGggKGRlZmluaXRlIGZsZXgtYmFzaXMgKyBu b24tYXV0byBtaW4tc2l6ZSArIG5vbi12aXNpYmxlL2NsaXAKKyAgICAgICAgLy8gb3ZlcmZsb3cp IGxheW91dCBoYXMgbm90IHJ1biBhbmQgdGhpcyByZXR1cm5zIDA7IHRoYXQgY29pbmNpZGVzIHdp dGggdGhlCisgICAgICAgIC8vIHNwZWMsIHdoaWNoIGRvZXMgbm90IGF0dHJpYnV0ZSBhIHNjcm9s bGJhciBjb250cmlidXRpb24gdG8gdGhlIGZsZXggYmFzZQorICAgICAgICAvLyBzaXplIG9uIHRo YXQgcGF0aC4KICAgICAgICAgcmV0dXJuICpoZWlnaHQgKyBmbGV4SXRlbS5zY3JvbGxiYXJMb2dp Y2FsSGVpZ2h0KCkgKyBjYXB0aW9uc0hlaWdodDsKICAgICB9CiAKQEAgLTE1NTcsMTMgKzE1NjAs MTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplRm9yRmxleEl0 ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXkKIHsKICAgICBhdXRvIGZsZXhCYXNpcyA9IGZs ZXhCYXNpc0ZvckZsZXhJdGVtKGZsZXhJdGVtKTsKICAgICBTY29wZWRGbGV4QmFzaXNBc0ZsZXhJ dGVtTWFpblNpemUgc2NvcGVkKGZsZXhJdGVtLCBmbGV4QmFzaXMudHJ5UHJlZmVycmVkU2l6ZSgp LnZhbHVlX29yKFN0eWxlOjpQcmVmZXJyZWRTaXplIHsgQ1NTOjpLZXl3b3JkOjpNYXhDb250ZW50 IHsgfSB9KSwgbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpOwotICAgIC8v IEZJWE1FOiBXaGlsZSB3ZSBhcmUgc3VwcG9zZWQgdG8gaWdub3JlIG1pbi9tYXggaGVyZSwKLSAg ICAvLyBibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0gbWF5IHJldHVybiBhIG1pbi9tYXgtY29uc3Ry YWluZWQgc2l6ZS4KKyAgICAvLyBGSVhNRTogV2hpbGUgd2UgYXJlIHN1cHBvc2VkIHRvIGlnbm9y ZSBtaW4vbWF4IGhlcmUsIHRoZSBjYWNoZWQKKyAgICAvLyBtX2Jsb2NrQXhpc1NpemUgZW50cnkg bWF5IGhvbGQgYSBtaW4vbWF4LWNvbnN0cmFpbmVkIHNpemUuCiAgICAgU2V0Rm9yU2NvcGU8Ym9v bD4gY29tcHV0aW5nQmFzZVNpemVzU2NvcGUobV9pc0NvbXB1dGluZ0ZsZXhCYXNlU2l6ZXMsIHRy dWUpOwotCi0gICAgYXV0byBibG9ja0F4aXNTaXplID0gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0 PiB7IH07Ci0gICAgaWYgKGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKGZsZXhJdGVtKSkKLSAg ICAgICAgYmxvY2tBeGlzU2l6ZSA9IGJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShmbGV4SXRlbSwg cmVsYXlvdXRDaGlsZHJlbik7CisgICAgZW5zdXJlQmxvY2tBeGlzQ29udGVudFNpemVGb3JGbGV4 SXRlbUlmTmVlZGVkKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKIAogICAgIC8vIDkuMi4z IEEuCiAgICAgaWYgKGZsZXhJdGVtTWFpblNpemVJc0RlZmluaXRlKGZsZXhJdGVtLCBmbGV4QmFz aXMpKQpAQCAtMTU4MSw4ICsxNTgxLDggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 ZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXkKICAgICAv LyA5LjIuMyBFLgogICAgIGlmICghbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRl bSkpIHsKICAgICAgICAgQVNTRVJUKCFmbGV4SXRlbS5uZWVkc0xheW91dCgpKTsKLSAgICAgICAg QVNTRVJUKGJsb2NrQXhpc1NpemUpOwotICAgICAgICByZXR1cm4gKmJsb2NrQXhpc1NpemU7Cisg ICAgICAgIEFTU0VSVChtX2Jsb2NrQXhpc1NpemUuY29udGFpbnMoZmxleEl0ZW0pKTsKKyAgICAg ICAgcmV0dXJuIG1fYmxvY2tBeGlzU2l6ZS5nZXRPcHRpb25hbChmbGV4SXRlbSkudmFsdWVfb3Io MF9sdSk7CiAgICAgfQogCiAgICAgLy8gV2UgZG9uJ3QgbmVlZCB0byBhZGQgc2Nyb2xsYmFyTG9n aWNhbFdpZHRoIGhlcmUgYmVjYXVzZSB0aGUgcHJlZmVycmVkCkBAIC0yMDkzLDkgKzIwOTMsMTAg QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0RmxleEl0ZW1TaXplRm9yQXNw ZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgKICAgICByZXR1cm4gZmxleEl0ZW1TaXplOwogfQog Ci1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0o UmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuKQor dm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6ZW5zdXJlQmxvY2tBeGlzQ29udGVudFNpemVGb3JGbGV4 SXRlbUlmTmVlZGVkKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlv dXRDaGlsZHJlbikKIHsKLSAgICBBU1NFUlQoZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoZmxl eEl0ZW0pKTsKKyAgICBpZiAoIWZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNpemUo ZmxleEl0ZW0pKQorICAgICAgICByZXR1cm47CiAKICAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBp cyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAog ICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJ dGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSwKQEAgLTIxMDMsMTAgKzIxMDQsOCBAQCBMYXlv dXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0oUmVuZGVy Qm94JiBmbGV4SXRlbSwgUmVsYQogICAgIC8vIGl0cyBsb2dpY2FsIGhlaWdodCBhbmQgc2Nyb2xs IGJhcnMgYXJlIHVwIHRvIGRhdGUuCiAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9y ZUxheW91dChyZWxheW91dENoaWxkcmVuLCBmbGV4SXRlbSk7CiAKLSAgICBpZiAoIWZsZXhJdGVt Lm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgaWYgKGF1dG8gY2FjaGVkID0gbV9ibG9ja0F4aXNT aXplLmdldE9wdGlvbmFsKGZsZXhJdGVtKSkKLSAgICAgICAgICAgIHJldHVybiAqY2FjaGVkOwot ICAgIH0KKyAgICBpZiAoIWZsZXhJdGVtLm5lZWRzTGF5b3V0KCkgJiYgbV9ibG9ja0F4aXNTaXpl LmNvbnRhaW5zKGZsZXhJdGVtKSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRG9uJ3QgcmVz b2x2ZSBwZXJjZW50YWdlcyBpbiBjaGlsZHJlbi4gVGhpcyBpcyBlc3BlY2lhbGx5IGltcG9ydGFu dCBmb3IgdGhlIG1pbi1oZWlnaHQgY2FsY3VsYXRpb24sCiAgICAgLy8gd2hlcmUgd2Ugd2FudCBw ZXJjZW50YWdlcyB0byBiZSB0cmVhdGVkIGFzIGF1dG8uIEZvciBmbGV4LWJhc2lzIGl0c2VsZiwg dGhpcyBpcyBub3QgYSBwcm9ibGVtIGJlY2F1c2UKQEAgLTIxMjQsNyArMjEyMyw2IEBAIExheW91 dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShSZW5kZXJC b3gmIGZsZXhJdGVtLCBSZWxhCiAKICAgICBtX2Jsb2NrQXhpc1NpemUuc2V0KGZsZXhJdGVtLCBp bm5lclNpemUpOwogICAgIG1fcmVsYWlkT3V0RmxleEl0ZW1zLmFkZChmbGV4SXRlbSk7Ci0gICAg cmV0dXJuIGlubmVyU2l6ZTsKIH0KIAogUmVuZGVyRmxleGlibGVCb3g6OkZsZXhMYXlvdXRJdGVt IFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4TGF5b3V0SXRlbShSZW5kZXJCb3gmIGZs ZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4pCkBAIC0yNTU5LDcgKzI1 NTcsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoRmxleEl0ZW1Mb2dp Y2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgZmxleAogICAgICAgICAmJiBmbGV4SXRlbS5zdHls ZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsKIH0KIAotYm9vbCBSZW5kZXJGbGV4aWJsZUJv eDo6ZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkK K2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVu dFNpemUoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAobWFpbkF4aXNJc0Zs ZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggM2NjY2RiYTBh MmFjLi4zZDRhOTUzZGNmNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oCkBAIC0yMTAsMTQgKzIxMCwxNCBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRl PHR5cGVuYW1lIFNpemVUeXBlPiBMYXlvdXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RS YXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9z c1NpemVMZW5ndGgpIGNvbnN0OwogICAgIHZvaWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRp b25Gb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwog ICAgIExheW91dFVuaXQgZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRl bSwgUmVsYXlvdXRDaGlsZHJlbik7Ci0gICAgTGF5b3V0VW5pdCBibG9ja0F4aXNTaXplRm9yRmxl eEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbik7CisgICAgdm9pZCBl bnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94JiBm bGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbik7CiAgICAgdm9pZCBOT0RFTEVURSBhZGp1c3RBbGln bm1lbnRGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBMYXlvdXRVbml0KTsKICAgICBp bmxpbmUgT3ZlcmZsb3dBbGlnbm1lbnQgb3ZlcmZsb3dBbGlnbm1lbnRGb3JGbGV4SXRlbShjb25z dCBSZW5kZXJCb3gmIGZsZXhJdGVtKSBjb25zdDsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTaXpl VHlwZT4gYm9vbCBjYW5Db21wdXRlUGVyY2VudGFnZUZsZXhCYXNpcyhjb25zdCBSZW5kZXJCb3gm IGZsZXhJdGVtLCBjb25zdCBTaXplVHlwZSYsIFVwZGF0ZVBlcmNlbnRhZ2VIZWlnaHREZXNjZW5k YW50cyk7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IGJvb2wgZmxleEl0ZW1NYWlu U2l6ZUlzRGVmaW5pdGUoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgU2l6ZVR5cGUmKTsKICAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBTaXplVHlwZT4gYm9vbCBmbGV4SXRlbUNyb3NzU2l6ZUlzRGVmaW5p dGUoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgU2l6ZVR5cGUmKTsKICAgICBib29sIG5lZWRUb1N0 cmV0Y2hGbGV4SXRlbUxvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29u c3Q7Ci0gICAgYm9vbCBmbGV4SXRlbU5lZWRzQmxvY2tBeGlzU2l6ZShjb25zdCBSZW5kZXJCb3gm IGZsZXhJdGVtKTsKKyAgICBib29sIGZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNp emUoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CiAgICAgT3ZlcmZsb3cgTk9ERUxFVEUgbWFp bkF4aXNPdmVyZmxvd0ZvckZsZXhJdGVtKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0pIGNvbnN0 OwogICAgIE92ZXJmbG93IE5PREVMRVRFIGNyb3NzQXhpc092ZXJmbG93Rm9yRmxleEl0ZW0oY29u c3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAK 479795 2026-05-25 05:55:53 -0700 2026-05-25 07:48:19 -0700 [fast-cq]Patch bug-315431-20260525055552.patch text/plain 10008 zalan RnJvbSA5ZDQwZDlhMGUxYTFmOTJiNDE3NjQ0YzMwMjE1ZjliM2Y0YzU1YjEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMjMgTWF5IDIwMjYgMTQ6Mzk6NTcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gU2VwYXJhdGUgbGF5b3V0LWZvcmNpbmcgZnJvbSBzaXplIHF1ZXJ5aW5nIGluCiBSZW5kZXJG bGV4aWJsZUJveCBmbGV4IGJhc2UgcGF0aAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMxNTQzMQoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgpibG9ja0F4aXNT aXplRm9yRmxleEl0ZW0gZGlkIHR3byB0aGluZ3MgaW4gb25lIGNhbGw6IGl0IGZvcmNlZCBsYXlv dXRJZk5lZWRlZApvbiB0aGUgZmxleCBpdGVtLCBwb3B1bGF0ZWQgbV9ibG9ja0F4aXNTaXplIGFz IGEgc2lkZSBlZmZlY3QsIGFuZCByZXR1cm5lZCB0aGUKY2FjaGVkIHZhbHVlLiBUaGF0IGJsdXJy ZWQgdGhlIGFjdGlvbiAoZm9yY2UgbGF5b3V0KSBhbmQgdGhlIHF1ZXJ5IChyZWFkIHRoZQpjYWNo ZWQgc2l6ZSkgaW50byBhIHNpbmdsZSBuYW1lZCBvcGVyYXRpb24sIGFuZCB0aGUgcHJlZGljYXRl IHRoYXQgZ2F0ZWQgaXQKKGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKSBzb3VuZGVkIGxpa2Ug YSBnZW5lcmljIHF1ZXN0aW9uIGFib3V0IHRoZSBpdGVtCndoZW4gaXQgcmVhbGx5IG9ubHkgbWF0 dGVyZWQgZm9yIHRoZSBmbGV4IGJhc2Ugc2l6ZSBjb21wdXRhdGlvbi4KCkV4dHJhY3RlZCB0aGUg bGF5b3V0LWZvcmNpbmcgc2lkZSBpbnRvIGVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxl eEl0ZW1JZk5lZWRlZCwKd2hpY2ggc2VsZi1nYXRlcyBvbiB0aGUgcmVuYW1lZCBwcmVkaWNhdGUg ZmxleEJhc2VTaXplTmVlZHNCbG9ja0F4aXNDb250ZW50U2l6ZS4KZmxleEJhc2VTaXplRm9yRmxl eEl0ZW0gbm93IGNhbGxzIHRoZSBlbnN1cmUgaGVscGVyIHVuY29uZGl0aW9uYWxseSBhbmQgcmVh ZHMKbV9ibG9ja0F4aXNTaXplIGRpcmVjdGx5IGF0IHRoZSBvbmUgdXNlIHNpdGUuIENvbW1lbnRz IGF0IHRoZSByZWFkIHNpdGUgaW4KY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yRmxleEl0ZW0gc3Bs aXQgaW50byB0d286IG9uZSBhYm91dCBjb21wdXRlQ29udGVudC0KTG9naWNhbEhlaWdodCBoYW5k bGluZyBhdXRvLCBvbmUgYWJvdXQgdGhlIHN0YWxlbmVzcyBjb250cmFjdCBmb3IKc2Nyb2xsYmFy TG9naWNhbEhlaWdodC4KCk5vIGJlaGF2aW9yIGNoYW5nZS4KCiogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JGbGV4SXRlbSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6ZmxleEJhc2VTaXplRm9yRmxleEl0ZW0pOgooV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRlZCk6CihX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplTmVlZHNCbG9ja0F4aXNDb250 ZW50U2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YmxvY2tBeGlzU2l6ZUZvckZs ZXhJdGVtKTogRGVsZXRlZC4KKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbU5l ZWRzQmxvY2tBeGlzU2l6ZSk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94Lmg6Ci0tLQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcCAgIHwgNDYgKysrKysrKysrLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggIHwgIDQgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjQg aW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZWU5OThiZTc2MTM0Li40ZmQ4YTI4MWFh N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cApAQCAtOTIzLDIzICs5MjMsMjYgQEAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IHN0ZDo6 b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGUKICAgICAvLyBo b3Jpem9udGFsIGZsb3cgYW5kIGhvcml6b250YWwgd3JpdGluZyBtb2RlLCBvciB2ZXJ0aWNhbCBm bG93IGFuZCB2ZXJ0aWNhbAogICAgIC8vIHdyaXRpbmcgbW9kZS4gT3RoZXJ3aXNlIHdlIG5lZWQg dGhlIGxvZ2ljYWwgaGVpZ2h0LgogICAgIGlmICghbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhp cyhmbGV4SXRlbSkpIHsKLSAgICAgICAgLy8gV2UgZG9uJ3QgaGF2ZSB0byBjaGVjayBmb3IgImF1 dG8iIGhlcmUgLSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQKLSAgICAgICAgLy8gd2lsbCBq dXN0IHJldHVybiBhIG51bGwgT3B0aW9uYWwgZm9yIHRoYXQgY2FzZSBhbnl3YXkuIGZsZXhCYXNl U2l6ZUZvckZsZXhJdGVtCi0gICAgICAgIC8vIGNhbGxzIGJsb2NrQXhpc1NpemVGb3JGbGV4SXRl bSAod2hpY2ggZm9yY2VzIGxheW91dCB2aWEgbGF5b3V0SWZOZWVkZWQpIHdoZW4KLSAgICAgICAg Ly8gZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUgaXMgdHJ1ZTsgb24gdGhlIHBhdGggd2hlcmUg aXQgcmV0dXJucyBmYWxzZSAoZS5nLgotICAgICAgICAvLyBkZWZpbml0ZSBmbGV4LWJhc2lzIHdp dGggbm9uLWF1dG8gbWluLXNpemUgYW5kIG5vbi12aXNpYmxlL2NsaXAgb3ZlcmZsb3cpLAotICAg ICAgICAvLyB0aGUgY2hpbGQgbWF5IG5vdCB5ZXQgaGF2ZSBiZWVuIGxhaWQgb3V0LCBzbyBzY3Jv bGxiYXJMb2dpY2FsSGVpZ2h0KCkgY2FuCi0gICAgICAgIC8vIHJldHVybiAwIGhlcmUuIFRoYXQg aGFwcGVucyB0byBjb2luY2lkZSB3aXRoIHRoZSBzcGVjLCB3aGljaCBkb2Vzbid0Ci0gICAgICAg IC8vIGF0dHJpYnV0ZSBhIHNjcm9sbGJhciBjb250cmlidXRpb24gdG8gdGhlIGZsZXggYmFzZSBz aXplIG9uIHRoaXMgcGF0aC4KKyAgICAgICAgLy8gTm8gImF1dG8iIGNoZWNrIG5lZWRlZDogY29t cHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0IHJldHVybnMgbnVsbG9wdCBmb3IKKyAgICAgICAgLy8g YXV0byBhbmQgd2UgcHJvcGFnYXRlIHRoYXQgYmVsb3cuCiAgICAgICAgIGF1dG8gaGVpZ2h0ID0g ZmxleEl0ZW0uY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KHNpemUsIGZsZXhJdGVtQ29udGVu dExvZ2ljYWxIZWlnaHQoZmxleEl0ZW0pKTsKICAgICAgICAgaWYgKCFoZWlnaHQpCiAgICAgICAg ICAgICByZXR1cm4gaGVpZ2h0OworCiAgICAgICAgIC8vIFRhYmxlcyBpbnRlcnByZXQgb3ZlcnJp ZGluZyBzaXplcyBhcyB0aGUgc2l6ZSBvZiBjYXB0aW9ucyArIHJvd3MuIEhvd2V2ZXIgdGhlIHNw ZWNpZmllZCBoZWlnaHQgb2YgYSB0YWJsZQogICAgICAgICAvLyBvbmx5IGluY2x1ZGVzIHRoZSBz aXplIG9mIHRoZSByb3dzLiBUaGF0J3Mgd2h5IHdlIG5lZWQgdG8gYWRkIHRoZSBzaXplIG9mIHRo ZSBjYXB0aW9ucyBoZXJlIHNvIHRoYXQgdGhlIHRhYmxlCiAgICAgICAgIC8vIGxheW91dCBhbGdv cml0aG0gYmVoYXZlcyBhcHByb3ByaWF0ZWx5LgogICAgICAgICBMYXlvdXRVbml0IGNhcHRpb25z SGVpZ2h0OwogICAgICAgICBpZiAoQ2hlY2tlZFB0ciB0YWJsZSA9IGR5bmFtaWNEb3duY2FzdDxS ZW5kZXJUYWJsZT4oZmxleEl0ZW0pOyB0YWJsZSAmJiBmbGV4SXRlbU1haW5TaXplSXNEZWZpbml0 ZShmbGV4SXRlbSwgc2l6ZSkpCiAgICAgICAgICAgICBjYXB0aW9uc0hlaWdodCA9IHRhYmxlLT5z dW1DYXB0aW9uc0xvZ2ljYWxIZWlnaHQoKTsKKworICAgICAgICAvLyBzY3JvbGxiYXJMb2dpY2Fs SGVpZ2h0IGRlcGVuZHMgb24gbGF5b3V0IGhhdmluZyBydW4uIGZsZXhCYXNlU2l6ZUZvckZsZXhJ dGVtCisgICAgICAgIC8vIGNhbGxzIGVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0 ZW1JZk5lZWRlZCBiZWZvcmUgcmVhY2hpbmcgaGVyZSwKKyAgICAgICAgLy8gd2hpY2ggZm9yY2Vz IGxheW91dCB3aGVuIGZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNpemUgaXMgdHJ1 ZS4gT24KKyAgICAgICAgLy8gdGhlIGZhbHNlIHBhdGggKGRlZmluaXRlIGZsZXgtYmFzaXMgKyBu b24tYXV0byBtaW4tc2l6ZSArIG5vbi12aXNpYmxlL2NsaXAKKyAgICAgICAgLy8gb3ZlcmZsb3cp IGxheW91dCBoYXMgbm90IHJ1biBhbmQgdGhpcyByZXR1cm5zIDA7IHRoYXQgY29pbmNpZGVzIHdp dGggdGhlCisgICAgICAgIC8vIHNwZWMsIHdoaWNoIGRvZXMgbm90IGF0dHJpYnV0ZSBhIHNjcm9s bGJhciBjb250cmlidXRpb24gdG8gdGhlIGZsZXggYmFzZQorICAgICAgICAvLyBzaXplIG9uIHRo YXQgcGF0aC4KICAgICAgICAgcmV0dXJuICpoZWlnaHQgKyBmbGV4SXRlbS5zY3JvbGxiYXJMb2dp Y2FsSGVpZ2h0KCkgKyBjYXB0aW9uc0hlaWdodDsKICAgICB9CiAKQEAgLTE1NTQsMTMgKzE1NTcs MTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplRm9yRmxleEl0 ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXkKIHsKICAgICBhdXRvIGZsZXhCYXNpcyA9IGZs ZXhCYXNpc0ZvckZsZXhJdGVtKGZsZXhJdGVtKTsKICAgICBTY29wZWRGbGV4QmFzaXNBc0ZsZXhJ dGVtTWFpblNpemUgc2NvcGVkKGZsZXhJdGVtLCBmbGV4QmFzaXMudHJ5UHJlZmVycmVkU2l6ZSgp LnZhbHVlX29yKFN0eWxlOjpQcmVmZXJyZWRTaXplIHsgQ1NTOjpLZXl3b3JkOjpNYXhDb250ZW50 IHsgfSB9KSwgbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpOwotICAgIC8v IEZJWE1FOiBXaGlsZSB3ZSBhcmUgc3VwcG9zZWQgdG8gaWdub3JlIG1pbi9tYXggaGVyZSwKLSAg ICAvLyBibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0gbWF5IHJldHVybiBhIG1pbi9tYXgtY29uc3Ry YWluZWQgc2l6ZS4KKyAgICAvLyBGSVhNRTogV2hpbGUgd2UgYXJlIHN1cHBvc2VkIHRvIGlnbm9y ZSBtaW4vbWF4IGhlcmUsIHRoZSBjYWNoZWQKKyAgICAvLyBtX2Jsb2NrQXhpc1NpemUgZW50cnkg bWF5IGhvbGQgYSBtaW4vbWF4LWNvbnN0cmFpbmVkIHNpemUuCiAgICAgU2V0Rm9yU2NvcGU8Ym9v bD4gY29tcHV0aW5nQmFzZVNpemVzU2NvcGUobV9pc0NvbXB1dGluZ0ZsZXhCYXNlU2l6ZXMsIHRy dWUpOwotCi0gICAgYXV0byBibG9ja0F4aXNTaXplID0gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0 PiB7IH07Ci0gICAgaWYgKGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKGZsZXhJdGVtKSkKLSAg ICAgICAgYmxvY2tBeGlzU2l6ZSA9IGJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShmbGV4SXRlbSwg cmVsYXlvdXRDaGlsZHJlbik7CisgICAgZW5zdXJlQmxvY2tBeGlzQ29udGVudFNpemVGb3JGbGV4 SXRlbUlmTmVlZGVkKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKIAogICAgIC8vIDkuMi4z IEEuCiAgICAgaWYgKGZsZXhJdGVtTWFpblNpemVJc0RlZmluaXRlKGZsZXhJdGVtLCBmbGV4QmFz aXMpKQpAQCAtMTU3OCw4ICsxNTc4LDggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 ZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXkKICAgICAv LyA5LjIuMyBFLgogICAgIGlmICghbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRl bSkpIHsKICAgICAgICAgQVNTRVJUKCFmbGV4SXRlbS5uZWVkc0xheW91dCgpKTsKLSAgICAgICAg QVNTRVJUKGJsb2NrQXhpc1NpemUpOwotICAgICAgICByZXR1cm4gKmJsb2NrQXhpc1NpemU7Cisg ICAgICAgIEFTU0VSVChtX2Jsb2NrQXhpc1NpemUuY29udGFpbnMoZmxleEl0ZW0pKTsKKyAgICAg ICAgcmV0dXJuIG1fYmxvY2tBeGlzU2l6ZS5nZXRPcHRpb25hbChmbGV4SXRlbSkudmFsdWVfb3Io MF9sdSk7CiAgICAgfQogCiAgICAgLy8gV2UgZG9uJ3QgbmVlZCB0byBhZGQgc2Nyb2xsYmFyTG9n aWNhbFdpZHRoIGhlcmUgYmVjYXVzZSB0aGUgcHJlZmVycmVkCkBAIC0yMDkwLDkgKzIwOTAsMTAg QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0RmxleEl0ZW1TaXplRm9yQXNw ZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgKICAgICByZXR1cm4gZmxleEl0ZW1TaXplOwogfQog Ci1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0o UmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuKQor dm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6ZW5zdXJlQmxvY2tBeGlzQ29udGVudFNpemVGb3JGbGV4 SXRlbUlmTmVlZGVkKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlv dXRDaGlsZHJlbikKIHsKLSAgICBBU1NFUlQoZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoZmxl eEl0ZW0pKTsKKyAgICBpZiAoIWZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNpemUo ZmxleEl0ZW0pKQorICAgICAgICByZXR1cm47CiAKICAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBp cyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAog ICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJ dGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSwKQEAgLTIxMDAsMTAgKzIxMDEsOCBAQCBMYXlv dXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0oUmVuZGVy Qm94JiBmbGV4SXRlbSwgUmVsYQogICAgIC8vIGl0cyBsb2dpY2FsIGhlaWdodCBhbmQgc2Nyb2xs IGJhcnMgYXJlIHVwIHRvIGRhdGUuCiAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9y ZUxheW91dChyZWxheW91dENoaWxkcmVuLCBmbGV4SXRlbSk7CiAKLSAgICBpZiAoIWZsZXhJdGVt Lm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgaWYgKGF1dG8gY2FjaGVkID0gbV9ibG9ja0F4aXNT aXplLmdldE9wdGlvbmFsKGZsZXhJdGVtKSkKLSAgICAgICAgICAgIHJldHVybiAqY2FjaGVkOwot ICAgIH0KKyAgICBpZiAoIWZsZXhJdGVtLm5lZWRzTGF5b3V0KCkgJiYgbV9ibG9ja0F4aXNTaXpl LmNvbnRhaW5zKGZsZXhJdGVtKSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRG9uJ3QgcmVz b2x2ZSBwZXJjZW50YWdlcyBpbiBjaGlsZHJlbi4gVGhpcyBpcyBlc3BlY2lhbGx5IGltcG9ydGFu dCBmb3IgdGhlIG1pbi1oZWlnaHQgY2FsY3VsYXRpb24sCiAgICAgLy8gd2hlcmUgd2Ugd2FudCBw ZXJjZW50YWdlcyB0byBiZSB0cmVhdGVkIGFzIGF1dG8uIEZvciBmbGV4LWJhc2lzIGl0c2VsZiwg dGhpcyBpcyBub3QgYSBwcm9ibGVtIGJlY2F1c2UKQEAgLTIxMjEsNyArMjEyMCw2IEBAIExheW91 dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShSZW5kZXJC b3gmIGZsZXhJdGVtLCBSZWxhCiAKICAgICBtX2Jsb2NrQXhpc1NpemUuc2V0KGZsZXhJdGVtLCBp bm5lclNpemUpOwogICAgIG1fcmVsYWlkT3V0RmxleEl0ZW1zLmFkZChmbGV4SXRlbSk7Ci0gICAg cmV0dXJuIGlubmVyU2l6ZTsKIH0KIAogUmVuZGVyRmxleGlibGVCb3g6OkZsZXhMYXlvdXRJdGVt IFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4TGF5b3V0SXRlbShSZW5kZXJCb3gmIGZs ZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4pCkBAIC0yNTU2LDcgKzI1 NTQsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoRmxleEl0ZW1Mb2dp Y2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgZmxleAogICAgICAgICAmJiBmbGV4SXRlbS5zdHls ZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsKIH0KIAotYm9vbCBSZW5kZXJGbGV4aWJsZUJv eDo6ZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkK K2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVu dFNpemUoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAobWFpbkF4aXNJc0Zs ZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggM2NjY2RiYTBh MmFjLi4zZDRhOTUzZGNmNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oCkBAIC0yMTAsMTQgKzIxMCwxNCBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRl PHR5cGVuYW1lIFNpemVUeXBlPiBMYXlvdXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RS YXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9z c1NpemVMZW5ndGgpIGNvbnN0OwogICAgIHZvaWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRp b25Gb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwog ICAgIExheW91dFVuaXQgZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRl bSwgUmVsYXlvdXRDaGlsZHJlbik7Ci0gICAgTGF5b3V0VW5pdCBibG9ja0F4aXNTaXplRm9yRmxl eEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbik7CisgICAgdm9pZCBl bnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94JiBm bGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbik7CiAgICAgdm9pZCBOT0RFTEVURSBhZGp1c3RBbGln bm1lbnRGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBMYXlvdXRVbml0KTsKICAgICBp bmxpbmUgT3ZlcmZsb3dBbGlnbm1lbnQgb3ZlcmZsb3dBbGlnbm1lbnRGb3JGbGV4SXRlbShjb25z dCBSZW5kZXJCb3gmIGZsZXhJdGVtKSBjb25zdDsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTaXpl VHlwZT4gYm9vbCBjYW5Db21wdXRlUGVyY2VudGFnZUZsZXhCYXNpcyhjb25zdCBSZW5kZXJCb3gm IGZsZXhJdGVtLCBjb25zdCBTaXplVHlwZSYsIFVwZGF0ZVBlcmNlbnRhZ2VIZWlnaHREZXNjZW5k YW50cyk7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IGJvb2wgZmxleEl0ZW1NYWlu U2l6ZUlzRGVmaW5pdGUoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgU2l6ZVR5cGUmKTsKICAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBTaXplVHlwZT4gYm9vbCBmbGV4SXRlbUNyb3NzU2l6ZUlzRGVmaW5p dGUoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgU2l6ZVR5cGUmKTsKICAgICBib29sIG5lZWRUb1N0 cmV0Y2hGbGV4SXRlbUxvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29u c3Q7Ci0gICAgYm9vbCBmbGV4SXRlbU5lZWRzQmxvY2tBeGlzU2l6ZShjb25zdCBSZW5kZXJCb3gm IGZsZXhJdGVtKTsKKyAgICBib29sIGZsZXhCYXNlU2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNp emUoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CiAgICAgT3ZlcmZsb3cgTk9ERUxFVEUgbWFp bkF4aXNPdmVyZmxvd0ZvckZsZXhJdGVtKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0pIGNvbnN0 OwogICAgIE92ZXJmbG93IE5PREVMRVRFIGNyb3NzQXhpc092ZXJmbG93Rm9yRmxleEl0ZW0oY29u c3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAK