315292 2026-05-21 09:17:19 -0700 [cleanup] Replace "intrinsic main size" naming with spec-aligned "block axis size" in RenderFlexibleBox 2026-05-22 07:01: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 2212945 0 zalan 2026-05-21 09:17:19 -0700 ssia 2212948 1 479758 zalan 2026-05-21 09:20:05 -0700 Created attachment 479758 Patch 2212955 2 479759 zalan 2026-05-21 09:26:21 -0700 Created attachment 479759 Patch 2213235 3 479776 zalan 2026-05-22 05:23:30 -0700 Created attachment 479776 [fast-cq]Patch 2213244 4 ews-feeder 2026-05-22 07:00:33 -0700 Committed 313726@main (f447cda155f1): <https://commits.webkit.org/313726@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 479776. 2213245 5 webkit-bug-importer 2026-05-22 07:01:12 -0700 <rdar://problem/177710886> 479758 2026-05-21 09:20:05 -0700 2026-05-21 09:26:19 -0700 Patch bug-315292-20260521092005.patch text/plain 15653 zalan RnJvbSAxNzEyZTBhZTI5OWM2NTY0ODI3ODQ2OTMyMmM4YzQ0NGRmNzdhMTAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMjEgTWF5IDIwMjYgMDk6MTk6MTQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gUmVwbGFjZSAiaW50cmluc2ljIG1haW4gc2l6ZSIgbmFtaW5nIHdpdGgKIHNwZWMtYWxpZ25l ZCAiYmxvY2sgYXhpcyBzaXplIiBpbiBSZW5kZXJGbGV4aWJsZUJveAogaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTI5MgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgpUaGUgZmxleCBiYXNlIHNpemUgcmVzb2x1dGlvbiBjb2RlIGluIFJlbmRlckZsZXhpYmxl Qm94IHVzZWQgImludHJpbnNpYyBtYWluCnNpemUiIGxvb3NlbHkgdG8gbWVhbiAidGhlIHNpemUg eW91IGhhdmUgdG8gbGF5IG91dCBhIGZsZXggaXRlbSB0byBmaW5kIiAtCmNvbmZ1c2luZyBiZWNh dXNlIENTUyBTaXppbmcgMyByZXNlcnZlcyAiaW50cmluc2ljIiBmb3IgdGhlIG1pbi1jb250ZW50 LAptYXgtY29udGVudCwgZml0LWNvbnRlbnQga2V5d29yZHMuIFRoZSByZWxldmFudCBjYXNlIGlz IHNwZWNpZmljYWxseSB3aGVuCm1haW4gYXhpcyBpcyB0aGUgZmxleCBpdGVtJ3MgYmxvY2sgYXhp cyAoY29sdW1uIGZsZXggb3Igb3J0aG9nb25hbCBpdGVtcyksCnNvIHRoZSB2YWx1ZSBpcyBtb3Jl IGhvbmVzdGx5IG5hbWVkIHRoZSBibG9jay1heGlzIHNpemUuCgpSZW5hbWVkIGZsZXhJdGVtSW50 cmluc2ljTWFpblNpemUsIG1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMsIHRoZSBnYXRlCmZs ZXhJdGVtSGFzSW50cmluc2ljTWFpbkF4aXNTaXplLCBhbmQgdGhlIGludmFsaWRhdG9yIGNsZWFy Q2FjaGVkTWFpblNpemVGb3JGbGV4SXRlbQp0byB1c2UgImJsb2NrIGF4aXMgc2l6ZSIgdm9jYWJ1 bGFyeS4gQWxzbyBkcm9wcGVkIHRoZSBjb21wdXRlKiBwcmVmaXggZnJvbQpmbGV4QmFzZVNpemVG b3JGbGV4SXRlbSAoaXQgcmV0dXJucyBhIHZhbHVlLCBubyBvdXQtcGFyYW0pIGFuZCBhbGlnbmVk IHRoZQpjYWNoZSB0byBzdG9yZSB0aGUgc3BlYydzICJpbm5lciIgKGNvbnRlbnQtYm94KSBmbGV4 IGJhc2Ugc2l6ZSBkaXJlY3RseSBzbwp0aGUgY2FsbGVyIG5vIGxvbmdlciBzdWJ0cmFjdHMgYm9y ZGVyK3BhZGRpbmcgYXQgdGhlIHVzZSBzaXRlLiBUaGUgZ2F0ZQptb3ZlZCBmcm9tIGluc2lkZSB0 aGUgZnVuY3Rpb24gdG8gdGhlIGNhbGxlciBzbyB0aGUgcHJlY29uZGl0aW9uIGlzIHZpc2libGUu CgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZWxheW91dFNjb3BlRm9yU2Nyb2xsYmFyQ2hh bmdlLmNwcDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgooV2ViQ29yZTo6UmVu ZGVyRmxleGlibGVCb3g6OmNsZWFyQ2FjaGVkQmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKToKKFdl YkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4QmFzZVNpemVGb3JGbGV4SXRlbSk6CihXZWJD b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKToKKFdlYkNv cmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbU5lZWRzQmxvY2tBeGlzU2l6ZSk6CihXZWJD b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2xlYXJDYWNoZWRNYWluU2l6ZUZvckZsZXhJdGVtKTog RGVsZXRlZC4KKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEJhc2VTaXpl Rm9yRmxleEl0ZW0pOiBEZWxldGVkLgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmZsZXhJ dGVtSW50cmluc2ljTWFpblNpemUpOiBEZWxldGVkLgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVC b3g6OmZsZXhJdGVtSGFzSW50cmluc2ljTWFpbkF4aXNTaXplKTogRGVsZXRlZC4KKiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgotLS0KIC4uLi9SZWxheW91 dFNjb3BlRm9yU2Nyb2xsYmFyQ2hhbmdlLmNwcCAgICAgICB8ICAyICstCiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICAgICAgfCAgMiArLQogLi4uL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCAgIHwgNTMgKysrKysrKysrKy0tLS0tLS0tLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggIHwgMTMgKysrLS0K IC4uLi9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwICB8ICAyICstCiA1 IGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZWxheW91dFNjb3BlRm9yU2Nyb2xsYmFy Q2hhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZWxheW91dFNjb3BlRm9yU2Ny b2xsYmFyQ2hhbmdlLmNwcAppbmRleCBkMmY2NDViYjRkZTUuLjc0MWViYmVmMzY3NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJD aGFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZWxheW91dFNjb3BlRm9y U2Nyb2xsYmFyQ2hhbmdlLmNwcApAQCAtNjgsNyArNjgsNyBAQCBSZWxheW91dFNjb3BlRm9yU2Ny b2xsYmFyQ2hhbmdlOjp+UmVsYXlvdXRTY29wZUZvclNjcm9sbGJhckNoYW5nZSgpCiAgICAgLy8g RklYTUU6IFRoaXMgZG9lcyBub3QgYmVsb25nIGhlcmUuCiAgICAgQ2hlY2tlZFB0ciBwYXJlbnQg PSBtX3JlbmRlckJsb2NrLT5wYXJlbnQoKTsKICAgICBpZiAoQ2hlY2tlZFB0ciBwYXJlbnRGbGV4 aWJsZUJveCA9IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJGbGV4aWJsZUJveD4ocGFyZW50KTsgcGFy ZW50RmxleGlibGVCb3gpCi0gICAgICAgIHBhcmVudEZsZXhpYmxlQm94LT5jbGVhckNhY2hlZE1h aW5TaXplRm9yRmxleEl0ZW0obV9yZW5kZXJCbG9jay5nZXQoKSk7CisgICAgICAgIHBhcmVudEZs ZXhpYmxlQm94LT5jbGVhckNhY2hlZEJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShtX3JlbmRlckJs b2NrLmdldCgpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBkZTFkNmJjYjYwNDkuLjM1OWYwMDQxNWU3NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI3OSw3ICsyNzksNyBAQCB2 b2lkIFJlbmRlckJveDo6c3R5bGVXaWxsQ2hhbmdlKFN0eWxlOjpEaWZmZXJlbmNlIGRpZmYsIGNv bnN0IFJlbmRlclN0eWxlJiBuZXdTdAogICAgICAgICAgICAgICAgIHNldE5lZWRzTGF5b3V0QW5k UHJlZmVycmVkV2lkdGhzVXBkYXRlKCk7CiAgICAgICAgICAgICAgICAgaWYgKENoZWNrZWRQdHIg ZmxleENvbnRhaW5lciA9IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJGbGV4aWJsZUJveD4ocGFyZW50 KCkpKSB7CiAgICAgICAgICAgICAgICAgICAgIGZsZXhDb250YWluZXItPmNsZWFyQ2FjaGVkRmxl eEl0ZW1JbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodCgqdGhpcyk7Ci0gICAgICAgICAgICAg ICAgICAgIGZsZXhDb250YWluZXItPmNsZWFyQ2FjaGVkTWFpblNpemVGb3JGbGV4SXRlbSgqdGhp cyk7CisgICAgICAgICAgICAgICAgICAgIGZsZXhDb250YWluZXItPmNsZWFyQ2FjaGVkQmxvY2tB eGlzU2l6ZUZvckZsZXhJdGVtKCp0aGlzKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgaWYgKGlzSW5Ub3BMYXllck9yQmFja2Ryb3Aoc3R5bGUoKSwgZWxlbWVudCgpKSkgewog ICAgICAgICAgICAgICAgICAgICAvLyBTaW5jZSB0b3AgbGF5ZXIncyBjb250YWluaW5nIGJsb2Nr IGlzIGRyaXZlbiBieSB0aGUgYXNzb2NpYXRlZCBlbGVtZW50J3Mgc3RhdGUgKHNlZSBFbGVtZW50 Ojppc0luVG9wTGF5ZXJPckJhY2tkcm9wKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNzRjMGUzYjhhMmU1Li5mZmE3ZTI1MzRhMDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAt OTE4LDcgKzkxOCw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBzdGQ6Om9wdGlvbmFs PExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlCiAgICAgICAgIC8vIHNjcm9s bGJhckxvZ2ljYWxIZWlnaHQgaGVyZSBiZWNhdXNlIENvbXB1dGVOZXh0RmxleExpbmUgd2lsbCBo YXZlCiAgICAgICAgIC8vIGFscmVhZHkgZm9yY2VkIGxheW91dCBvbiB0aGUgY2hpbGQuIFdlIHBy ZXZpb3VzbHkgZGlkIGEgbGF5b3V0IG91dCB0aGUgY2hpbGQKICAgICAgICAgLy8gaWYgbmVjZXNz YXJ5IChzZWUgQ29tcHV0ZU5leHRGbGV4TGluZSBhbmQgdGhlIGNhbGwgdG8KLSAgICAgICAgLy8g ZmxleEl0ZW1IYXNJbnRyaW5zaWNNYWluQXhpc1NpemUpIHNvIHdlIGNhbiBiZSBzdXJlIHRoYXQg dGhlIHR3byBoZWlnaHQKKyAgICAgICAgLy8gZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUpIHNv IHdlIGNhbiBiZSBzdXJlIHRoYXQgdGhlIHR3byBoZWlnaHQKICAgICAgICAgLy8gY2FsbHMgaGVy ZSB3aWxsIHJldHVybiB1cC10by1kYXRlIGRhdGEuCiAgICAgICAgIGF1dG8gaGVpZ2h0ID0gZmxl eEl0ZW0uY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KHNpemUsIGNhY2hlZEZsZXhJdGVtSW50 cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoZmxleEl0ZW0pKTsKICAgICAgICAgaWYgKCFoZWln aHQpCkBAIC0xNDk1LDkgKzE0OTUsOSBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBTaXplVHlwZT4gYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1Dcm9zc1NpemVJc0RlZmluaXRlKAogICAgIHJl dHVybiBzaXplLmlzRml4ZWQoKTsKIH0KIAotdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6Y2xlYXJD YWNoZWRNYWluU2l6ZUZvckZsZXhJdGVtKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0pCit2b2lk IFJlbmRlckZsZXhpYmxlQm94OjpjbGVhckNhY2hlZEJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShj b25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKQogewotICAgIG1faW50cmluc2ljU2l6ZUFsb25nTWFp bkF4aXMucmVtb3ZlKGZsZXhJdGVtKTsKKyAgICBtX2Jsb2NrQXhpc1NpemUucmVtb3ZlKGZsZXhJ dGVtKTsKIH0KIAogLy8gVGhpcyBpcyBhIFJBSUkgY2xhc3MgdGhhdCBpcyB1c2VkIHRvIHRlbXBv cmFyaWx5IHNldCB0aGUgZmxleCBiYXNpcyBhcyB0aGUgY2hpbGQgc2l6ZSBpbiB0aGUgbWFpbiBh eGlzLgpAQCAtMTUzNSwxNCArMTUzNSwxNyBAQCBwcml2YXRlOgogfTsKIAogLy8gaHR0cHM6Ly9k cmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LyNhbGdvLW1haW4taXRlbQotTGF5b3V0VW5pdCBS ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJv eCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKK0xheW91dFVu aXQgUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYg ZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKIHsKICAgICBhdXRv IGZsZXhCYXNpcyA9IGZsZXhCYXNpc0ZvckZsZXhJdGVtKGZsZXhJdGVtKTsKICAgICBTY29wZWRG bGV4QmFzaXNBc0ZsZXhJdGVtTWFpblNpemUgc2NvcGVkKGZsZXhJdGVtLCBmbGV4QmFzaXMudHJ5 UHJlZmVycmVkU2l6ZSgpLnZhbHVlX29yKFN0eWxlOjpQcmVmZXJyZWRTaXplIHsgQ1NTOjpLZXl3 b3JkOjpNYXhDb250ZW50IHsgfSB9KSwgbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4 SXRlbSkpOwotICAgIC8vIEZJWE1FOiBXaGlsZSB3ZSBhcmUgc3VwcG9zZWQgdG8gaWdub3JlIG1p bi9tYXggaGVyZSwgZmxleEl0ZW1JbnRyaW5zaWNNYWluU2l6ZSBtYXkgcmV0dXJuIGEgbWluL21h eC1jb25zdHJhaW5lZCBzaXplLgorICAgIC8vIEZJWE1FOiBXaGlsZSB3ZSBhcmUgc3VwcG9zZWQg dG8gaWdub3JlIG1pbi9tYXggaGVyZSwKKyAgICAvLyBibG9ja0F4aXNTaXplRm9yRmxleEl0ZW0g bWF5IHJldHVybiBhIG1pbi9tYXgtY29uc3RyYWluZWQgc2l6ZS4KICAgICBTZXRGb3JTY29wZTxi b29sPiBjb21wdXRpbmdCYXNlU2l6ZXNTY29wZShtX2lzQ29tcHV0aW5nRmxleEJhc2VTaXplcywg dHJ1ZSk7CiAKLSAgICBhdXRvIGludHJpbnNpY01haW5TaXplID0gZmxleEl0ZW1JbnRyaW5zaWNN YWluU2l6ZShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbik7CisgICAgYXV0byBibG9ja0F4aXNT aXplID0gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB7IH07CisgICAgaWYgKGZsZXhJdGVtTmVl ZHNCbG9ja0F4aXNTaXplKGZsZXhJdGVtKSkKKyAgICAgICAgYmxvY2tBeGlzU2l6ZSA9IGJsb2Nr QXhpc1NpemVGb3JGbGV4SXRlbShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbik7CiAKICAgICAv LyA5LjIuMyBBLgogICAgIGlmIChmbGV4SXRlbU1haW5TaXplSXNEZWZpbml0ZShmbGV4SXRlbSwg ZmxleEJhc2lzKSkKQEAgLTE1NTgsMTcgKzE1NjEsMTYgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4 aWJsZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0 ZW0KICAgICAvLyBGSVhNRTogOS4yLjMgRC4KIAogICAgIC8vIDkuMi4zIEUuCi0gICAgTGF5b3V0 VW5pdCBtYWluQXhpc0V4dGVudDsKICAgICBpZiAoIW1haW5BeGlzSXNGbGV4SXRlbUlubGluZUF4 aXMoZmxleEl0ZW0pKSB7CiAgICAgICAgIEFTU0VSVCghZmxleEl0ZW0ubmVlZHNMYXlvdXQoKSk7 Ci0gICAgICAgIEFTU0VSVChpbnRyaW5zaWNNYWluU2l6ZSk7Ci0gICAgICAgIG1haW5BeGlzRXh0 ZW50ID0gKmludHJpbnNpY01haW5TaXplOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIFdlIGRv bid0IG5lZWQgdG8gYWRkIHNjcm9sbGJhckxvZ2ljYWxXaWR0aCBoZXJlIGJlY2F1c2UgdGhlIHBy ZWZlcnJlZAotICAgICAgICAvLyB3aWR0aCBpbmNsdWRlcyB0aGUgc2Nyb2xsYmFyLCBldmVuIGZv ciBvdmVyZmxvdzogYXV0by4KLSAgICAgICAgU2NvcGVkQ3Jvc3NBeGlzT3ZlcnJpZGVGb3JGbGV4 SXRlbSBjcm9zc1NpemVTY29wZSgqdGhpcywgZmxleEl0ZW0sIEludmFsaWRhdGVQcmVmZXJyZWRX aWR0aHM6Olllcyk7Ci0gICAgICAgIG1haW5BeGlzRXh0ZW50ID0gZmxleEl0ZW0ubWF4UHJlZmVy cmVkTG9naWNhbFdpZHRoKCk7CisgICAgICAgIEFTU0VSVChibG9ja0F4aXNTaXplKTsKKyAgICAg ICAgcmV0dXJuICpibG9ja0F4aXNTaXplOwogICAgIH0KKworICAgIC8vIFdlIGRvbid0IG5lZWQg dG8gYWRkIHNjcm9sbGJhckxvZ2ljYWxXaWR0aCBoZXJlIGJlY2F1c2UgdGhlIHByZWZlcnJlZAor ICAgIC8vIHdpZHRoIGluY2x1ZGVzIHRoZSBzY3JvbGxiYXIsIGV2ZW4gZm9yIG92ZXJmbG93OiBh dXRvLgorICAgIFNjb3BlZENyb3NzQXhpc092ZXJyaWRlRm9yRmxleEl0ZW0gY3Jvc3NTaXplU2Nv cGUoKnRoaXMsIGZsZXhJdGVtLCBJbnZhbGlkYXRlUHJlZmVycmVkV2lkdGhzOjpZZXMpOworICAg IGF1dG8gbWFpbkF4aXNFeHRlbnQgPSBmbGV4SXRlbS5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgo KTsKICAgICBhdXRvIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3co KSA/IGZsZXhJdGVtLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBmbGV4SXRl bS52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICByZXR1cm4gbWFpbkF4aXNF eHRlbnQgLSBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmc7CiB9CkBAIC0yMDUwLDEwICsyMDUyLDkg QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0RmxleEl0ZW1TaXplRm9yQXNw ZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgKICAgICByZXR1cm4gZmxleEl0ZW1TaXplOwogfQog Ci1zdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbUlu dHJpbnNpY01haW5TaXplKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVs YXlvdXRDaGlsZHJlbikKK0xheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmJsb2NrQXhpc1Np emVGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZsZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5 b3V0Q2hpbGRyZW4pCiB7Ci0gICAgaWYgKCFmbGV4SXRlbUhhc0ludHJpbnNpY01haW5BeGlzU2l6 ZShmbGV4SXRlbSkpCi0gICAgICAgIHJldHVybiB7IH07CisgICAgQVNTRVJUKGZsZXhJdGVtTmVl ZHNCbG9ja0F4aXNTaXplKGZsZXhJdGVtKSk7CiAKICAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBp cyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAog ICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJ dGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSwKQEAgLTIwNjIsOCArMjA2Myw4IEBAIHN0ZDo6 b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmZsZXhJdGVtSW50cmluc2lj TWFpblNpemUoUmVuZGVyQm94CiAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxh eW91dChyZWxheW91dENoaWxkcmVuLCBmbGV4SXRlbSk7CiAKICAgICBpZiAoIWZsZXhJdGVtLm5l ZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgaWYgKGF1dG8gbWFpblNpemUgPSBtX2ludHJpbnNpY1Np emVBbG9uZ01haW5BeGlzLmdldE9wdGlvbmFsKGZsZXhJdGVtKSkKLSAgICAgICAgICAgIHJldHVy biBtYWluU2l6ZTsKKyAgICAgICAgaWYgKGF1dG8gY2FjaGVkID0gbV9ibG9ja0F4aXNTaXplLmdl dE9wdGlvbmFsKGZsZXhJdGVtKSkKKyAgICAgICAgICAgIHJldHVybiAqY2FjaGVkOwogICAgIH0K IAogICAgIC8vIERvbid0IHJlc29sdmUgcGVyY2VudGFnZXMgaW4gY2hpbGRyZW4uIFRoaXMgaXMg ZXNwZWNpYWxseSBpbXBvcnRhbnQgZm9yIHRoZSBtaW4taGVpZ2h0IGNhbGN1bGF0aW9uLApAQCAt MjA3MywxNiArMjA3NCwxNiBAQCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhp YmxlQm94OjpmbGV4SXRlbUludHJpbnNpY01haW5TaXplKFJlbmRlckJveAogICAgIGZsZXhJdGVt LnNldENoaWxkTmVlZHNMYXlvdXQoTWFya2luZ0JlaGF2aW9yOjpNYXJrT25seVRoaXMpOwogICAg IGZsZXhJdGVtLmxheW91dElmTmVlZGVkKCk7CiAKLSAgICBhdXRvIG1haW5TaXplID0gWyZdIHsK KyAgICBhdXRvIGlubmVyU2l6ZSA9IFsmXSB7CiAgICAgICAgIGF1dG8gZmxleEJhc2lzID0gZmxl eEJhc2lzRm9yRmxleEl0ZW0oZmxleEl0ZW0pOwogICAgICAgICBpZiAoZmxleEJhc2lzLmlzUGVy Y2VudE9yQ2FsY3VsYXRlZCgpICYmICFmbGV4SXRlbU1haW5TaXplSXNEZWZpbml0ZShmbGV4SXRl bSwgZmxleEJhc2lzKSkKLSAgICAgICAgICAgIHJldHVybiBjYWNoZWRGbGV4SXRlbUludHJpbnNp Y0NvbnRlbnRMb2dpY2FsSGVpZ2h0KGZsZXhJdGVtKSArIGZsZXhJdGVtLmJvcmRlckFuZFBhZGRp bmdMb2dpY2FsSGVpZ2h0KCkgKyBmbGV4SXRlbS5zY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7Ci0g ICAgICAgIHJldHVybiBmbGV4SXRlbS5sb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICByZXR1 cm4gY2FjaGVkRmxleEl0ZW1JbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodChmbGV4SXRlbSkg KyBmbGV4SXRlbS5zY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgIHJldHVybiBmbGV4 SXRlbS5sb2dpY2FsSGVpZ2h0KCkgLSBmbGV4SXRlbS5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhl aWdodCgpOwogICAgIH0oKTsKIAotICAgIG1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMuc2V0 KGZsZXhJdGVtLCBtYWluU2l6ZSk7CisgICAgbV9ibG9ja0F4aXNTaXplLnNldChmbGV4SXRlbSwg aW5uZXJTaXplKTsKICAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5hZGQoZmxleEl0ZW0pOwotICAg IHJldHVybiBtYWluU2l6ZTsKKyAgICByZXR1cm4gaW5uZXJTaXplOwogfQogCiBSZW5kZXJGbGV4 aWJsZUJveDo6RmxleExheW91dEl0ZW0gUmVuZGVyRmxleGlibGVCb3g6OmNvbnN0cnVjdEZsZXhM YXlvdXRJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdXRD aGlsZHJlbikKQEAgLTIwOTcsNyArMjA5OCw3IEBAIFJlbmRlckZsZXhpYmxlQm94OjpGbGV4TGF5 b3V0SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExheW91dEl0ZW0oUmVuCiAg ICAgaWYgKGZsZXhJdGVtLnNob3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKICAgICAg ICAgZmxleEl0ZW0uc2V0TmVlZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2aW9y OjpNYXJrT25seVRoaXMpOwogCi0gICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9IGNv bXB1dGVGbGV4QmFzZVNpemVGb3JGbGV4SXRlbShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJlbik7 CisgICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9IGZsZXhCYXNlU2l6ZUZvckZsZXhJ dGVtKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKICAgICBMYXlvdXRVbml0IGJvcmRlckFu ZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4SXRlbS5ob3Jpem9udGFsQm9yZGVy QW5kUGFkZGluZ0V4dGVudCgpIDogZmxleEl0ZW0udmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4 SXRlbS5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbE1hcmdpbkV4 dGVudCgpOwogICAgIHJldHVybiBGbGV4TGF5b3V0SXRlbShmbGV4SXRlbSwgaW5uZXJGbGV4QmFz ZVNpemUsIGJvcmRlckFuZFBhZGRpbmcsIG1hcmdpbiwgY29tcHV0ZUZsZXhJdGVtTWluTWF4U2l6 ZXMoZmxleEl0ZW0pLCBldmVySGFkTGF5b3V0KTsKQEAgLTI1MTcsNyArMjUxOCw3IEBAIGJvb2wg UmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0Y2hGbGV4SXRlbUxvZ2ljYWxIZWlnaHQoY29u c3QgUmVuZGVyQm94JiBmbGV4CiAgICAgICAgICYmIGZsZXhJdGVtLnN0eWxlKCkubG9naWNhbEhl aWdodCgpLmlzQXV0bygpOwogfQogCi1ib29sIFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbUhh c0ludHJpbnNpY01haW5BeGlzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKQorYm9vbCBS ZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoY29uc3QgUmVuZGVy Qm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAobWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhm bGV4SXRlbSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggNWU4NmUxYWU0MzcwLi4xZDA0MDMwNWNkZTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC03 Nyw3ICs3Nyw3IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHVzZWRG bGV4SXRlbU92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29u c3QgUmVuZGVyQm94Jik7CiAgICAgYm9vbCBjYW5Vc2VGbGV4SXRlbUZvclBlcmNlbnRhZ2VSZXNv bHV0aW9uKGNvbnN0IFJlbmRlckJveCYpOwogCi0gICAgdm9pZCBjbGVhckNhY2hlZE1haW5TaXpl Rm9yRmxleEl0ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CisgICAgdm9pZCBjbGVhckNh Y2hlZEJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKTsK ICAgICAKICAgICBMYXlvdXRVbml0IGNhY2hlZEZsZXhJdGVtSW50cmluc2ljQ29udGVudExvZ2lj YWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAgICAgdm9pZCBzZXRD YWNoZWRGbGV4SXRlbUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJv eCYgZmxleEl0ZW0sIExheW91dFVuaXQpOwpAQCAtMjA5LDE1ICsyMDksMTUgQEAgcHJpdmF0ZToK ICAgICB2b2lkIGNvbXB1dGVDaGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aHMoUmVuZGVyQm94Jiwg TGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgp IGNvbnN0IG92ZXJyaWRlOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBMYXlvdXRV bml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYg ZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9zc1NpemVMZW5ndGgpIGNvbnN0OwogICAgIHZv aWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZs ZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwotICAgIExheW91dFVuaXQgY29tcHV0ZUZsZXhC YXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4p OwotICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZmxleEl0ZW1JbnRyaW5zaWNNYWluU2l6 ZShSZW5kZXJCb3gmIGZsZXhJdGVtLCBSZWxheW91dENoaWxkcmVuKTsKKyAgICBMYXlvdXRVbml0 IGZsZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hp bGRyZW4pOworICAgIExheW91dFVuaXQgYmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJv eCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4pOwogICAgIHZvaWQgTk9ERUxFVEUgYWRqdXN0 QWxpZ25tZW50Rm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgTGF5b3V0VW5pdCk7CiAg ICAgaW5saW5lIE92ZXJmbG93QWxpZ25tZW50IG92ZXJmbG93QWxpZ25tZW50Rm9yRmxleEl0ZW0o Y29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUg U2l6ZVR5cGU+IGJvb2wgY2FuQ29tcHV0ZVBlcmNlbnRhZ2VGbGV4QmFzaXMoY29uc3QgUmVuZGVy Qm94JiBmbGV4SXRlbSwgY29uc3QgU2l6ZVR5cGUmLCBVcGRhdGVQZXJjZW50YWdlSGVpZ2h0RGVz Y2VuZGFudHMpOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBib29sIGZsZXhJdGVt TWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFNpemVUeXBlJik7CiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IGJvb2wgZmxleEl0ZW1Dcm9zc1NpemVJc0Rl ZmluaXRlKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFNpemVUeXBlJik7CiAgICAgYm9vbCBuZWVk VG9TdHJldGNoRmxleEl0ZW1Mb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0p IGNvbnN0OwotICAgIGJvb2wgZmxleEl0ZW1IYXNJbnRyaW5zaWNNYWluQXhpc1NpemUoY29uc3Qg UmVuZGVyQm94JiBmbGV4SXRlbSk7CisgICAgYm9vbCBmbGV4SXRlbU5lZWRzQmxvY2tBeGlzU2l6 ZShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKTsKICAgICBPdmVyZmxvdyBOT0RFTEVURSBtYWlu QXhpc092ZXJmbG93Rm9yRmxleEl0ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7 CiAgICAgT3ZlcmZsb3cgTk9ERUxFVEUgY3Jvc3NBeGlzT3ZlcmZsb3dGb3JGbGV4SXRlbShjb25z dCBSZW5kZXJCb3gmIGZsZXhJdGVtKSBjb25zdDsKIApAQCAtMzA0LDkgKzMwNCw4IEBAIHByaXZh dGU6CiAKICAgICBib29sIGxheW91dFVzaW5nRmxleEZvcm1hdHRpbmdDb250ZXh0KCk7CiAKLSAg ICAvLyBUaGlzIGlzIHVzZWQgdG8gY2FjaGUgdGhlIHByZWZlcnJlZCBzaXplIGZvciBvcnRob2dv bmFsIGZsb3cgY2hpbGRyZW4gc28gd2UKLSAgICAvLyBkb24ndCBoYXZlIHRvIHJlbGF5b3V0IHRv IGdldCBpdAotICAgIEhhc2hNYXA8U2luZ2xlVGhyZWFkV2Vha1JlZjxjb25zdCBSZW5kZXJCb3g+ LCBMYXlvdXRVbml0PiBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzOworICAgIC8vIElubmVy IG1haW4gc2l6ZSBmb3IgZmxleCBpdGVtcyB3aGVyZSBtYWluIGF4aXMgaXMgdGhlIGl0ZW0ncyBi bG9jayBheGlzIChjb2x1bW4gZmxleCBvciBvcnRob2dvbmFsKS4KKyAgICBIYXNoTWFwPFNpbmds ZVRocmVhZFdlYWtSZWY8Y29uc3QgUmVuZGVyQm94PiwgTGF5b3V0VW5pdD4gbV9ibG9ja0F4aXNT aXplOwogICAgIAogICAgIC8vIFRoaXMgaXMgdXNlZCB0byBjYWNoZSB0aGUgaW50cmluc2ljIHNp emUgb24gdGhlIGNyb3NzIGF4aXMgdG8gYXZvaWQKICAgICAvLyByZWxheW91dHMgd2hlbiBzdHJl dGNoaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9S ZW5kZXJUcmVlQnVpbGRlci5jcHAKaW5kZXggZWNlOTdmM2I2MmI1Li4wNDY3N2ZiNmQ4NzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyLmNwcApAQCAtMTAxNCw3ICsxMDE0LDcgQEAgc3RhdGljIHZvaWQgcmVzZXRSZW5k ZXJlclN0YXRlT25EZXRhY2goUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXJPYmplY3QmIGNo aWwKICAgICBlbHNlIGlmIChDaGVja2VkUHRyIHBhcmVudEZsZXhpYmxlQm94ID0gZHluYW1pY0Rv d25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQpKSB7CiAgICAgICAgIGlmIChDaGVja2Vk UHRyIGNoaWxkQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpKSB7CiAgICAg ICAgICAgICBwYXJlbnRGbGV4aWJsZUJveC0+Y2xlYXJDYWNoZWRGbGV4SXRlbUludHJpbnNpY0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KCpjaGlsZEJveCk7Ci0gICAgICAgICAgICBwYXJlbnRGbGV4aWJs ZUJveC0+Y2xlYXJDYWNoZWRNYWluU2l6ZUZvckZsZXhJdGVtKCpjaGlsZEJveCk7CisgICAgICAg ICAgICBwYXJlbnRGbGV4aWJsZUJveC0+Y2xlYXJDYWNoZWRCbG9ja0F4aXNTaXplRm9yRmxleEl0 ZW0oKmNoaWxkQm94KTsKICAgICAgICAgfQogICAgIH0KIAo= 479759 2026-05-21 09:26:21 -0700 2026-05-22 05:26:44 -0700 Patch bug-315292-20260521092620.patch text/plain 13946 zalan RnJvbSAzMTQwNGUxYmQ5NDI4MDBiODFjMzk2MTE1MmIwMDFkMDlkYTc1NDQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMjEgTWF5IDIwMjYgMDk6MTk6MTQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gUmVwbGFjZSAiaW50cmluc2ljIG1haW4gc2l6ZSIgbmFtaW5nIHdpdGgKIHNwZWMtYWxpZ25l ZCAiYmxvY2sgYXhpcyBzaXplIiBpbiBSZW5kZXJGbGV4aWJsZUJveAogaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTI5MgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgpUaGUgZmxleCBiYXNlIHNpemUgcmVzb2x1dGlvbiBjb2RlIGluIFJlbmRlckZsZXhpYmxl Qm94IHVzZWQgImludHJpbnNpYyBtYWluCnNpemUiIGxvb3NlbHkgdG8gbWVhbiAidGhlIHNpemUg eW91IGhhdmUgdG8gbGF5IG91dCBhIGZsZXggaXRlbSB0byBmaW5kIiAtCmNvbmZ1c2luZyBiZWNh dXNlIENTUyBTaXppbmcgMyByZXNlcnZlcyAiaW50cmluc2ljIiBmb3IgdGhlIG1pbi1jb250ZW50 LAptYXgtY29udGVudCwgZml0LWNvbnRlbnQga2V5d29yZHMuIFRoZSByZWxldmFudCBjYXNlIGlz IHNwZWNpZmljYWxseSB3aGVuCm1haW4gYXhpcyBpcyB0aGUgZmxleCBpdGVtJ3MgYmxvY2sgYXhp cyAoY29sdW1uIGZsZXggb3Igb3J0aG9nb25hbCBpdGVtcyksCnNvIHRoZSB2YWx1ZSBpcyBtb3Jl IGhvbmVzdGx5IG5hbWVkIHRoZSBibG9jay1heGlzIHNpemUuCgpSZW5hbWVkIGZsZXhJdGVtSW50 cmluc2ljTWFpblNpemUsIG1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMsIHRoZSBnYXRlCmZs ZXhJdGVtSGFzSW50cmluc2ljTWFpbkF4aXNTaXplLCBhbmQgdGhlIGludmFsaWRhdG9yIGNsZWFy Q2FjaGVkTWFpblNpemVGb3JGbGV4SXRlbQp0byB1c2UgImJsb2NrIGF4aXMgc2l6ZSIgdm9jYWJ1 bGFyeS4gQWxzbyBkcm9wcGVkIHRoZSBjb21wdXRlKiBwcmVmaXggZnJvbQpmbGV4QmFzZVNpemVG b3JGbGV4SXRlbSAoaXQgcmV0dXJucyBhIHZhbHVlLCBubyBvdXQtcGFyYW0pLiBUaGUgZ2F0ZSBt b3ZlZApmcm9tIGluc2lkZSB0aGUgZnVuY3Rpb24gdG8gdGhlIGNhbGxlciBzbyB0aGUgcHJlY29u ZGl0aW9uIGlzIHZpc2libGUuCgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZWxheW91dFNj b3BlRm9yU2Nyb2xsYmFyQ2hhbmdlLmNwcDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu Y3BwOgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNsZWFyQ2FjaGVkQmxvY2tBeGlzU2l6 ZUZvckZsZXhJdGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4QmFzZVNpemVG b3JGbGV4SXRlbSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YmxvY2tBeGlzU2l6ZUZv ckZsZXhJdGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbU5lZWRzQmxv Y2tBeGlzU2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2xlYXJDYWNoZWRNYWlu U2l6ZUZvckZsZXhJdGVtKTogRGVsZXRlZC4KKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlRmxleEJhc2VTaXplRm9yRmxleEl0ZW0pOiBEZWxldGVkLgooV2ViQ29yZTo6UmVuZGVy RmxleGlibGVCb3g6OmZsZXhJdGVtSW50cmluc2ljTWFpblNpemUpOiBEZWxldGVkLgooV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OmZsZXhJdGVtSGFzSW50cmluc2ljTWFpbkF4aXNTaXplKTog RGVsZXRlZC4KKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoK KiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3Bw OgotLS0KIC4uLi9SZWxheW91dFNjb3BlRm9yU2Nyb2xsYmFyQ2hhbmdlLmNwcCAgICAgICB8ICAy ICstCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICAgICAgfCAgMiAr LQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCAgIHwgMzQgKysr KysrKysrKy0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmggIHwgMTMgKysrKy0tLQogLi4uL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHAgIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMjYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbGF5 b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2UuY3BwCmluZGV4IGQyZjY0NWJiNGRlNS4u NzQxZWJiZWYzNjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVsYXlv dXRTY29wZUZvclNjcm9sbGJhckNoYW5nZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2UuY3BwCkBAIC02OCw3ICs2OCw3IEBA IFJlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2U6On5SZWxheW91dFNjb3BlRm9yU2Nyb2xs YmFyQ2hhbmdlKCkKICAgICAvLyBGSVhNRTogVGhpcyBkb2VzIG5vdCBiZWxvbmcgaGVyZS4KICAg ICBDaGVja2VkUHRyIHBhcmVudCA9IG1fcmVuZGVyQmxvY2stPnBhcmVudCgpOwogICAgIGlmIChD aGVja2VkUHRyIHBhcmVudEZsZXhpYmxlQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckZsZXhp YmxlQm94PihwYXJlbnQpOyBwYXJlbnRGbGV4aWJsZUJveCkKLSAgICAgICAgcGFyZW50RmxleGli bGVCb3gtPmNsZWFyQ2FjaGVkTWFpblNpemVGb3JGbGV4SXRlbShtX3JlbmRlckJsb2NrLmdldCgp KTsKKyAgICAgICAgcGFyZW50RmxleGlibGVCb3gtPmNsZWFyQ2FjaGVkQmxvY2tBeGlzU2l6ZUZv ckZsZXhJdGVtKG1fcmVuZGVyQmxvY2suZ2V0KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGRlMWQ2YmNiNjA0 OS4uMzU5ZjAwNDE1ZTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApA QCAtMjc5LDcgKzI3OSw3IEBAIHZvaWQgUmVuZGVyQm94OjpzdHlsZVdpbGxDaGFuZ2UoU3R5bGU6 OkRpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0CiAgICAgICAgICAgICAg ICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmZXJyZWRXaWR0aHNVcGRhdGUoKTsKICAgICAgICAgICAg ICAgICBpZiAoQ2hlY2tlZFB0ciBmbGV4Q29udGFpbmVyID0gZHluYW1pY0Rvd25jYXN0PFJlbmRl ckZsZXhpYmxlQm94PihwYXJlbnQoKSkpIHsKICAgICAgICAgICAgICAgICAgICAgZmxleENvbnRh aW5lci0+Y2xlYXJDYWNoZWRGbGV4SXRlbUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCp0 aGlzKTsKLSAgICAgICAgICAgICAgICAgICAgZmxleENvbnRhaW5lci0+Y2xlYXJDYWNoZWRNYWlu U2l6ZUZvckZsZXhJdGVtKCp0aGlzKTsKKyAgICAgICAgICAgICAgICAgICAgZmxleENvbnRhaW5l ci0+Y2xlYXJDYWNoZWRCbG9ja0F4aXNTaXplRm9yRmxleEl0ZW0oKnRoaXMpOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoaXNJblRvcExheWVyT3JCYWNrZHJvcChzdHls ZSgpLCBlbGVtZW50KCkpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFNpbmNlIHRvcCBsYXll cidzIGNvbnRhaW5pbmcgYmxvY2sgaXMgZHJpdmVuIGJ5IHRoZSBhc3NvY2lhdGVkIGVsZW1lbnQn cyBzdGF0ZSAoc2VlIEVsZW1lbnQ6OmlzSW5Ub3BMYXllck9yQmFja2Ryb3ApCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA3NGMwZTNiOGEy ZTUuLmM1NWIzNGRjOGE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guY3BwCkBAIC05MTgsNyArOTE4LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6 ZVR5cGU+IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1 dGUKICAgICAgICAgLy8gc2Nyb2xsYmFyTG9naWNhbEhlaWdodCBoZXJlIGJlY2F1c2UgQ29tcHV0 ZU5leHRGbGV4TGluZSB3aWxsIGhhdmUKICAgICAgICAgLy8gYWxyZWFkeSBmb3JjZWQgbGF5b3V0 IG9uIHRoZSBjaGlsZC4gV2UgcHJldmlvdXNseSBkaWQgYSBsYXlvdXQgb3V0IHRoZSBjaGlsZAog ICAgICAgICAvLyBpZiBuZWNlc3NhcnkgKHNlZSBDb21wdXRlTmV4dEZsZXhMaW5lIGFuZCB0aGUg Y2FsbCB0bwotICAgICAgICAvLyBmbGV4SXRlbUhhc0ludHJpbnNpY01haW5BeGlzU2l6ZSkgc28g d2UgY2FuIGJlIHN1cmUgdGhhdCB0aGUgdHdvIGhlaWdodAorICAgICAgICAvLyBmbGV4SXRlbU5l ZWRzQmxvY2tBeGlzU2l6ZSkgc28gd2UgY2FuIGJlIHN1cmUgdGhhdCB0aGUgdHdvIGhlaWdodAog ICAgICAgICAvLyBjYWxscyBoZXJlIHdpbGwgcmV0dXJuIHVwLXRvLWRhdGUgZGF0YS4KICAgICAg ICAgYXV0byBoZWlnaHQgPSBmbGV4SXRlbS5jb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoc2l6 ZSwgY2FjaGVkRmxleEl0ZW1JbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodChmbGV4SXRlbSkp OwogICAgICAgICBpZiAoIWhlaWdodCkKQEAgLTE0OTUsOSArMTQ5NSw5IEBAIHRlbXBsYXRlPHR5 cGVuYW1lIFNpemVUeXBlPiBib29sIFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbUNyb3NzU2l6 ZUlzRGVmaW5pdGUoCiAgICAgcmV0dXJuIHNpemUuaXNGaXhlZCgpOwogfQogCi12b2lkIFJlbmRl ckZsZXhpYmxlQm94OjpjbGVhckNhY2hlZE1haW5TaXplRm9yRmxleEl0ZW0oY29uc3QgUmVuZGVy Qm94JiBmbGV4SXRlbSkKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNsZWFyQ2FjaGVkQmxvY2tB eGlzU2l6ZUZvckZsZXhJdGVtKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0pCiB7Ci0gICAgbV9p bnRyaW5zaWNTaXplQWxvbmdNYWluQXhpcy5yZW1vdmUoZmxleEl0ZW0pOworICAgIG1fYmxvY2tB eGlzU2l6ZS5yZW1vdmUoZmxleEl0ZW0pOwogfQogCiAvLyBUaGlzIGlzIGEgUkFJSSBjbGFzcyB0 aGF0IGlzIHVzZWQgdG8gdGVtcG9yYXJpbHkgc2V0IHRoZSBmbGV4IGJhc2lzIGFzIHRoZSBjaGls ZCBzaXplIGluIHRoZSBtYWluIGF4aXMuCkBAIC0xNTM1LDE0ICsxNTM1LDE3IEBAIHByaXZhdGU6 CiB9OwogCiAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFp bi1pdGVtCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEJhc2VTaXpl Rm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91 dENoaWxkcmVuKQorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplRm9y RmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENo aWxkcmVuKQogewogICAgIGF1dG8gZmxleEJhc2lzID0gZmxleEJhc2lzRm9yRmxleEl0ZW0oZmxl eEl0ZW0pOwogICAgIFNjb3BlZEZsZXhCYXNpc0FzRmxleEl0ZW1NYWluU2l6ZSBzY29wZWQoZmxl eEl0ZW0sIGZsZXhCYXNpcy50cnlQcmVmZXJyZWRTaXplKCkudmFsdWVfb3IoU3R5bGU6OlByZWZl cnJlZFNpemUgeyBDU1M6OktleXdvcmQ6Ok1heENvbnRlbnQgeyB9IH0pLCBtYWluQXhpc0lzRmxl eEl0ZW1JbmxpbmVBeGlzKGZsZXhJdGVtKSk7Ci0gICAgLy8gRklYTUU6IFdoaWxlIHdlIGFyZSBz dXBwb3NlZCB0byBpZ25vcmUgbWluL21heCBoZXJlLCBmbGV4SXRlbUludHJpbnNpY01haW5TaXpl IG1heSByZXR1cm4gYSBtaW4vbWF4LWNvbnN0cmFpbmVkIHNpemUuCisgICAgLy8gRklYTUU6IFdo aWxlIHdlIGFyZSBzdXBwb3NlZCB0byBpZ25vcmUgbWluL21heCBoZXJlLAorICAgIC8vIGJsb2Nr QXhpc1NpemVGb3JGbGV4SXRlbSBtYXkgcmV0dXJuIGEgbWluL21heC1jb25zdHJhaW5lZCBzaXpl LgogICAgIFNldEZvclNjb3BlPGJvb2w+IGNvbXB1dGluZ0Jhc2VTaXplc1Njb3BlKG1faXNDb21w dXRpbmdGbGV4QmFzZVNpemVzLCB0cnVlKTsKIAotICAgIGF1dG8gaW50cmluc2ljTWFpblNpemUg PSBmbGV4SXRlbUludHJpbnNpY01haW5TaXplKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsK KyAgICBhdXRvIGJsb2NrQXhpc1NpemUgPSBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHsgfTsK KyAgICBpZiAoZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoZmxleEl0ZW0pKQorICAgICAgICBi bG9ja0F4aXNTaXplID0gYmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKGZsZXhJdGVtLCByZWxheW91 dENoaWxkcmVuKTsKIAogICAgIC8vIDkuMi4zIEEuCiAgICAgaWYgKGZsZXhJdGVtTWFpblNpemVJ c0RlZmluaXRlKGZsZXhJdGVtLCBmbGV4QmFzaXMpKQpAQCAtMTU2MSw4ICsxNTY0LDggQEAgTGF5 b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckZsZXhJdGVt KFJlbmRlckJveCYgZmxleEl0ZW0KICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50OwogICAg IGlmICghbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpIHsKICAgICAgICAg QVNTRVJUKCFmbGV4SXRlbS5uZWVkc0xheW91dCgpKTsKLSAgICAgICAgQVNTRVJUKGludHJpbnNp Y01haW5TaXplKTsKLSAgICAgICAgbWFpbkF4aXNFeHRlbnQgPSAqaW50cmluc2ljTWFpblNpemU7 CisgICAgICAgIEFTU0VSVChibG9ja0F4aXNTaXplKTsKKyAgICAgICAgbWFpbkF4aXNFeHRlbnQg PSAqYmxvY2tBeGlzU2l6ZTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBXZSBkb24ndCBuZWVk IHRvIGFkZCBzY3JvbGxiYXJMb2dpY2FsV2lkdGggaGVyZSBiZWNhdXNlIHRoZSBwcmVmZXJyZWQK ICAgICAgICAgLy8gd2lkdGggaW5jbHVkZXMgdGhlIHNjcm9sbGJhciwgZXZlbiBmb3Igb3ZlcmZs b3c6IGF1dG8uCkBAIC0yMDUwLDEwICsyMDUzLDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs ZUJveDo6YWRqdXN0RmxleEl0ZW1TaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgK ICAgICByZXR1cm4gZmxleEl0ZW1TaXplOwogfQogCi1zdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+ IFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbUludHJpbnNpY01haW5TaXplKFJlbmRlckJveCYg ZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKK0xheW91dFVuaXQg UmVuZGVyRmxleGlibGVCb3g6OmJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZs ZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4pCiB7Ci0gICAgaWYgKCFm bGV4SXRlbUhhc0ludHJpbnNpY01haW5BeGlzU2l6ZShmbGV4SXRlbSkpCi0gICAgICAgIHJldHVy biB7IH07CisgICAgQVNTRVJUKGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKGZsZXhJdGVtKSk7 CiAKICAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBpcyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhp c0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAogICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJdGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQo KSwKQEAgLTIwNjIsOCArMjA2NCw4IEBAIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVy RmxleGlibGVCb3g6OmZsZXhJdGVtSW50cmluc2ljTWFpblNpemUoUmVuZGVyQm94CiAgICAgdXBk YXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91dChyZWxheW91dENoaWxkcmVuLCBmbGV4 SXRlbSk7CiAKICAgICBpZiAoIWZsZXhJdGVtLm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgaWYg KGF1dG8gbWFpblNpemUgPSBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLmdldE9wdGlvbmFs KGZsZXhJdGVtKSkKLSAgICAgICAgICAgIHJldHVybiBtYWluU2l6ZTsKKyAgICAgICAgaWYgKGF1 dG8gY2FjaGVkID0gbV9ibG9ja0F4aXNTaXplLmdldE9wdGlvbmFsKGZsZXhJdGVtKSkKKyAgICAg ICAgICAgIHJldHVybiAqY2FjaGVkOwogICAgIH0KIAogICAgIC8vIERvbid0IHJlc29sdmUgcGVy Y2VudGFnZXMgaW4gY2hpbGRyZW4uIFRoaXMgaXMgZXNwZWNpYWxseSBpbXBvcnRhbnQgZm9yIHRo ZSBtaW4taGVpZ2h0IGNhbGN1bGF0aW9uLApAQCAtMjA4MCw3ICsyMDgyLDcgQEAgc3RkOjpvcHRp b25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1JbnRyaW5zaWNNYWlu U2l6ZShSZW5kZXJCb3gKICAgICAgICAgcmV0dXJuIGZsZXhJdGVtLmxvZ2ljYWxIZWlnaHQoKTsK ICAgICB9KCk7CiAKLSAgICBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLnNldChmbGV4SXRl bSwgbWFpblNpemUpOworICAgIG1fYmxvY2tBeGlzU2l6ZS5zZXQoZmxleEl0ZW0sIG1haW5TaXpl KTsKICAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5hZGQoZmxleEl0ZW0pOwogICAgIHJldHVybiBt YWluU2l6ZTsKIH0KQEAgLTIwOTcsNyArMjA5OSw3IEBAIFJlbmRlckZsZXhpYmxlQm94OjpGbGV4 TGF5b3V0SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExheW91dEl0ZW0oUmVu CiAgICAgaWYgKGZsZXhJdGVtLnNob3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKICAg ICAgICAgZmxleEl0ZW0uc2V0TmVlZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2 aW9yOjpNYXJrT25seVRoaXMpOwogCi0gICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9 IGNvbXB1dGVGbGV4QmFzZVNpemVGb3JGbGV4SXRlbShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJl bik7CisgICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9IGZsZXhCYXNlU2l6ZUZvckZs ZXhJdGVtKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKICAgICBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4SXRlbS5ob3Jpem9udGFsQm9y ZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogZmxleEl0ZW0udmVydGljYWxCb3JkZXJBbmRQYWRkaW5n RXh0ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6b250YWxGbG93KCkgPyBm bGV4SXRlbS5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbE1hcmdp bkV4dGVudCgpOwogICAgIHJldHVybiBGbGV4TGF5b3V0SXRlbShmbGV4SXRlbSwgaW5uZXJGbGV4 QmFzZVNpemUsIGJvcmRlckFuZFBhZGRpbmcsIG1hcmdpbiwgY29tcHV0ZUZsZXhJdGVtTWluTWF4 U2l6ZXMoZmxleEl0ZW0pLCBldmVySGFkTGF5b3V0KTsKQEAgLTI1MTcsNyArMjUxOSw3IEBAIGJv b2wgUmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0Y2hGbGV4SXRlbUxvZ2ljYWxIZWlnaHQo Y29uc3QgUmVuZGVyQm94JiBmbGV4CiAgICAgICAgICYmIGZsZXhJdGVtLnN0eWxlKCkubG9naWNh bEhlaWdodCgpLmlzQXV0bygpOwogfQogCi1ib29sIFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRl bUhhc0ludHJpbnNpY01haW5BeGlzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKQorYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoY29uc3QgUmVu ZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAobWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhp cyhmbGV4SXRlbSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggNWU4NmUxYWU0MzcwLi4xZDA0MDMwNWNk ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBA IC03Nyw3ICs3Nyw3IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHVz ZWRGbGV4SXRlbU92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24o Y29uc3QgUmVuZGVyQm94Jik7CiAgICAgYm9vbCBjYW5Vc2VGbGV4SXRlbUZvclBlcmNlbnRhZ2VS ZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYpOwogCi0gICAgdm9pZCBjbGVhckNhY2hlZE1haW5T aXplRm9yRmxleEl0ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CisgICAgdm9pZCBjbGVh ckNhY2hlZEJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVt KTsKICAgICAKICAgICBMYXlvdXRVbml0IGNhY2hlZEZsZXhJdGVtSW50cmluc2ljQ29udGVudExv Z2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAgICAgdm9pZCBz ZXRDYWNoZWRGbGV4SXRlbUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRl ckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQpOwpAQCAtMjA5LDE1ICsyMDksMTUgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGNvbXB1dGVDaGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aHMoUmVuZGVyQm94 JiwgTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lk dGgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBMYXlv dXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJv eCYgZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9zc1NpemVMZW5ndGgpIGNvbnN0OwogICAg IHZvaWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JGbGV4SXRlbShSZW5kZXJCb3gm IGZsZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwotICAgIExheW91dFVuaXQgY29tcHV0ZUZs ZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRy ZW4pOwotICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZmxleEl0ZW1JbnRyaW5zaWNNYWlu U2l6ZShSZW5kZXJCb3gmIGZsZXhJdGVtLCBSZWxheW91dENoaWxkcmVuKTsKKyAgICBMYXlvdXRV bml0IGZsZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0 Q2hpbGRyZW4pOworICAgIExheW91dFVuaXQgYmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKFJlbmRl ckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4pOwogICAgIHZvaWQgTk9ERUxFVEUgYWRq dXN0QWxpZ25tZW50Rm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgTGF5b3V0VW5pdCk7 CiAgICAgaW5saW5lIE92ZXJmbG93QWxpZ25tZW50IG92ZXJmbG93QWxpZ25tZW50Rm9yRmxleEl0 ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgU2l6ZVR5cGU+IGJvb2wgY2FuQ29tcHV0ZVBlcmNlbnRhZ2VGbGV4QmFzaXMoY29uc3QgUmVu ZGVyQm94JiBmbGV4SXRlbSwgY29uc3QgU2l6ZVR5cGUmLCBVcGRhdGVQZXJjZW50YWdlSGVpZ2h0 RGVzY2VuZGFudHMpOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBib29sIGZsZXhJ dGVtTWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFNpemVUeXBlJik7 CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IGJvb2wgZmxleEl0ZW1Dcm9zc1NpemVJ c0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFNpemVUeXBlJik7CiAgICAgYm9vbCBu ZWVkVG9TdHJldGNoRmxleEl0ZW1Mb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgZmxleEl0 ZW0pIGNvbnN0OwotICAgIGJvb2wgZmxleEl0ZW1IYXNJbnRyaW5zaWNNYWluQXhpc1NpemUoY29u c3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CisgICAgYm9vbCBmbGV4SXRlbU5lZWRzQmxvY2tBeGlz U2l6ZShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKTsKICAgICBPdmVyZmxvdyBOT0RFTEVURSBt YWluQXhpc092ZXJmbG93Rm9yRmxleEl0ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29u c3Q7CiAgICAgT3ZlcmZsb3cgTk9ERUxFVEUgY3Jvc3NBeGlzT3ZlcmZsb3dGb3JGbGV4SXRlbShj b25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKSBjb25zdDsKIApAQCAtMzA0LDkgKzMwNCw4IEBAIHBy aXZhdGU6CiAKICAgICBib29sIGxheW91dFVzaW5nRmxleEZvcm1hdHRpbmdDb250ZXh0KCk7CiAK LSAgICAvLyBUaGlzIGlzIHVzZWQgdG8gY2FjaGUgdGhlIHByZWZlcnJlZCBzaXplIGZvciBvcnRo b2dvbmFsIGZsb3cgY2hpbGRyZW4gc28gd2UKLSAgICAvLyBkb24ndCBoYXZlIHRvIHJlbGF5b3V0 IHRvIGdldCBpdAotICAgIEhhc2hNYXA8U2luZ2xlVGhyZWFkV2Vha1JlZjxjb25zdCBSZW5kZXJC b3g+LCBMYXlvdXRVbml0PiBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzOworICAgIC8vIElu bmVyIG1haW4gc2l6ZSBmb3IgZmxleCBpdGVtcyB3aGVyZSBtYWluIGF4aXMgaXMgdGhlIGl0ZW0n cyBibG9jayBheGlzIChjb2x1bW4gZmxleCBvciBvcnRob2dvbmFsKS4KKyAgICBIYXNoTWFwPFNp bmdsZVRocmVhZFdlYWtSZWY8Y29uc3QgUmVuZGVyQm94PiwgTGF5b3V0VW5pdD4gbV9ibG9ja0F4 aXNTaXplOwogICAgIAogICAgIC8vIFRoaXMgaXMgdXNlZCB0byBjYWNoZSB0aGUgaW50cmluc2lj IHNpemUgb24gdGhlIGNyb3NzIGF4aXMgdG8gYXZvaWQKICAgICAvLyByZWxheW91dHMgd2hlbiBz dHJldGNoaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKaW5kZXggZWNlOTdmM2I2MmI1Li4wNDY3N2ZiNmQ4NzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVl QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyLmNwcApAQCAtMTAxNCw3ICsxMDE0LDcgQEAgc3RhdGljIHZvaWQgcmVzZXRS ZW5kZXJlclN0YXRlT25EZXRhY2goUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXJPYmplY3Qm IGNoaWwKICAgICBlbHNlIGlmIChDaGVja2VkUHRyIHBhcmVudEZsZXhpYmxlQm94ID0gZHluYW1p Y0Rvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQpKSB7CiAgICAgICAgIGlmIChDaGVj a2VkUHRyIGNoaWxkQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpKSB7CiAg ICAgICAgICAgICBwYXJlbnRGbGV4aWJsZUJveC0+Y2xlYXJDYWNoZWRGbGV4SXRlbUludHJpbnNp Y0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCpjaGlsZEJveCk7Ci0gICAgICAgICAgICBwYXJlbnRGbGV4 aWJsZUJveC0+Y2xlYXJDYWNoZWRNYWluU2l6ZUZvckZsZXhJdGVtKCpjaGlsZEJveCk7CisgICAg ICAgICAgICBwYXJlbnRGbGV4aWJsZUJveC0+Y2xlYXJDYWNoZWRCbG9ja0F4aXNTaXplRm9yRmxl eEl0ZW0oKmNoaWxkQm94KTsKICAgICAgICAgfQogICAgIH0KIAo= 479776 2026-05-22 05:23:30 -0700 2026-05-22 07:00:33 -0700 [fast-cq]Patch bug-315292-20260522052330.patch text/plain 13946 zalan RnJvbSA0MTgwNWMxOTk0ODRjNTFmNGIyZGRjOGQ3ZTE1YjFhN2I1YmRhMDlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMjEgTWF5IDIwMjYgMDk6MTk6MTQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gUmVwbGFjZSAiaW50cmluc2ljIG1haW4gc2l6ZSIgbmFtaW5nIHdpdGgKIHNwZWMtYWxpZ25l ZCAiYmxvY2sgYXhpcyBzaXplIiBpbiBSZW5kZXJGbGV4aWJsZUJveAogaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTI5MgoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlz dG8uCgpUaGUgZmxleCBiYXNlIHNpemUgcmVzb2x1dGlvbiBjb2RlIGluIFJlbmRlckZsZXhpYmxl Qm94IHVzZWQgImludHJpbnNpYyBtYWluCnNpemUiIGxvb3NlbHkgdG8gbWVhbiAidGhlIHNpemUg eW91IGhhdmUgdG8gbGF5IG91dCBhIGZsZXggaXRlbSB0byBmaW5kIiAtCmNvbmZ1c2luZyBiZWNh dXNlIENTUyBTaXppbmcgMyByZXNlcnZlcyAiaW50cmluc2ljIiBmb3IgdGhlIG1pbi1jb250ZW50 LAptYXgtY29udGVudCwgZml0LWNvbnRlbnQga2V5d29yZHMuIFRoZSByZWxldmFudCBjYXNlIGlz IHNwZWNpZmljYWxseSB3aGVuCm1haW4gYXhpcyBpcyB0aGUgZmxleCBpdGVtJ3MgYmxvY2sgYXhp cyAoY29sdW1uIGZsZXggb3Igb3J0aG9nb25hbCBpdGVtcyksCnNvIHRoZSB2YWx1ZSBpcyBtb3Jl IGhvbmVzdGx5IG5hbWVkIHRoZSBibG9jay1heGlzIHNpemUuCgpSZW5hbWVkIGZsZXhJdGVtSW50 cmluc2ljTWFpblNpemUsIG1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMsIHRoZSBnYXRlCmZs ZXhJdGVtSGFzSW50cmluc2ljTWFpbkF4aXNTaXplLCBhbmQgdGhlIGludmFsaWRhdG9yIGNsZWFy Q2FjaGVkTWFpblNpemVGb3JGbGV4SXRlbQp0byB1c2UgImJsb2NrIGF4aXMgc2l6ZSIgdm9jYWJ1 bGFyeS4gQWxzbyBkcm9wcGVkIHRoZSBjb21wdXRlKiBwcmVmaXggZnJvbQpmbGV4QmFzZVNpemVG b3JGbGV4SXRlbSAoaXQgcmV0dXJucyBhIHZhbHVlLCBubyBvdXQtcGFyYW0pLiBUaGUgZ2F0ZSBt b3ZlZApmcm9tIGluc2lkZSB0aGUgZnVuY3Rpb24gdG8gdGhlIGNhbGxlciBzbyB0aGUgcHJlY29u ZGl0aW9uIGlzIHZpc2libGUuCgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZWxheW91dFNj b3BlRm9yU2Nyb2xsYmFyQ2hhbmdlLmNwcDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu Y3BwOgooV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNsZWFyQ2FjaGVkQmxvY2tBeGlzU2l6 ZUZvckZsZXhJdGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4QmFzZVNpemVG b3JGbGV4SXRlbSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YmxvY2tBeGlzU2l6ZUZv ckZsZXhJdGVtKToKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbU5lZWRzQmxv Y2tBeGlzU2l6ZSk6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2xlYXJDYWNoZWRNYWlu U2l6ZUZvckZsZXhJdGVtKTogRGVsZXRlZC4KKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlRmxleEJhc2VTaXplRm9yRmxleEl0ZW0pOiBEZWxldGVkLgooV2ViQ29yZTo6UmVuZGVy RmxleGlibGVCb3g6OmZsZXhJdGVtSW50cmluc2ljTWFpblNpemUpOiBEZWxldGVkLgooV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OmZsZXhJdGVtSGFzSW50cmluc2ljTWFpbkF4aXNTaXplKTog RGVsZXRlZC4KKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoK KiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3Bw OgotLS0KIC4uLi9SZWxheW91dFNjb3BlRm9yU2Nyb2xsYmFyQ2hhbmdlLmNwcCAgICAgICB8ICAy ICstCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICAgICAgfCAgMiAr LQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCAgIHwgMzQgKysr KysrKysrKy0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmggIHwgMTMgKysrKy0tLQogLi4uL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHAgIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMjYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbGF5 b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2UuY3BwCmluZGV4IGQyZjY0NWJiNGRlNS4u NzQxZWJiZWYzNjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVsYXlv dXRTY29wZUZvclNjcm9sbGJhckNoYW5nZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2UuY3BwCkBAIC02OCw3ICs2OCw3IEBA IFJlbGF5b3V0U2NvcGVGb3JTY3JvbGxiYXJDaGFuZ2U6On5SZWxheW91dFNjb3BlRm9yU2Nyb2xs YmFyQ2hhbmdlKCkKICAgICAvLyBGSVhNRTogVGhpcyBkb2VzIG5vdCBiZWxvbmcgaGVyZS4KICAg ICBDaGVja2VkUHRyIHBhcmVudCA9IG1fcmVuZGVyQmxvY2stPnBhcmVudCgpOwogICAgIGlmIChD aGVja2VkUHRyIHBhcmVudEZsZXhpYmxlQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckZsZXhp YmxlQm94PihwYXJlbnQpOyBwYXJlbnRGbGV4aWJsZUJveCkKLSAgICAgICAgcGFyZW50RmxleGli bGVCb3gtPmNsZWFyQ2FjaGVkTWFpblNpemVGb3JGbGV4SXRlbShtX3JlbmRlckJsb2NrLmdldCgp KTsKKyAgICAgICAgcGFyZW50RmxleGlibGVCb3gtPmNsZWFyQ2FjaGVkQmxvY2tBeGlzU2l6ZUZv ckZsZXhJdGVtKG1fcmVuZGVyQmxvY2suZ2V0KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGRlMWQ2YmNiNjA0 OS4uMzU5ZjAwNDE1ZTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApA QCAtMjc5LDcgKzI3OSw3IEBAIHZvaWQgUmVuZGVyQm94OjpzdHlsZVdpbGxDaGFuZ2UoU3R5bGU6 OkRpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0CiAgICAgICAgICAgICAg ICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmZXJyZWRXaWR0aHNVcGRhdGUoKTsKICAgICAgICAgICAg ICAgICBpZiAoQ2hlY2tlZFB0ciBmbGV4Q29udGFpbmVyID0gZHluYW1pY0Rvd25jYXN0PFJlbmRl ckZsZXhpYmxlQm94PihwYXJlbnQoKSkpIHsKICAgICAgICAgICAgICAgICAgICAgZmxleENvbnRh aW5lci0+Y2xlYXJDYWNoZWRGbGV4SXRlbUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCp0 aGlzKTsKLSAgICAgICAgICAgICAgICAgICAgZmxleENvbnRhaW5lci0+Y2xlYXJDYWNoZWRNYWlu U2l6ZUZvckZsZXhJdGVtKCp0aGlzKTsKKyAgICAgICAgICAgICAgICAgICAgZmxleENvbnRhaW5l ci0+Y2xlYXJDYWNoZWRCbG9ja0F4aXNTaXplRm9yRmxleEl0ZW0oKnRoaXMpOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoaXNJblRvcExheWVyT3JCYWNrZHJvcChzdHls ZSgpLCBlbGVtZW50KCkpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFNpbmNlIHRvcCBsYXll cidzIGNvbnRhaW5pbmcgYmxvY2sgaXMgZHJpdmVuIGJ5IHRoZSBhc3NvY2lhdGVkIGVsZW1lbnQn cyBzdGF0ZSAoc2VlIEVsZW1lbnQ6OmlzSW5Ub3BMYXllck9yQmFja2Ryb3ApCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA5MWVlNzk3NjNh MjIuLjc5MWM4YThhNDU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guY3BwCkBAIC05MTgsNyArOTE4LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6 ZVR5cGU+IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1 dGUKICAgICAgICAgLy8gc2Nyb2xsYmFyTG9naWNhbEhlaWdodCBoZXJlIGJlY2F1c2UgQ29tcHV0 ZU5leHRGbGV4TGluZSB3aWxsIGhhdmUKICAgICAgICAgLy8gYWxyZWFkeSBmb3JjZWQgbGF5b3V0 IG9uIHRoZSBjaGlsZC4gV2UgcHJldmlvdXNseSBkaWQgYSBsYXlvdXQgb3V0IHRoZSBjaGlsZAog ICAgICAgICAvLyBpZiBuZWNlc3NhcnkgKHNlZSBDb21wdXRlTmV4dEZsZXhMaW5lIGFuZCB0aGUg Y2FsbCB0bwotICAgICAgICAvLyBmbGV4SXRlbUhhc0ludHJpbnNpY01haW5BeGlzU2l6ZSkgc28g d2UgY2FuIGJlIHN1cmUgdGhhdCB0aGUgdHdvIGhlaWdodAorICAgICAgICAvLyBmbGV4SXRlbU5l ZWRzQmxvY2tBeGlzU2l6ZSkgc28gd2UgY2FuIGJlIHN1cmUgdGhhdCB0aGUgdHdvIGhlaWdodAog ICAgICAgICAvLyBjYWxscyBoZXJlIHdpbGwgcmV0dXJuIHVwLXRvLWRhdGUgZGF0YS4KICAgICAg ICAgYXV0byBoZWlnaHQgPSBmbGV4SXRlbS5jb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoc2l6 ZSwgY2FjaGVkRmxleEl0ZW1JbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodChmbGV4SXRlbSkp OwogICAgICAgICBpZiAoIWhlaWdodCkKQEAgLTE0OTksOSArMTQ5OSw5IEBAIHRlbXBsYXRlPHR5 cGVuYW1lIFNpemVUeXBlPiBib29sIFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbUNyb3NzU2l6 ZUlzRGVmaW5pdGUoCiAgICAgcmV0dXJuIHNpemUuaXNGaXhlZCgpOwogfQogCi12b2lkIFJlbmRl ckZsZXhpYmxlQm94OjpjbGVhckNhY2hlZE1haW5TaXplRm9yRmxleEl0ZW0oY29uc3QgUmVuZGVy Qm94JiBmbGV4SXRlbSkKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNsZWFyQ2FjaGVkQmxvY2tB eGlzU2l6ZUZvckZsZXhJdGVtKGNvbnN0IFJlbmRlckJveCYgZmxleEl0ZW0pCiB7Ci0gICAgbV9p bnRyaW5zaWNTaXplQWxvbmdNYWluQXhpcy5yZW1vdmUoZmxleEl0ZW0pOworICAgIG1fYmxvY2tB eGlzU2l6ZS5yZW1vdmUoZmxleEl0ZW0pOwogfQogCiAvLyBUaGlzIGlzIGEgUkFJSSBjbGFzcyB0 aGF0IGlzIHVzZWQgdG8gdGVtcG9yYXJpbHkgc2V0IHRoZSBmbGV4IGJhc2lzIGFzIHRoZSBjaGls ZCBzaXplIGluIHRoZSBtYWluIGF4aXMuCkBAIC0xNTM5LDE0ICsxNTM5LDE3IEBAIHByaXZhdGU6 CiB9OwogCiAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFp bi1pdGVtCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEJhc2VTaXpl Rm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91 dENoaWxkcmVuKQorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEJhc2VTaXplRm9y RmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENo aWxkcmVuKQogewogICAgIGF1dG8gZmxleEJhc2lzID0gZmxleEJhc2lzRm9yRmxleEl0ZW0oZmxl eEl0ZW0pOwogICAgIFNjb3BlZEZsZXhCYXNpc0FzRmxleEl0ZW1NYWluU2l6ZSBzY29wZWQoZmxl eEl0ZW0sIGZsZXhCYXNpcy50cnlQcmVmZXJyZWRTaXplKCkudmFsdWVfb3IoU3R5bGU6OlByZWZl cnJlZFNpemUgeyBDU1M6OktleXdvcmQ6Ok1heENvbnRlbnQgeyB9IH0pLCBtYWluQXhpc0lzRmxl eEl0ZW1JbmxpbmVBeGlzKGZsZXhJdGVtKSk7Ci0gICAgLy8gRklYTUU6IFdoaWxlIHdlIGFyZSBz dXBwb3NlZCB0byBpZ25vcmUgbWluL21heCBoZXJlLCBmbGV4SXRlbUludHJpbnNpY01haW5TaXpl IG1heSByZXR1cm4gYSBtaW4vbWF4LWNvbnN0cmFpbmVkIHNpemUuCisgICAgLy8gRklYTUU6IFdo aWxlIHdlIGFyZSBzdXBwb3NlZCB0byBpZ25vcmUgbWluL21heCBoZXJlLAorICAgIC8vIGJsb2Nr QXhpc1NpemVGb3JGbGV4SXRlbSBtYXkgcmV0dXJuIGEgbWluL21heC1jb25zdHJhaW5lZCBzaXpl LgogICAgIFNldEZvclNjb3BlPGJvb2w+IGNvbXB1dGluZ0Jhc2VTaXplc1Njb3BlKG1faXNDb21w dXRpbmdGbGV4QmFzZVNpemVzLCB0cnVlKTsKIAotICAgIGF1dG8gaW50cmluc2ljTWFpblNpemUg PSBmbGV4SXRlbUludHJpbnNpY01haW5TaXplKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsK KyAgICBhdXRvIGJsb2NrQXhpc1NpemUgPSBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHsgfTsK KyAgICBpZiAoZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoZmxleEl0ZW0pKQorICAgICAgICBi bG9ja0F4aXNTaXplID0gYmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKGZsZXhJdGVtLCByZWxheW91 dENoaWxkcmVuKTsKIAogICAgIC8vIDkuMi4zIEEuCiAgICAgaWYgKGZsZXhJdGVtTWFpblNpemVJ c0RlZmluaXRlKGZsZXhJdGVtLCBmbGV4QmFzaXMpKQpAQCAtMTU2NSw4ICsxNTY4LDggQEAgTGF5 b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckZsZXhJdGVt KFJlbmRlckJveCYgZmxleEl0ZW0KICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50OwogICAg IGlmICghbWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhpcyhmbGV4SXRlbSkpIHsKICAgICAgICAg QVNTRVJUKCFmbGV4SXRlbS5uZWVkc0xheW91dCgpKTsKLSAgICAgICAgQVNTRVJUKGludHJpbnNp Y01haW5TaXplKTsKLSAgICAgICAgbWFpbkF4aXNFeHRlbnQgPSAqaW50cmluc2ljTWFpblNpemU7 CisgICAgICAgIEFTU0VSVChibG9ja0F4aXNTaXplKTsKKyAgICAgICAgbWFpbkF4aXNFeHRlbnQg PSAqYmxvY2tBeGlzU2l6ZTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBXZSBkb24ndCBuZWVk IHRvIGFkZCBzY3JvbGxiYXJMb2dpY2FsV2lkdGggaGVyZSBiZWNhdXNlIHRoZSBwcmVmZXJyZWQK ICAgICAgICAgLy8gd2lkdGggaW5jbHVkZXMgdGhlIHNjcm9sbGJhciwgZXZlbiBmb3Igb3ZlcmZs b3c6IGF1dG8uCkBAIC0yMDU0LDEwICsyMDU3LDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs ZUJveDo6YWRqdXN0RmxleEl0ZW1TaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgK ICAgICByZXR1cm4gZmxleEl0ZW1TaXplOwogfQogCi1zdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+ IFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRlbUludHJpbnNpY01haW5TaXplKFJlbmRlckJveCYg ZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbikKK0xheW91dFVuaXQg UmVuZGVyRmxleGlibGVCb3g6OmJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShSZW5kZXJCb3gmIGZs ZXhJdGVtLCBSZWxheW91dENoaWxkcmVuIHJlbGF5b3V0Q2hpbGRyZW4pCiB7Ci0gICAgaWYgKCFm bGV4SXRlbUhhc0ludHJpbnNpY01haW5BeGlzU2l6ZShmbGV4SXRlbSkpCi0gICAgICAgIHJldHVy biB7IH07CisgICAgQVNTRVJUKGZsZXhJdGVtTmVlZHNCbG9ja0F4aXNTaXplKGZsZXhJdGVtKSk7 CiAKICAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBpcyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhp c0V4dGVudEZvckZsZXhJdGVtIHdpbGwgY2FsbAogICAgIC8vIGZsZXhJdGVtLmludHJpbnNpY0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGZsZXhJdGVtLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQo KSwKQEAgLTIwNjYsOCArMjA2OCw4IEBAIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVy RmxleGlibGVCb3g6OmZsZXhJdGVtSW50cmluc2ljTWFpblNpemUoUmVuZGVyQm94CiAgICAgdXBk YXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91dChyZWxheW91dENoaWxkcmVuLCBmbGV4 SXRlbSk7CiAKICAgICBpZiAoIWZsZXhJdGVtLm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgaWYg KGF1dG8gbWFpblNpemUgPSBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLmdldE9wdGlvbmFs KGZsZXhJdGVtKSkKLSAgICAgICAgICAgIHJldHVybiBtYWluU2l6ZTsKKyAgICAgICAgaWYgKGF1 dG8gY2FjaGVkID0gbV9ibG9ja0F4aXNTaXplLmdldE9wdGlvbmFsKGZsZXhJdGVtKSkKKyAgICAg ICAgICAgIHJldHVybiAqY2FjaGVkOwogICAgIH0KIAogICAgIC8vIERvbid0IHJlc29sdmUgcGVy Y2VudGFnZXMgaW4gY2hpbGRyZW4uIFRoaXMgaXMgZXNwZWNpYWxseSBpbXBvcnRhbnQgZm9yIHRo ZSBtaW4taGVpZ2h0IGNhbGN1bGF0aW9uLApAQCAtMjA4NCw3ICsyMDg2LDcgQEAgc3RkOjpvcHRp b25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1JbnRyaW5zaWNNYWlu U2l6ZShSZW5kZXJCb3gKICAgICAgICAgcmV0dXJuIGZsZXhJdGVtLmxvZ2ljYWxIZWlnaHQoKTsK ICAgICB9KCk7CiAKLSAgICBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLnNldChmbGV4SXRl bSwgbWFpblNpemUpOworICAgIG1fYmxvY2tBeGlzU2l6ZS5zZXQoZmxleEl0ZW0sIG1haW5TaXpl KTsKICAgICBtX3JlbGFpZE91dEZsZXhJdGVtcy5hZGQoZmxleEl0ZW0pOwogICAgIHJldHVybiBt YWluU2l6ZTsKIH0KQEAgLTIxMDEsNyArMjEwMyw3IEBAIFJlbmRlckZsZXhpYmxlQm94OjpGbGV4 TGF5b3V0SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleExheW91dEl0ZW0oUmVu CiAgICAgaWYgKGZsZXhJdGVtLnNob3VsZEludmFsaWRhdGVQcmVmZXJyZWRXaWR0aHMoKSkKICAg ICAgICAgZmxleEl0ZW0uc2V0TmVlZHNQcmVmZXJyZWRXaWR0aHNVcGRhdGUoTWFya2luZ0JlaGF2 aW9yOjpNYXJrT25seVRoaXMpOwogCi0gICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9 IGNvbXB1dGVGbGV4QmFzZVNpemVGb3JGbGV4SXRlbShmbGV4SXRlbSwgcmVsYXlvdXRDaGlsZHJl bik7CisgICAgTGF5b3V0VW5pdCBpbm5lckZsZXhCYXNlU2l6ZSA9IGZsZXhCYXNlU2l6ZUZvckZs ZXhJdGVtKGZsZXhJdGVtLCByZWxheW91dENoaWxkcmVuKTsKICAgICBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBmbGV4SXRlbS5ob3Jpem9udGFsQm9y ZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogZmxleEl0ZW0udmVydGljYWxCb3JkZXJBbmRQYWRkaW5n RXh0ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6b250YWxGbG93KCkgPyBm bGV4SXRlbS5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBmbGV4SXRlbS52ZXJ0aWNhbE1hcmdp bkV4dGVudCgpOwogICAgIHJldHVybiBGbGV4TGF5b3V0SXRlbShmbGV4SXRlbSwgaW5uZXJGbGV4 QmFzZVNpemUsIGJvcmRlckFuZFBhZGRpbmcsIG1hcmdpbiwgY29tcHV0ZUZsZXhJdGVtTWluTWF4 U2l6ZXMoZmxleEl0ZW0pLCBldmVySGFkTGF5b3V0KTsKQEAgLTI1MjEsNyArMjUyMyw3IEBAIGJv b2wgUmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0Y2hGbGV4SXRlbUxvZ2ljYWxIZWlnaHQo Y29uc3QgUmVuZGVyQm94JiBmbGV4CiAgICAgICAgICYmIGZsZXhJdGVtLnN0eWxlKCkubG9naWNh bEhlaWdodCgpLmlzQXV0bygpOwogfQogCi1ib29sIFJlbmRlckZsZXhpYmxlQm94OjpmbGV4SXRl bUhhc0ludHJpbnNpY01haW5BeGlzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKQorYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1OZWVkc0Jsb2NrQXhpc1NpemUoY29uc3QgUmVu ZGVyQm94JiBmbGV4SXRlbSkKIHsKICAgICBpZiAobWFpbkF4aXNJc0ZsZXhJdGVtSW5saW5lQXhp cyhmbGV4SXRlbSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggYTRiNDkwNjc2ODIzLi4zZjE1OGRjNDgw YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBA IC03Nyw3ICs3Nyw3IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHVz ZWRGbGV4SXRlbU92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24o Y29uc3QgUmVuZGVyQm94Jik7CiAgICAgYm9vbCBjYW5Vc2VGbGV4SXRlbUZvclBlcmNlbnRhZ2VS ZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYpOwogCi0gICAgdm9pZCBjbGVhckNhY2hlZE1haW5T aXplRm9yRmxleEl0ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CisgICAgdm9pZCBjbGVh ckNhY2hlZEJsb2NrQXhpc1NpemVGb3JGbGV4SXRlbShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVt KTsKICAgICAKICAgICBMYXlvdXRVbml0IGNhY2hlZEZsZXhJdGVtSW50cmluc2ljQ29udGVudExv Z2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAgICAgdm9pZCBz ZXRDYWNoZWRGbGV4SXRlbUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRl ckJveCYgZmxleEl0ZW0sIExheW91dFVuaXQpOwpAQCAtMjA5LDE1ICsyMDksMTUgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGNvbXB1dGVDaGlsZEludHJpbnNpY0xvZ2ljYWxXaWR0aHMoUmVuZGVyQm94 JiwgTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lk dGgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBMYXlv dXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJv eCYgZmxleEl0ZW0sIGNvbnN0IFNpemVUeXBlJiBjcm9zc1NpemVMZW5ndGgpIGNvbnN0OwogICAg IHZvaWQgTk9ERUxFVEUgc2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JGbGV4SXRlbShSZW5kZXJCb3gm IGZsZXhJdGVtLCBjb25zdCBMYXlvdXRQb2ludCYpOwotICAgIExheW91dFVuaXQgY29tcHV0ZUZs ZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRy ZW4pOwotICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZmxleEl0ZW1JbnRyaW5zaWNNYWlu U2l6ZShSZW5kZXJCb3gmIGZsZXhJdGVtLCBSZWxheW91dENoaWxkcmVuKTsKKyAgICBMYXlvdXRV bml0IGZsZXhCYXNlU2l6ZUZvckZsZXhJdGVtKFJlbmRlckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0 Q2hpbGRyZW4pOworICAgIExheW91dFVuaXQgYmxvY2tBeGlzU2l6ZUZvckZsZXhJdGVtKFJlbmRl ckJveCYgZmxleEl0ZW0sIFJlbGF5b3V0Q2hpbGRyZW4pOwogICAgIHZvaWQgTk9ERUxFVEUgYWRq dXN0QWxpZ25tZW50Rm9yRmxleEl0ZW0oUmVuZGVyQm94JiBmbGV4SXRlbSwgTGF5b3V0VW5pdCk7 CiAgICAgaW5saW5lIE92ZXJmbG93QWxpZ25tZW50IG92ZXJmbG93QWxpZ25tZW50Rm9yRmxleEl0 ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29uc3Q7CiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgU2l6ZVR5cGU+IGJvb2wgY2FuQ29tcHV0ZVBlcmNlbnRhZ2VGbGV4QmFzaXMoY29uc3QgUmVu ZGVyQm94JiBmbGV4SXRlbSwgY29uc3QgU2l6ZVR5cGUmLCBVcGRhdGVQZXJjZW50YWdlSGVpZ2h0 RGVzY2VuZGFudHMpOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpemVUeXBlPiBib29sIGZsZXhJ dGVtTWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFNpemVUeXBlJik7 CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgU2l6ZVR5cGU+IGJvb2wgZmxleEl0ZW1Dcm9zc1NpemVJ c0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFNpemVUeXBlJik7CiAgICAgYm9vbCBu ZWVkVG9TdHJldGNoRmxleEl0ZW1Mb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgZmxleEl0 ZW0pIGNvbnN0OwotICAgIGJvb2wgZmxleEl0ZW1IYXNJbnRyaW5zaWNNYWluQXhpc1NpemUoY29u c3QgUmVuZGVyQm94JiBmbGV4SXRlbSk7CisgICAgYm9vbCBmbGV4SXRlbU5lZWRzQmxvY2tBeGlz U2l6ZShjb25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKTsKICAgICBPdmVyZmxvdyBOT0RFTEVURSBt YWluQXhpc092ZXJmbG93Rm9yRmxleEl0ZW0oY29uc3QgUmVuZGVyQm94JiBmbGV4SXRlbSkgY29u c3Q7CiAgICAgT3ZlcmZsb3cgTk9ERUxFVEUgY3Jvc3NBeGlzT3ZlcmZsb3dGb3JGbGV4SXRlbShj b25zdCBSZW5kZXJCb3gmIGZsZXhJdGVtKSBjb25zdDsKIApAQCAtMzA0LDkgKzMwNCw4IEBAIHBy aXZhdGU6CiAKICAgICBib29sIGxheW91dFVzaW5nRmxleEZvcm1hdHRpbmdDb250ZXh0KCk7CiAK LSAgICAvLyBUaGlzIGlzIHVzZWQgdG8gY2FjaGUgdGhlIHByZWZlcnJlZCBzaXplIGZvciBvcnRo b2dvbmFsIGZsb3cgY2hpbGRyZW4gc28gd2UKLSAgICAvLyBkb24ndCBoYXZlIHRvIHJlbGF5b3V0 IHRvIGdldCBpdAotICAgIEhhc2hNYXA8U2luZ2xlVGhyZWFkV2Vha1JlZjxjb25zdCBSZW5kZXJC b3g+LCBMYXlvdXRVbml0PiBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzOworICAgIC8vIElu bmVyIG1haW4gc2l6ZSBmb3IgZmxleCBpdGVtcyB3aGVyZSBtYWluIGF4aXMgaXMgdGhlIGl0ZW0n cyBibG9jayBheGlzIChjb2x1bW4gZmxleCBvciBvcnRob2dvbmFsKS4KKyAgICBIYXNoTWFwPFNp bmdsZVRocmVhZFdlYWtSZWY8Y29uc3QgUmVuZGVyQm94PiwgTGF5b3V0VW5pdD4gbV9ibG9ja0F4 aXNTaXplOwogICAgIAogICAgIC8vIFRoaXMgaXMgdXNlZCB0byBjYWNoZSB0aGUgaW50cmluc2lj IHNpemUgb24gdGhlIGNyb3NzIGF4aXMgdG8gYXZvaWQKICAgICAvLyByZWxheW91dHMgd2hlbiBz dHJldGNoaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5n L1JlbmRlclRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKaW5kZXggZWNlOTdmM2I2MmI1Li4wNDY3N2ZiNmQ4NzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVl QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyLmNwcApAQCAtMTAxNCw3ICsxMDE0LDcgQEAgc3RhdGljIHZvaWQgcmVzZXRS ZW5kZXJlclN0YXRlT25EZXRhY2goUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXJPYmplY3Qm IGNoaWwKICAgICBlbHNlIGlmIChDaGVja2VkUHRyIHBhcmVudEZsZXhpYmxlQm94ID0gZHluYW1p Y0Rvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQpKSB7CiAgICAgICAgIGlmIChDaGVj a2VkUHRyIGNoaWxkQm94ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJveD4oY2hpbGQpKSB7CiAg ICAgICAgICAgICBwYXJlbnRGbGV4aWJsZUJveC0+Y2xlYXJDYWNoZWRGbGV4SXRlbUludHJpbnNp Y0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCpjaGlsZEJveCk7Ci0gICAgICAgICAgICBwYXJlbnRGbGV4 aWJsZUJveC0+Y2xlYXJDYWNoZWRNYWluU2l6ZUZvckZsZXhJdGVtKCpjaGlsZEJveCk7CisgICAg ICAgICAgICBwYXJlbnRGbGV4aWJsZUJveC0+Y2xlYXJDYWNoZWRCbG9ja0F4aXNTaXplRm9yRmxl eEl0ZW0oKmNoaWxkQm94KTsKICAgICAgICAgfQogICAgIH0KIAo=