315457 2026-05-24 06:29:46 -0700 [cleanup] Move dirty-bit update out of flex base size path and rename m_relaidOutFlexItems 2026-05-25 11:59:11 -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 2213643 0 zalan 2026-05-24 06:29:46 -0700 ssia 2213644 1 479789 zalan 2026-05-24 06:33:06 -0700 Created attachment 479789 Patch 2213884 2 479818 zalan 2026-05-25 10:02:34 -0700 Created attachment 479818 [fast-cq]Patch 2213901 3 ews-feeder 2026-05-25 11:58:29 -0700 Committed 313850@main (7c614cb3031c): <https://commits.webkit.org/313850@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479818. 2213902 4 webkit-bug-importer 2026-05-25 11:59:11 -0700 <rdar://problem/177892448> 479789 2026-05-24 06:33:06 -0700 2026-05-25 10:02:32 -0700 Patch bug-315457-20260524063305.patch text/plain 11530 zalan RnJvbSA0ZTQwNDQxY2ZjMTIxMTEzMjZkZjkxZGI2ODBmZTBmOTdmNDVmZjk3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjQgTWF5IDIwMjYgMDY6MzE6MjcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gTW92ZSBkaXJ0eS1iaXQgdXBkYXRlIG91dCBvZiBmbGV4IGJhc2Ugc2l6ZSBwYXRoCiBhbmQg cmVuYW1lIG1fcmVsYWlkT3V0RmxleEl0ZW1zCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE1NDU3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCmVuc3VyZUJs b2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRlZCBjYWxsZWQgdXBkYXRlQmxvY2tD aGlsZERpcnR5LQpCaXRzQmVmb3JlTGF5b3V0IGFzIHBhcnQgb2YgaXRzIHByZWFtYmxlLCB3aGlj aCB3YXMgdGhlIG9ubHkgcmVhc29uIGl0IHRvb2sKYSBSZWxheW91dENoaWxkcmVuIHBhcmFtZXRl ci4gVGhlIG1hcmtpbmcgaXQgcGVyZm9ybXMgKG1hcmsgbmVlZHMtbGF5b3V0IGlmCnJlbGF5b3V0 Q2hpbGRyZW4gaXMgWWVzIG9yIHRoZSBjaGlsZCBoYXMgYSByZWxhdGl2ZSBoZWlnaHQpIGlzIG5v dCBzcGVjaWZpYwp0byBmbGV4IGJhc2Ugc2l6ZSBjb21wdXRhdGlvbiAtIGl0IGlzIHBlci1pdGVt IGJvb2trZWVwaW5nIHRoYXQgdGhlIGZsZXgKbGF5b3V0J3Mgc2V0dXAgbG9vcCB3YW50cyB0byBk byByZWdhcmRsZXNzIG9mIHdoaWNoIGdhdGUgdGhlIGl0ZW0gZmFsbHMgb24uCgpNb3ZlZCB0aGUg dXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91dCBjYWxsIGludG8gcHJlcGFyZUZs ZXhJdGVtLAp0aGUgbGFtYmRhIGluc2lkZSBwZXJmb3JtRmxleExheW91dCB0aGF0IGFscmVhZHkg Z2F0aGVycyBwZXItaXRlbQpwcmVwYXJhdGlvbiB3b3JrLiBUaGUgY2FzY2FkaW5nIGNvbnNlcXVl bmNlIGRyb3BzIFJlbGF5b3V0Q2hpbGRyZW4gZnJvbQp0aHJlZSBzaWduYXR1cmVzIHRoYXQgd2Vy ZSBvbmx5IGZvcndhcmRpbmcgaXQ6IGVuc3VyZUJsb2NrQXhpc0NvbnRlbnQtClNpemVGb3JGbGV4 SXRlbUlmTmVlZGVkLCBmbGV4QmFzZVNpemVGb3JGbGV4SXRlbSwgYW5kIGZsZXhCYXNlQW5kSHlw b3RoZXRpY2FsLQpNYWluU2l6ZS4KClRoZSBtYXJraW5nIG5vdyBmaXJlcyBmb3IgZXZlcnkgaW4t ZmxvdyBmbGV4IGl0ZW0gaW5zdGVhZCBvZiBvbmx5IHRob3NlCndoZXJlIGZsZXhCYXNlU2l6ZU5l ZWRzQmxvY2tBeGlzQ29udGVudFNpemUgcmV0dXJucyB0cnVlLiBUaGlzIGlzIGZ1bmN0aW9uYWxs eQphIG5vLW9wOiBpdGVtcyBwcmV2aW91c2x5IHVubWFya2VkIGF0IHRoaXMgc3RhZ2Ugd291bGQg YmUgbWFya2VkIGFueXdheSBieQp1cGRhdGVGbGV4SXRlbURpcnR5Qml0c0JlZm9yZUxheW91dCBp biBsYXlvdXRBbmRQbGFjZUZsZXhJdGVtcyBiZWZvcmUKbGF5b3V0SWZOZWVkZWQgZmlyZXMsIHNv IHRoZSBkaXJ0eS1iaXQgc3RhdGUgYXQgdGhlIGFjdHVhbCBsYXlvdXQgY2FsbCBpcwp1bmNoYW5n ZWQuCgpBbHNvIHJlbmFtZWQgdGhlIGNhY2hlIGZpZWxkIG1fcmVsYWlkT3V0RmxleEl0ZW1zIHRv IG1fZmxleEl0ZW1zV2l0aC0KQ29tcGxldGVkTGF5b3V0LiBUaGUgb2xkIG5hbWUgcmVhZCBhcyBh IHBhc3QgcGFydGljaXBsZSBvZiAicmUtbGF5LW91dCIsCndoaWNoIGlzIGF3a3dhcmQgYW5kIGRv ZXNuJ3QgY2FwdHVyZSB3aGF0IHRoZSBzZXQgdHJhY2tzOiBmbGV4IGl0ZW1zIHdob3NlCmxheW91 dCBoYXMgYmVlbiBjb21wbGV0ZWQgZHVyaW5nIHRoZSBjdXJyZW50IGxheW91dCBpbnZvY2F0aW9u LCB1c2VkIHRvCnNraXAgZHVwbGljYXRlIHdvcmsgaW4gdGhlIGZsZXggYWxnb3JpdGhtLgoKTm8g YmVoYXZpb3IgY2hhbmdlLgoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwOgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKToKKFdl YkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpwZXJmb3JtRmxleExheW91dCk6CihXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplRm9yRmxleEl0ZW0pOgooV2ViQ29yZTo6UmVu ZGVyRmxleGlibGVCb3g6OmVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5l ZWRlZCk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VBbmRIeXBvdGhldGlj YWxNYWluU2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5kUGxhY2VG bGV4SXRlbXMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o OgotLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgICB8IDI5 ICsrKysrKysrLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5oICB8ICA4ICsrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyks IDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCmluZGV4IDU4MTg5YjNlYWYyZC4uMTExYWJjMGQzYTY0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTQ4Niw3ICs0 ODYsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayhSZWxheW91dENoaWxk cmVuIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaQogICAgIExheW91dFJlcGFpbnRlciByZXBh aW50ZXIoKnRoaXMpOwogCiAgICAgcmVzZXRMb2dpY2FsSGVpZ2h0QmVmb3JlTGF5b3V0SWZOZWVk ZWQoKTsKLSAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5jbGVhcigpOworICAgIG1fZmxleEl0ZW1z V2l0aENvbXBsZXRlZExheW91dC5jbGVhcigpOwogICAgIAogICAgIGJvb2wgb2xkSW5MYXlvdXQg PSBtX2luTGF5b3V0OwogICAgIG1faW5MYXlvdXQgPSB0cnVlOwpAQCAtMTU2MSwxNCArMTU2MSwx NCBAQCBwcml2YXRlOgogfTsKIAogLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4 Ym94LyNhbGdvLW1haW4taXRlbQotTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJh c2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiBy ZWxheW91dENoaWxkcmVuKQorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VT aXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBhdXRvIGZsZXhCYXNp cyA9IGZsZXhCYXNpc0ZvckZsZXhJdGVtKGZsZXhJdGVtKTsKICAgICBTY29wZWRGbGV4QmFzaXNB c0ZsZXhJdGVtTWFpblNpemUgc2NvcGVkKGZsZXhJdGVtLCBmbGV4QmFzaXMudHJ5UHJlZmVycmVk U2l6ZSgpLnZhbHVlX29yKFN0eWxlOjpQcmVmZXJyZWRTaXplIHsgQ1NTOjpLZXl3b3JkOjpNYXhD b250ZW50IHsgfSB9KSwgbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpOwog ICAgIC8vIEZJWE1FOiBXaGlsZSB3ZSBhcmUgc3VwcG9zZWQgdG8gaWdub3JlIG1pbi9tYXggaGVy ZSwgdGhlIGNhY2hlZAogICAgIC8vIG1fYmxvY2tBeGlzU2l6ZSBlbnRyeSBtYXkgaG9sZCBhIG1p bi9tYXgtY29uc3RyYWluZWQgc2l6ZS4KICAgICBTZXRGb3JTY29wZTxib29sPiBjb21wdXRpbmdC YXNlU2l6ZXNTY29wZShtX2lzQ29tcHV0aW5nRmxleEJhc2VTaXplcywgdHJ1ZSk7Ci0gICAgZW5z dXJlQmxvY2tBeGlzQ29udGVudFNpemVGb3JGbGV4SXRlbUlmTmVlZGVkKGZsZXhJdGVtLCByZWxh eW91dENoaWxkcmVuKTsKKyAgICBlbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJdGVt SWZOZWVkZWQoZmxleEl0ZW0pOwogCiAgICAgLy8gOS4yLjMgQS4KICAgICBpZiAoZmxleEl0ZW1N YWluU2l6ZUlzRGVmaW5pdGUoZmxleEl0ZW0sIGZsZXhCYXNpcykpCkBAIC0xNjIyLDEwICsxNjIy LDExIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnBlcmZvcm1GbGV4TGF5b3V0KFJlbGF5b3V0 Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAgICAgICAgICBmbGV4SXRlbS0+Y2xl YXJUcmltbWVkTWFyZ2luc01hcmtpbmdzKCk7CiAgICAgICAgICAgICBpZiAoZmxleEl0ZW0tPnNo b3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKICAgICAgICAgICAgICAgICBmbGV4SXRl bS0+c2V0TmVlZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2aW9yOjpNYXJrT25s eVRoaXMpOworICAgICAgICAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91 dChyZWxheW91dENoaWxkcmVuLCAqZmxleEl0ZW0pOwogICAgICAgICAgICAgcmV0dXJuIGV2ZXJI YWRMYXlvdXQ7CiAgICAgICAgIH07CiAgICAgICAgIGF1dG8gZXZlckhhZExheW91dCA9IHByZXBh cmVGbGV4SXRlbSgpOwotICAgICAgICBhbGxJdGVtcy5hcHBlbmQoeyAqZmxleEl0ZW0sIGZsZXhC YXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUoKmZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKSwg ZXZlckhhZExheW91dCB9KTsKKyAgICAgICAgYWxsSXRlbXMuYXBwZW5kKHsgKmZsZXhJdGVtLCBm bGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplKCpmbGV4SXRlbSksIGV2ZXJIYWRMYXlvdXQg fSk7CiAgICAgICAgIC8vIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUgbWlnaHQgc2V0 IHRoZSBvdmVycmlkZSBjb250YWluaW5nIGJsb2NrIGhlaWdodCBzbyBhbnkgdmFsdWUgY2FjaGVk IGZvciBkZWZpbml0ZW5lc3MgbWlnaHQgYmUgaW5jb3JyZWN0LgogICAgICAgICByZXNldEhhc0Rl ZmluaXRlSGVpZ2h0KCk7CiAgICAgfQpAQCAtMjEwOSwxNyArMjExMCwxMSBAQCBMYXlvdXRVbml0 IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RGbGV4SXRlbVNpemVGb3JBc3BlY3RSYXRpb0Nyb3Nz QXhpc01pbkFuZE1heAogICAgIHJldHVybiBmbGV4SXRlbVNpemU7CiB9CiAKLXZvaWQgUmVuZGVy RmxleGlibGVCb3g6OmVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRl ZChSZW5kZXJCb3gmIGZsZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4p Cit2b2lkIFJlbmRlckZsZXhpYmxlQm94OjplbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZs ZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAoIWZsZXhCYXNl U2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNpemUoZmxleEl0ZW0pKQogICAgICAgICByZXR1cm47 CiAKLSAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBpcyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhp c0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAotICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJdGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQo KSwKLSAgICAvLyBzbyBpZiB0aGUgY2hpbGQgaGFzIGludHJpbnNpYyBtaW4vbWF4L3ByZWZlcnJl ZCBzaXplLCBydW4gbGF5b3V0IG9uIGl0IG5vdyB0byBtYWtlIHN1cmUKLSAgICAvLyBpdHMgbG9n aWNhbCBoZWlnaHQgYW5kIHNjcm9sbCBiYXJzIGFyZSB1cCB0byBkYXRlLgotICAgIHVwZGF0ZUJs b2NrQ2hpbGREaXJ0eUJpdHNCZWZvcmVMYXlvdXQocmVsYXlvdXRDaGlsZHJlbiwgZmxleEl0ZW0p OwotCiAgICAgaWYgKCFmbGV4SXRlbS5uZWVkc0xheW91dCgpICYmIG1fYmxvY2tBeGlzU2l6ZS5j b250YWlucyhmbGV4SXRlbSkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMjEzOCwxMiArMjEzMywx MiBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjplbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZv ckZsZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94JgogICAgIH0oKTsKIAogICAgIG1fYmxvY2tBeGlz U2l6ZS5zZXQoZmxleEl0ZW0sIGlubmVyU2l6ZSk7Ci0gICAgbV9yZWxhaWRPdXRGbGV4SXRlbXMu YWRkKGZsZXhJdGVtKTsKKyAgICBtX2ZsZXhJdGVtc1dpdGhDb21wbGV0ZWRMYXlvdXQuYWRkKGZs ZXhJdGVtKTsKIH0KIAotUmVuZGVyRmxleGlibGVCb3g6OkZsZXhCYXNlQW5kSHlwb3RoZXRpY2Fs TWFpblNpemUgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNp emUoUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVu KQorUmVuZGVyRmxleGlibGVCb3g6OkZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUgUmVu ZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUoUmVuZGVyQm94 JiBmbGV4SXRlbSkKIHsKLSAgICBhdXRvIGZsZXhCYXNlQ29udGVudFNpemUgPSBmbGV4QmFzZVNp emVGb3JGbGV4SXRlbShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbik7CisgICAgYXV0byBmbGV4 QmFzZUNvbnRlbnRTaXplID0gZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oZmxleEl0ZW0pOwogICAg IGF1dG8gbWluTWF4TWFpblNpemVzID0gY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFpblNpemVzKGZs ZXhJdGVtKTsKICAgICByZXR1cm4geyBmbGV4QmFzZUNvbnRlbnRTaXplLCBzdGQ6Om1heChtaW5N YXhNYWluU2l6ZXMuZmlyc3QsIHN0ZDo6bWluKGZsZXhCYXNlQ29udGVudFNpemUsIG1pbk1heE1h aW5TaXplcy5zZWNvbmQpKSwgbWluTWF4TWFpblNpemVzIH07CiB9CkBAIC0yNzMzLDcgKzI3Mjgs NyBAQCBSZW5kZXJGbGV4aWJsZUJveDo6RmxleExpbmVSZXN1bHQgUmVuZGVyRmxleGlibGVCb3g6 OmxheW91dEFuZFBsYWNlRmxleEl0ZW1zKExheQogICAgICAgICB9CiAgICAgICAgIC8vIFdlIG1h eSBoYXZlIGFscmVhZHkgZm9yY2VkIHJlbGF5b3V0IGZvciBvcnRob2dvbmFsIGZsb3dpbmcgY2hp bGRyZW4gaW4KICAgICAgICAgLy8gY29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yRmxleEl0ZW0u Ci0gICAgICAgIGJvb2wgZm9yY2VGbGV4SXRlbVJlbGF5b3V0ID0gcmVsYXlvdXRDaGlsZHJlbiA9 PSBSZWxheW91dENoaWxkcmVuOjpZZXMgJiYgIW1fcmVsYWlkT3V0RmxleEl0ZW1zLmNvbnRhaW5z KGZsZXhJdGVtKTsKKyAgICAgICAgYm9vbCBmb3JjZUZsZXhJdGVtUmVsYXlvdXQgPSByZWxheW91 dENoaWxkcmVuID09IFJlbGF5b3V0Q2hpbGRyZW46OlllcyAmJiAhbV9mbGV4SXRlbXNXaXRoQ29t cGxldGVkTGF5b3V0LmNvbnRhaW5zKGZsZXhJdGVtKTsKICAgICAgICAgaWYgKCFmb3JjZUZsZXhJ dGVtUmVsYXlvdXQgJiYgZmxleEl0ZW1IYXNQZXJjZW50SGVpZ2h0RGVzY2VuZGFudHMoZmxleEl0 ZW0pKSB7CiAgICAgICAgICAgICAvLyBIYXZlIHRvIGZvcmNlIGFub3RoZXIgcmVsYXlvdXQgZXZl biB0aG91Z2ggdGhlIGNoaWxkIGlzIHNpemVkCiAgICAgICAgICAgICAvLyBjb3JyZWN0bHksIGJl Y2F1c2UgaXRzIGRlc2NlbmRhbnRzIGFyZSBub3Qgc2l6ZWQgY29ycmVjdGx5IHlldC4gT3VyCkBA IC0yNzQ1LDcgKzI3NDAsNyBAQCBSZW5kZXJGbGV4aWJsZUJveDo6RmxleExpbmVSZXN1bHQgUmVu ZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNlRmxleEl0ZW1zKExheQogICAgICAgICBpZiAo IWZsZXhJdGVtLm5lZWRzTGF5b3V0KCkpCiAgICAgICAgICAgICBmbGV4SXRlbS5tYXJrRm9yUGFn aW5hdGlvblJlbGF5b3V0SWZOZWVkZWQoKTsKICAgICAgICAgaWYgKGZsZXhJdGVtLm5lZWRzTGF5 b3V0KCkpCi0gICAgICAgICAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5hZGQoZmxleEl0ZW0pOwor ICAgICAgICAgICAgbV9mbGV4SXRlbXNXaXRoQ29tcGxldGVkTGF5b3V0LmFkZChmbGV4SXRlbSk7 CiAgICAgICAgIHsKICAgICAgICAgICAgIGF1dG8gZmxleExheW91dFNjb3BlID0gU2V0Rm9yU2Nv cGUobV9hZnRlck1haW5BeGlzSXRlbVNpemluZywgdHJ1ZSk7CiAgICAgICAgICAgICBmbGV4SXRl bS5sYXlvdXRJZk5lZWRlZCgpOwpAQCAtMzA4Miw3ICszMDc3LDcgQEAgdm9pZCBSZW5kZXJGbGV4 aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9GbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJ dGVtLCBMYXkKIAogICAgICAgICAvLyBGSVhNRTogQ2FuIGF2b2lkIGxheWluZyBvdXQgaGVyZSBp biBzb21lIGNhc2VzLiBTZWUgaHR0cHM6Ly93ZWJraXQub3JnL2IvODc5MDUuCiAgICAgICAgIGJv b2wgZmxleEl0ZW1OZWVkc1JlbGF5b3V0ID0gZGVzaXJlZExvZ2ljYWxIZWlnaHQgIT0gZmxleEl0 ZW0ubG9naWNhbEhlaWdodCgpOwotICAgICAgICBpZiAoIWZsZXhJdGVtTmVlZHNSZWxheW91dCAm JiBtX3JlbGFpZE91dEZsZXhJdGVtcy5jb250YWlucyhmbGV4SXRlbSkgJiYgZmxleEl0ZW1IYXNQ ZXJjZW50SGVpZ2h0RGVzY2VuZGFudHMoZmxleEl0ZW0pKSB7CisgICAgICAgIGlmICghZmxleEl0 ZW1OZWVkc1JlbGF5b3V0ICYmIG1fZmxleEl0ZW1zV2l0aENvbXBsZXRlZExheW91dC5jb250YWlu cyhmbGV4SXRlbSkgJiYgZmxleEl0ZW1IYXNQZXJjZW50SGVpZ2h0RGVzY2VuZGFudHMoZmxleEl0 ZW0pKSB7CiAgICAgICAgICAgICAvLyBIYXZlIHRvIGZvcmNlIGFub3RoZXIgcmVsYXlvdXQgZXZl biB0aG91Z2ggdGhlIGNoaWxkIGlzIHNpemVkCiAgICAgICAgICAgICAvLyBjb3JyZWN0bHksIGJl Y2F1c2UgaXRzIGRlc2NlbmRhbnRzIGFyZSBub3Qgc2l6ZWQgY29ycmVjdGx5IHlldC4gT3VyCiAg ICAgICAgICAgICAvLyBwcmV2aW91cyBsYXlvdXQgb2YgdGhlIGNoaWxkIHdhcyBkb25lIHdpdGhv dXQgYW4gb3ZlcnJpZGUgaGVpZ2h0IHNldC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmgKaW5kZXggMTM3OTYyODYwNTU0Li43ZmFhNTRjNDZmZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC0yMTUsOCAr MjE1LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVDaGlsZEludHJpbnNpY0xvZ2ljYWxX aWR0aHMoUmVuZGVyQm94JiwgTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0 JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHRlbXBsYXRlPHR5cGVuYW1l IFNpemVUeXBlPiBMYXlvdXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5n KGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9zc1NpemVMZW5n dGgpIGNvbnN0OwogICAgIHZvaWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JGbGV4 SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwotICAgIExheW91 dFVuaXQgZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlv dXRDaGlsZHJlbik7Ci0gICAgdm9pZCBlbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJ dGVtSWZOZWVkZWQoUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbik7CisgICAg TGF5b3V0VW5pdCBmbGV4QmFzZVNpemVGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtKTsK KyAgICB2b2lkIGVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRlZChS ZW5kZXJCb3gmIGZsZXhJdGVtKTsKICAgICB2b2lkIE5PREVMRVRFIGFkanVzdEFsaWdubWVudEZv ckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQpOwogICAgIGlubGluZSBP dmVyZmxvd0FsaWdubWVudCBvdmVyZmxvd0FsaWdubWVudEZvckZsZXhJdGVtKGNvbnN0IFJlbmRl ckJveCYgZmxleEl0ZW0pIGNvbnN0OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBi b29sIGNhbkNvbXB1dGVQZXJjZW50YWdlRmxleEJhc2lzKGNvbnN0IFJlbmRlckJveCYgZmxleEl0 ZW0sIGNvbnN0IFNpemVUeXBlJiwgVXBkYXRlUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnRzKTsK QEAgLTI3NCw3ICsyNzQsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRO b25BdXRvTWluTWFpblNpemUoUmVuZGVyQm94JiBmbGV4SXRlbSwgY29uc3QgU3R5bGU6Ok1pbmlt dW1TaXplJik7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlQ29udGVudEJhc2VkTWluTWFpblNpemUo UmVuZGVyQm94JiBmbGV4SXRlbSwgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtYXhFeHRlbnQp OwogICAgIExheW91dFVuaXQgYWRqdXN0RmxleEl0ZW1TaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4 aXNNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSwgTGF5b3V0VW5pdCBmbGV4SXRl bVNpemUpOwotICAgIEZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUgZmxleEJhc2VBbmRI eXBvdGhldGljYWxNYWluU2l6ZShSZW5kZXJCb3gmLCBSZWxheW91dENoaWxkcmVuKTsKKyAgICBG bGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFp blNpemUoUmVuZGVyQm94Jik7CiAgICAgCiAgICAgdm9pZCBmcmVlemVJbmZsZXhpYmxlSXRlbXMo RmxleFNpZ24sIEZsZXhMYXlvdXRJdGVtcyYsIExheW91dFVuaXQmIHJlbWFpbmluZ0ZyZWVTcGFj ZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93LCBkb3VibGUmIHRvdGFsRmxleFNocmluaywgZG91Ymxl JiB0b3RhbFdlaWdodGVkRmxleFNocmluayk7CiAgICAgYm9vbCByZXNvbHZlRmxleGlibGVMZW5n dGhzKEZsZXhTaWduLCBGbGV4TGF5b3V0SXRlbXMmLCBMYXlvdXRVbml0IGluaXRpYWxGcmVlU3Bh Y2UsIExheW91dFVuaXQmIHJlbWFpbmluZ0ZyZWVTcGFjZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93 LCBkb3VibGUmIHRvdGFsRmxleFNocmluaywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmlu ayk7CkBAIC0zMjUsNyArMzI1LDcgQEAgcHJpdmF0ZToKICAgICAvLyBuZWVkIGFuIGFkZGl0aW9u YWwgbGF5b3V0IHBhc3MgZm9yIGNvcnJlY3Qgc3RyZXRjaCBhbGlnbm1lbnQgaGFuZGxpbmcsIGFz CiAgICAgLy8gdGhlIGZpcnN0IGxheW91dCBsaWtlbHkgZGlkIG5vdCB1c2UgdGhlIGNvcnJlY3Qg dmFsdWUgZm9yIHBlcmNlbnRhZ2UKICAgICAvLyBzaXppbmcgb2YgY2hpbGRyZW4uCi0gICAgU2lu Z2xlVGhyZWFkV2Vha0hhc2hTZXQ8Y29uc3QgUmVuZGVyQm94PiBtX3JlbGFpZE91dEZsZXhJdGVt czsKKyAgICBTaW5nbGVUaHJlYWRXZWFrSGFzaFNldDxjb25zdCBSZW5kZXJCb3g+IG1fZmxleEl0 ZW1zV2l0aENvbXBsZXRlZExheW91dDsKIAogICAgIG11dGFibGUgT3JkZXJJdGVyYXRvciBtX29y ZGVySXRlcmF0b3IgeyAqdGhpcyB9OwogICAgIHNpemVfdCBtX251bWJlck9mRmxleEl0ZW1zT25G aXJzdExpbmUgeyAwIH07Cg== 479818 2026-05-25 10:02:34 -0700 2026-05-25 11:58:30 -0700 [fast-cq]Patch bug-315457-20260525100233.patch text/plain 11530 zalan RnJvbSAxMDQ2NGY3ODEyZjdlOWNmOWUzOWMyMGE2MDA4ZTQyMDRkYjFjMjFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjQgTWF5IDIwMjYgMDY6MzE6MjcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gTW92ZSBkaXJ0eS1iaXQgdXBkYXRlIG91dCBvZiBmbGV4IGJhc2Ugc2l6ZSBwYXRoCiBhbmQg cmVuYW1lIG1fcmVsYWlkT3V0RmxleEl0ZW1zCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE1NDU3CgpSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KCmVuc3VyZUJs b2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRlZCBjYWxsZWQgdXBkYXRlQmxvY2tD aGlsZERpcnR5LQpCaXRzQmVmb3JlTGF5b3V0IGFzIHBhcnQgb2YgaXRzIHByZWFtYmxlLCB3aGlj aCB3YXMgdGhlIG9ubHkgcmVhc29uIGl0IHRvb2sKYSBSZWxheW91dENoaWxkcmVuIHBhcmFtZXRl ci4gVGhlIG1hcmtpbmcgaXQgcGVyZm9ybXMgKG1hcmsgbmVlZHMtbGF5b3V0IGlmCnJlbGF5b3V0 Q2hpbGRyZW4gaXMgWWVzIG9yIHRoZSBjaGlsZCBoYXMgYSByZWxhdGl2ZSBoZWlnaHQpIGlzIG5v dCBzcGVjaWZpYwp0byBmbGV4IGJhc2Ugc2l6ZSBjb21wdXRhdGlvbiAtIGl0IGlzIHBlci1pdGVt IGJvb2trZWVwaW5nIHRoYXQgdGhlIGZsZXgKbGF5b3V0J3Mgc2V0dXAgbG9vcCB3YW50cyB0byBk byByZWdhcmRsZXNzIG9mIHdoaWNoIGdhdGUgdGhlIGl0ZW0gZmFsbHMgb24uCgpNb3ZlZCB0aGUg dXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91dCBjYWxsIGludG8gcHJlcGFyZUZs ZXhJdGVtLAp0aGUgbGFtYmRhIGluc2lkZSBwZXJmb3JtRmxleExheW91dCB0aGF0IGFscmVhZHkg Z2F0aGVycyBwZXItaXRlbQpwcmVwYXJhdGlvbiB3b3JrLiBUaGUgY2FzY2FkaW5nIGNvbnNlcXVl bmNlIGRyb3BzIFJlbGF5b3V0Q2hpbGRyZW4gZnJvbQp0aHJlZSBzaWduYXR1cmVzIHRoYXQgd2Vy ZSBvbmx5IGZvcndhcmRpbmcgaXQ6IGVuc3VyZUJsb2NrQXhpc0NvbnRlbnQtClNpemVGb3JGbGV4 SXRlbUlmTmVlZGVkLCBmbGV4QmFzZVNpemVGb3JGbGV4SXRlbSwgYW5kIGZsZXhCYXNlQW5kSHlw b3RoZXRpY2FsLQpNYWluU2l6ZS4KClRoZSBtYXJraW5nIG5vdyBmaXJlcyBmb3IgZXZlcnkgaW4t ZmxvdyBmbGV4IGl0ZW0gaW5zdGVhZCBvZiBvbmx5IHRob3NlCndoZXJlIGZsZXhCYXNlU2l6ZU5l ZWRzQmxvY2tBeGlzQ29udGVudFNpemUgcmV0dXJucyB0cnVlLiBUaGlzIGlzIGZ1bmN0aW9uYWxs eQphIG5vLW9wOiBpdGVtcyBwcmV2aW91c2x5IHVubWFya2VkIGF0IHRoaXMgc3RhZ2Ugd291bGQg YmUgbWFya2VkIGFueXdheSBieQp1cGRhdGVGbGV4SXRlbURpcnR5Qml0c0JlZm9yZUxheW91dCBp biBsYXlvdXRBbmRQbGFjZUZsZXhJdGVtcyBiZWZvcmUKbGF5b3V0SWZOZWVkZWQgZmlyZXMsIHNv IHRoZSBkaXJ0eS1iaXQgc3RhdGUgYXQgdGhlIGFjdHVhbCBsYXlvdXQgY2FsbCBpcwp1bmNoYW5n ZWQuCgpBbHNvIHJlbmFtZWQgdGhlIGNhY2hlIGZpZWxkIG1fcmVsYWlkT3V0RmxleEl0ZW1zIHRv IG1fZmxleEl0ZW1zV2l0aC0KQ29tcGxldGVkTGF5b3V0LiBUaGUgb2xkIG5hbWUgcmVhZCBhcyBh IHBhc3QgcGFydGljaXBsZSBvZiAicmUtbGF5LW91dCIsCndoaWNoIGlzIGF3a3dhcmQgYW5kIGRv ZXNuJ3QgY2FwdHVyZSB3aGF0IHRoZSBzZXQgdHJhY2tzOiBmbGV4IGl0ZW1zIHdob3NlCmxheW91 dCBoYXMgYmVlbiBjb21wbGV0ZWQgZHVyaW5nIHRoZSBjdXJyZW50IGxheW91dCBpbnZvY2F0aW9u LCB1c2VkIHRvCnNraXAgZHVwbGljYXRlIHdvcmsgaW4gdGhlIGZsZXggYWxnb3JpdGhtLgoKTm8g YmVoYXZpb3IgY2hhbmdlLgoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwOgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKToKKFdl YkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpwZXJmb3JtRmxleExheW91dCk6CihXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplRm9yRmxleEl0ZW0pOgooV2ViQ29yZTo6UmVu ZGVyRmxleGlibGVCb3g6OmVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5l ZWRlZCk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VBbmRIeXBvdGhldGlj YWxNYWluU2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5kUGxhY2VG bGV4SXRlbXMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o OgotLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgICB8IDI5 ICsrKysrKysrLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5oICB8ICA4ICsrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyks IDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCmluZGV4IGY1YjQ0NmEwZjY3MS4uMGY0YTUwNThjZTg3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTQ4Niw3ICs0 ODYsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayhSZWxheW91dENoaWxk cmVuIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaQogICAgIExheW91dFJlcGFpbnRlciByZXBh aW50ZXIoKnRoaXMpOwogCiAgICAgcmVzZXRMb2dpY2FsSGVpZ2h0QmVmb3JlTGF5b3V0SWZOZWVk ZWQoKTsKLSAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5jbGVhcigpOworICAgIG1fZmxleEl0ZW1z V2l0aENvbXBsZXRlZExheW91dC5jbGVhcigpOwogICAgIAogICAgIGJvb2wgb2xkSW5MYXlvdXQg PSBtX2luTGF5b3V0OwogICAgIG1faW5MYXlvdXQgPSB0cnVlOwpAQCAtMTU1OCwxNCArMTU1OCwx NCBAQCBwcml2YXRlOgogfTsKIAogLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4 Ym94LyNhbGdvLW1haW4taXRlbQotTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJh c2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiBy ZWxheW91dENoaWxkcmVuKQorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VT aXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBhdXRvIGZsZXhCYXNp cyA9IGZsZXhCYXNpc0ZvckZsZXhJdGVtKGZsZXhJdGVtKTsKICAgICBTY29wZWRGbGV4QmFzaXNB c0ZsZXhJdGVtTWFpblNpemUgc2NvcGVkKGZsZXhJdGVtLCBmbGV4QmFzaXMudHJ5UHJlZmVycmVk U2l6ZSgpLnZhbHVlX29yKFN0eWxlOjpQcmVmZXJyZWRTaXplIHsgQ1NTOjpLZXl3b3JkOjpNYXhD b250ZW50IHsgfSB9KSwgbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpOwog ICAgIC8vIEZJWE1FOiBXaGlsZSB3ZSBhcmUgc3VwcG9zZWQgdG8gaWdub3JlIG1pbi9tYXggaGVy ZSwgdGhlIGNhY2hlZAogICAgIC8vIG1fYmxvY2tBeGlzU2l6ZSBlbnRyeSBtYXkgaG9sZCBhIG1p bi9tYXgtY29uc3RyYWluZWQgc2l6ZS4KICAgICBTZXRGb3JTY29wZTxib29sPiBjb21wdXRpbmdC YXNlU2l6ZXNTY29wZShtX2lzQ29tcHV0aW5nRmxleEJhc2VTaXplcywgdHJ1ZSk7Ci0gICAgZW5z dXJlQmxvY2tBeGlzQ29udGVudFNpemVGb3JGbGV4SXRlbUlmTmVlZGVkKGZsZXhJdGVtLCByZWxh eW91dENoaWxkcmVuKTsKKyAgICBlbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJdGVt SWZOZWVkZWQoZmxleEl0ZW0pOwogCiAgICAgLy8gOS4yLjMgQS4KICAgICBpZiAoZmxleEl0ZW1N YWluU2l6ZUlzRGVmaW5pdGUoZmxleEl0ZW0sIGZsZXhCYXNpcykpCkBAIC0xNjE5LDEwICsxNjE5 LDExIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnBlcmZvcm1GbGV4TGF5b3V0KFJlbGF5b3V0 Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAgICAgICAgICBmbGV4SXRlbS0+Y2xl YXJUcmltbWVkTWFyZ2luc01hcmtpbmdzKCk7CiAgICAgICAgICAgICBpZiAoZmxleEl0ZW0tPnNo b3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKICAgICAgICAgICAgICAgICBmbGV4SXRl bS0+c2V0TmVlZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2aW9yOjpNYXJrT25s eVRoaXMpOworICAgICAgICAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91 dChyZWxheW91dENoaWxkcmVuLCAqZmxleEl0ZW0pOwogICAgICAgICAgICAgcmV0dXJuIGV2ZXJI YWRMYXlvdXQ7CiAgICAgICAgIH07CiAgICAgICAgIGF1dG8gZXZlckhhZExheW91dCA9IHByZXBh cmVGbGV4SXRlbSgpOwotICAgICAgICBhbGxJdGVtcy5hcHBlbmQoeyAqZmxleEl0ZW0sIGZsZXhC YXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUoKmZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKSwg ZXZlckhhZExheW91dCB9KTsKKyAgICAgICAgYWxsSXRlbXMuYXBwZW5kKHsgKmZsZXhJdGVtLCBm bGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplKCpmbGV4SXRlbSksIGV2ZXJIYWRMYXlvdXQg fSk7CiAgICAgICAgIC8vIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUgbWlnaHQgc2V0 IHRoZSBvdmVycmlkZSBjb250YWluaW5nIGJsb2NrIGhlaWdodCBzbyBhbnkgdmFsdWUgY2FjaGVk IGZvciBkZWZpbml0ZW5lc3MgbWlnaHQgYmUgaW5jb3JyZWN0LgogICAgICAgICByZXNldEhhc0Rl ZmluaXRlSGVpZ2h0KCk7CiAgICAgfQpAQCAtMjEwNiwxNyArMjEwNywxMSBAQCBMYXlvdXRVbml0 IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RGbGV4SXRlbVNpemVGb3JBc3BlY3RSYXRpb0Nyb3Nz QXhpc01pbkFuZE1heAogICAgIHJldHVybiBmbGV4SXRlbVNpemU7CiB9CiAKLXZvaWQgUmVuZGVy RmxleGlibGVCb3g6OmVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRl ZChSZW5kZXJCb3gmIGZsZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4p Cit2b2lkIFJlbmRlckZsZXhpYmxlQm94OjplbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZs ZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAoIWZsZXhCYXNl U2l6ZU5lZWRzQmxvY2tBeGlzQ29udGVudFNpemUoZmxleEl0ZW0pKQogICAgICAgICByZXR1cm47 CiAKLSAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBpcyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhp c0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAotICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJdGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQo KSwKLSAgICAvLyBzbyBpZiB0aGUgY2hpbGQgaGFzIGludHJpbnNpYyBtaW4vbWF4L3ByZWZlcnJl ZCBzaXplLCBydW4gbGF5b3V0IG9uIGl0IG5vdyB0byBtYWtlIHN1cmUKLSAgICAvLyBpdHMgbG9n aWNhbCBoZWlnaHQgYW5kIHNjcm9sbCBiYXJzIGFyZSB1cCB0byBkYXRlLgotICAgIHVwZGF0ZUJs b2NrQ2hpbGREaXJ0eUJpdHNCZWZvcmVMYXlvdXQocmVsYXlvdXRDaGlsZHJlbiwgZmxleEl0ZW0p OwotCiAgICAgaWYgKCFmbGV4SXRlbS5uZWVkc0xheW91dCgpICYmIG1fYmxvY2tBeGlzU2l6ZS5j b250YWlucyhmbGV4SXRlbSkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMjEzNSwxMiArMjEzMCwx MiBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjplbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZv ckZsZXhJdGVtSWZOZWVkZWQoUmVuZGVyQm94JgogICAgIH0oKTsKIAogICAgIG1fYmxvY2tBeGlz U2l6ZS5zZXQoZmxleEl0ZW0sIGlubmVyU2l6ZSk7Ci0gICAgbV9yZWxhaWRPdXRGbGV4SXRlbXMu YWRkKGZsZXhJdGVtKTsKKyAgICBtX2ZsZXhJdGVtc1dpdGhDb21wbGV0ZWRMYXlvdXQuYWRkKGZs ZXhJdGVtKTsKIH0KIAotUmVuZGVyRmxleGlibGVCb3g6OkZsZXhCYXNlQW5kSHlwb3RoZXRpY2Fs TWFpblNpemUgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNp emUoUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVu KQorUmVuZGVyRmxleGlibGVCb3g6OkZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUgUmVu ZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUoUmVuZGVyQm94 JiBmbGV4SXRlbSkKIHsKLSAgICBhdXRvIGZsZXhCYXNlQ29udGVudFNpemUgPSBmbGV4QmFzZVNp emVGb3JGbGV4SXRlbShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbik7CisgICAgYXV0byBmbGV4 QmFzZUNvbnRlbnRTaXplID0gZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oZmxleEl0ZW0pOwogICAg IGF1dG8gbWluTWF4TWFpblNpemVzID0gY29tcHV0ZUZsZXhJdGVtTWluTWF4TWFpblNpemVzKGZs ZXhJdGVtKTsKICAgICByZXR1cm4geyBmbGV4QmFzZUNvbnRlbnRTaXplLCBzdGQ6Om1heChtaW5N YXhNYWluU2l6ZXMuZmlyc3QsIHN0ZDo6bWluKGZsZXhCYXNlQ29udGVudFNpemUsIG1pbk1heE1h aW5TaXplcy5zZWNvbmQpKSwgbWluTWF4TWFpblNpemVzIH07CiB9CkBAIC0yNzMwLDcgKzI3MjUs NyBAQCBSZW5kZXJGbGV4aWJsZUJveDo6RmxleExpbmVSZXN1bHQgUmVuZGVyRmxleGlibGVCb3g6 OmxheW91dEFuZFBsYWNlRmxleEl0ZW1zKExheQogICAgICAgICB9CiAgICAgICAgIC8vIFdlIG1h eSBoYXZlIGFscmVhZHkgZm9yY2VkIHJlbGF5b3V0IGZvciBvcnRob2dvbmFsIGZsb3dpbmcgY2hp bGRyZW4gaW4KICAgICAgICAgLy8gY29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yRmxleEl0ZW0u Ci0gICAgICAgIGJvb2wgZm9yY2VGbGV4SXRlbVJlbGF5b3V0ID0gcmVsYXlvdXRDaGlsZHJlbiA9 PSBSZWxheW91dENoaWxkcmVuOjpZZXMgJiYgIW1fcmVsYWlkT3V0RmxleEl0ZW1zLmNvbnRhaW5z KGZsZXhJdGVtKTsKKyAgICAgICAgYm9vbCBmb3JjZUZsZXhJdGVtUmVsYXlvdXQgPSByZWxheW91 dENoaWxkcmVuID09IFJlbGF5b3V0Q2hpbGRyZW46OlllcyAmJiAhbV9mbGV4SXRlbXNXaXRoQ29t cGxldGVkTGF5b3V0LmNvbnRhaW5zKGZsZXhJdGVtKTsKICAgICAgICAgaWYgKCFmb3JjZUZsZXhJ dGVtUmVsYXlvdXQgJiYgZmxleEl0ZW1IYXNQZXJjZW50SGVpZ2h0RGVzY2VuZGFudHMoZmxleEl0 ZW0pKSB7CiAgICAgICAgICAgICAvLyBIYXZlIHRvIGZvcmNlIGFub3RoZXIgcmVsYXlvdXQgZXZl biB0aG91Z2ggdGhlIGNoaWxkIGlzIHNpemVkCiAgICAgICAgICAgICAvLyBjb3JyZWN0bHksIGJl Y2F1c2UgaXRzIGRlc2NlbmRhbnRzIGFyZSBub3Qgc2l6ZWQgY29ycmVjdGx5IHlldC4gT3VyCkBA IC0yNzQyLDcgKzI3MzcsNyBAQCBSZW5kZXJGbGV4aWJsZUJveDo6RmxleExpbmVSZXN1bHQgUmVu ZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNlRmxleEl0ZW1zKExheQogICAgICAgICBpZiAo IWZsZXhJdGVtLm5lZWRzTGF5b3V0KCkpCiAgICAgICAgICAgICBmbGV4SXRlbS5tYXJrRm9yUGFn aW5hdGlvblJlbGF5b3V0SWZOZWVkZWQoKTsKICAgICAgICAgaWYgKGZsZXhJdGVtLm5lZWRzTGF5 b3V0KCkpCi0gICAgICAgICAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5hZGQoZmxleEl0ZW0pOwor ICAgICAgICAgICAgbV9mbGV4SXRlbXNXaXRoQ29tcGxldGVkTGF5b3V0LmFkZChmbGV4SXRlbSk7 CiAgICAgICAgIHsKICAgICAgICAgICAgIGF1dG8gZmxleExheW91dFNjb3BlID0gU2V0Rm9yU2Nv cGUobV9hZnRlck1haW5BeGlzSXRlbVNpemluZywgdHJ1ZSk7CiAgICAgICAgICAgICBmbGV4SXRl bS5sYXlvdXRJZk5lZWRlZCgpOwpAQCAtMzA3OSw3ICszMDc0LDcgQEAgdm9pZCBSZW5kZXJGbGV4 aWJsZUJveDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9GbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJ dGVtLCBMYXkKIAogICAgICAgICAvLyBGSVhNRTogQ2FuIGF2b2lkIGxheWluZyBvdXQgaGVyZSBp biBzb21lIGNhc2VzLiBTZWUgaHR0cHM6Ly93ZWJraXQub3JnL2IvODc5MDUuCiAgICAgICAgIGJv b2wgZmxleEl0ZW1OZWVkc1JlbGF5b3V0ID0gZGVzaXJlZExvZ2ljYWxIZWlnaHQgIT0gZmxleEl0 ZW0ubG9naWNhbEhlaWdodCgpOwotICAgICAgICBpZiAoIWZsZXhJdGVtTmVlZHNSZWxheW91dCAm JiBtX3JlbGFpZE91dEZsZXhJdGVtcy5jb250YWlucyhmbGV4SXRlbSkgJiYgZmxleEl0ZW1IYXNQ ZXJjZW50SGVpZ2h0RGVzY2VuZGFudHMoZmxleEl0ZW0pKSB7CisgICAgICAgIGlmICghZmxleEl0 ZW1OZWVkc1JlbGF5b3V0ICYmIG1fZmxleEl0ZW1zV2l0aENvbXBsZXRlZExheW91dC5jb250YWlu cyhmbGV4SXRlbSkgJiYgZmxleEl0ZW1IYXNQZXJjZW50SGVpZ2h0RGVzY2VuZGFudHMoZmxleEl0 ZW0pKSB7CiAgICAgICAgICAgICAvLyBIYXZlIHRvIGZvcmNlIGFub3RoZXIgcmVsYXlvdXQgZXZl biB0aG91Z2ggdGhlIGNoaWxkIGlzIHNpemVkCiAgICAgICAgICAgICAvLyBjb3JyZWN0bHksIGJl Y2F1c2UgaXRzIGRlc2NlbmRhbnRzIGFyZSBub3Qgc2l6ZWQgY29ycmVjdGx5IHlldC4gT3VyCiAg ICAgICAgICAgICAvLyBwcmV2aW91cyBsYXlvdXQgb2YgdGhlIGNoaWxkIHdhcyBkb25lIHdpdGhv dXQgYW4gb3ZlcnJpZGUgaGVpZ2h0IHNldC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmgKaW5kZXggMTM3OTYyODYwNTU0Li43ZmFhNTRjNDZmZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC0yMTUsOCAr MjE1LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVDaGlsZEludHJpbnNpY0xvZ2ljYWxX aWR0aHMoUmVuZGVyQm94JiwgTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0 JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHRlbXBsYXRlPHR5cGVuYW1l IFNpemVUeXBlPiBMYXlvdXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5n KGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9zc1NpemVMZW5n dGgpIGNvbnN0OwogICAgIHZvaWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JGbGV4 SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwotICAgIExheW91 dFVuaXQgZmxleEJhc2VTaXplRm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlv dXRDaGlsZHJlbik7Ci0gICAgdm9pZCBlbnN1cmVCbG9ja0F4aXNDb250ZW50U2l6ZUZvckZsZXhJ dGVtSWZOZWVkZWQoUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbik7CisgICAg TGF5b3V0VW5pdCBmbGV4QmFzZVNpemVGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtKTsK KyAgICB2b2lkIGVuc3VyZUJsb2NrQXhpc0NvbnRlbnRTaXplRm9yRmxleEl0ZW1JZk5lZWRlZChS ZW5kZXJCb3gmIGZsZXhJdGVtKTsKICAgICB2b2lkIE5PREVMRVRFIGFkanVzdEFsaWdubWVudEZv ckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQpOwogICAgIGlubGluZSBP dmVyZmxvd0FsaWdubWVudCBvdmVyZmxvd0FsaWdubWVudEZvckZsZXhJdGVtKGNvbnN0IFJlbmRl ckJveCYgZmxleEl0ZW0pIGNvbnN0OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBi b29sIGNhbkNvbXB1dGVQZXJjZW50YWdlRmxleEJhc2lzKGNvbnN0IFJlbmRlckJveCYgZmxleEl0 ZW0sIGNvbnN0IFNpemVUeXBlJiwgVXBkYXRlUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnRzKTsK QEAgLTI3NCw3ICsyNzQsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRO b25BdXRvTWluTWFpblNpemUoUmVuZGVyQm94JiBmbGV4SXRlbSwgY29uc3QgU3R5bGU6Ok1pbmlt dW1TaXplJik7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlQ29udGVudEJhc2VkTWluTWFpblNpemUo UmVuZGVyQm94JiBmbGV4SXRlbSwgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtYXhFeHRlbnQp OwogICAgIExheW91dFVuaXQgYWRqdXN0RmxleEl0ZW1TaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4 aXNNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSwgTGF5b3V0VW5pdCBmbGV4SXRl bVNpemUpOwotICAgIEZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFpblNpemUgZmxleEJhc2VBbmRI eXBvdGhldGljYWxNYWluU2l6ZShSZW5kZXJCb3gmLCBSZWxheW91dENoaWxkcmVuKTsKKyAgICBG bGV4QmFzZUFuZEh5cG90aGV0aWNhbE1haW5TaXplIGZsZXhCYXNlQW5kSHlwb3RoZXRpY2FsTWFp blNpemUoUmVuZGVyQm94Jik7CiAgICAgCiAgICAgdm9pZCBmcmVlemVJbmZsZXhpYmxlSXRlbXMo RmxleFNpZ24sIEZsZXhMYXlvdXRJdGVtcyYsIExheW91dFVuaXQmIHJlbWFpbmluZ0ZyZWVTcGFj ZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93LCBkb3VibGUmIHRvdGFsRmxleFNocmluaywgZG91Ymxl JiB0b3RhbFdlaWdodGVkRmxleFNocmluayk7CiAgICAgYm9vbCByZXNvbHZlRmxleGlibGVMZW5n dGhzKEZsZXhTaWduLCBGbGV4TGF5b3V0SXRlbXMmLCBMYXlvdXRVbml0IGluaXRpYWxGcmVlU3Bh Y2UsIExheW91dFVuaXQmIHJlbWFpbmluZ0ZyZWVTcGFjZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93 LCBkb3VibGUmIHRvdGFsRmxleFNocmluaywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmlu ayk7CkBAIC0zMjUsNyArMzI1LDcgQEAgcHJpdmF0ZToKICAgICAvLyBuZWVkIGFuIGFkZGl0aW9u YWwgbGF5b3V0IHBhc3MgZm9yIGNvcnJlY3Qgc3RyZXRjaCBhbGlnbm1lbnQgaGFuZGxpbmcsIGFz CiAgICAgLy8gdGhlIGZpcnN0IGxheW91dCBsaWtlbHkgZGlkIG5vdCB1c2UgdGhlIGNvcnJlY3Qg dmFsdWUgZm9yIHBlcmNlbnRhZ2UKICAgICAvLyBzaXppbmcgb2YgY2hpbGRyZW4uCi0gICAgU2lu Z2xlVGhyZWFkV2Vha0hhc2hTZXQ8Y29uc3QgUmVuZGVyQm94PiBtX3JlbGFpZE91dEZsZXhJdGVt czsKKyAgICBTaW5nbGVUaHJlYWRXZWFrSGFzaFNldDxjb25zdCBSZW5kZXJCb3g+IG1fZmxleEl0 ZW1zV2l0aENvbXBsZXRlZExheW91dDsKIAogICAgIG11dGFibGUgT3JkZXJJdGVyYXRvciBtX29y ZGVySXRlcmF0b3IgeyAqdGhpcyB9OwogICAgIHNpemVfdCBtX251bWJlck9mRmxleEl0ZW1zT25G aXJzdExpbmUgeyAwIH07Cg==