257410 2023-05-26 18:48:10 -0700 AX: AXTextMarkerRangeForTextMarkersAttribute needs to support unordered TextMarkers. 2023-05-31 11:03:44 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1958342 0 andresg_22 2023-05-26 18:48:10 -0700 It only works when the passed TextMarkers are ordered, i.e., start < end. 1958343 1 webkit-bug-importer 2023-05-26 18:48:23 -0700 <rdar://problem/109914853> 1958344 2 andresg_22 2023-05-26 18:48:54 -0700 <rdar://problem/109815930> 1958345 3 webkit-bug-importer 2023-05-26 18:49:07 -0700 <rdar://problem/109914891> 1958346 4 466512 andresg_22 2023-05-26 19:41:48 -0700 Created attachment 466512 Patch 1958347 5 andresg_22 2023-05-26 19:52:38 -0700 rdar://problem/109815930 1958769 6 466535 andresg_22 2023-05-30 09:10:37 -0700 Created attachment 466535 Patch 1958825 7 466536 andresg_22 2023-05-30 11:37:00 -0700 Created attachment 466536 Patch 1959019 8 466536 cfleizach 2023-05-31 07:40:33 -0700 Comment on attachment 466536 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466536&action=review > Source/WebCore/accessibility/AXTextMarker.cpp:290 > + auto startBoundaryPoint = marker1.boundaryPoint(); are these pointers? should they be auto* 1959045 9 andresg_22 2023-05-31 08:39:56 -0700 (In reply to chris fleizach from comment #8) > Comment on attachment 466536 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=466536&action=review > > > Source/WebCore/accessibility/AXTextMarker.cpp:290 > > + auto startBoundaryPoint = marker1.boundaryPoint(); > > are these pointers? should they be auto* No, std::optional. 1959081 10 ews-feeder 2023-05-31 11:03:42 -0700 Committed 264742@main (b37f820dae2a): <https://commits.webkit.org/264742@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466536. 466512 2023-05-26 19:41:48 -0700 2023-05-30 09:10:34 -0700 Patch bug-257410-20230526224147.patch text/plain 10284 andresg_22 RnJvbSAzYjQ5OGY3NjA2OWQ5N2M0YmE1NjUzNWE2MmE2NDE3OGJjNTIwMDlhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBGcmksIDI2IE1heSAyMDIzIDIxOjM1OjU5IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEFYVGV4dE1hcmtlclJhbmdlRm9yVGV4dE1hcmtlcnNBdHRyaWJ1dGUgbmVlZHMgdG8gc3Vw cG9ydAogdW5vcmRlcmVkIFRleHRNYXJrZXJzLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjU3NDEwCiA8cmRhcjovL3Byb2JsZW0vMTA5ODE1OTMwPgoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgotIEFkZGVkIGEgcGFydGlhbE9yZGVyIGZ1bmN0aW9uIGZvciBB WFRleHRNcmtlcnMgYW5kIHVzZSBpdCB0byBzd2FwIHRoZSBzdGFydCBhbmQgZW5kIFRleHRNYXJr ZXJzIHBhc3NlZCB0byB0aGUgQVhUZXh0TWFya2VyUmFuZ2UgY29uc3RydWN0b3Igd2hlbiB0aGUg Y2xpZW50IHBhc3NlcyB1bm9yZGVyZWQgbWFya2Vycy4KLSBNb2RpZmllZCB0aGUgQVhUZXh0TWFy a2VyIG9wZXJhdG9ycyB0byBjb252ZXJ0IHRvIFZpc2libGVQb3NpdGlvbiBhbmQgQ2hhcmFjdGVy T2Zmc2V0IHRvIGluaXRpYWxpemUgdGhlIE5vZGUgKiBtZW1iZXIgdmFyaWFibGUgaWYgbmVlZGVk LgoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJh bmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKiBMYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5v cmRlcmVkLW1hcmtlcnMuaHRtbDogQWRkZWQuCiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWFRleHRNYXJrZXIuY3BwOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpzZXROb2RlSWZOZWVk ZWQgY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpvcGVyYXRvciBWaXNpYmxlUG9zaXRp b24gY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpvcGVyYXRvciBDaGFyYWN0ZXJPZmZz ZXQgY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyUmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdl KToKKFdlYkNvcmU6OnBhcnRpYWxPcmRlcik6CihXZWJDb3JlOjpBWFRleHRNYXJrZXI6OnNldE5v ZGUpOgpSZW5hbWVkIHNldE5vZGVJZk5lZWRlZC4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYVGV4dE1hcmtlci5oOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2Ev QVhUZXh0TWFya2VyQ29jb2EubW06CihXZWJDb3JlOjpBWFRleHRNYXJrZXI6OkFYVGV4dE1hcmtl cik6Ci0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuY3BwIHwg NDQgKysrKysrKysrKysrKysrLS0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRl eHRNYXJrZXIuaCAgIHwgIDMgKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2NvY29hL0FYVGV4dE1hcmtl ckNvY29hLm1tICB8ICA0ICstCiAuLi4tcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFya2Vycy1leHBl Y3RlZC50eHQgfCAxMyArKysrKysKIC4uLnQtbWFya2VyLXJhbmdlLXdpdGgtdW5vcmRlcmVkLW1h cmtlcnMuaHRtbCB8IDQwICsrKysrKysrKysrKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDkzIGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvdGV4dC1tYXJrZXIvdGV4dC1tYXJrZXItcmFuZ2Utd2l0aC11bm9y ZGVyZWQtbWFya2Vycy1leHBlY3RlZC50eHQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5vcmRl cmVkLW1hcmtlcnMuaHRtbAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhUZXh0TWFya2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhUZXh0 TWFya2VyLmNwcAppbmRleCA2OWU5YTNjNTYzYzQuLjBiZGE5ZTQwNjQ5YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhUZXh0TWFya2VyLmNwcApAQCAtMTA2LDEwICsxMDYs MTEgQEAgQVhUZXh0TWFya2VyOjpBWFRleHRNYXJrZXIoY29uc3QgQ2hhcmFjdGVyT2Zmc2V0JiBj aGFyYWN0ZXJPZmZzZXQpCiAgICAgICAgIG1fZGF0YSA9IGNhY2hlLT50ZXh0TWFya2VyRGF0YUZv ckNoYXJhY3Rlck9mZnNldChjaGFyYWN0ZXJPZmZzZXQpOwogfQogCi12b2lkIEFYVGV4dE1hcmtl cjo6c2V0Tm9kZSgpCit2b2lkIEFYVGV4dE1hcmtlcjo6c2V0Tm9kZUlmTmVlZGVkKCkgY29uc3QK IHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIEFTU0VSVCghbV9kYXRhLm5vZGUp OworICAgIGlmIChtX2RhdGEubm9kZSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgV2Vha1B0ciBj YWNoZSA9IHN0ZDo6Z2V0PFdlYWtQdHI8QVhPYmplY3RDYWNoZT4+KGF4VHJlZUZvcklEKHRyZWVJ RCgpKSk7CiAgICAgaWYgKCFjYWNoZSkKQEAgLTEyMyw3ICsxMjQsNyBAQCB2b2lkIEFYVGV4dE1h cmtlcjo6c2V0Tm9kZSgpCiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm47CiAKLSAgICBt X2RhdGEubm9kZSA9IG5vZGUuZ2V0KCk7CisgICAgY29uc3RfY2FzdDxBWFRleHRNYXJrZXIqPih0 aGlzKS0+bV9kYXRhLm5vZGUgPSBub2RlLmdldCgpOwogICAgIGNhY2hlLT5zZXROb2RlSW5Vc2Uo bm9kZS5nZXQoKSk7CiB9CiAKQEAgLTEzMiw3ICsxMzMsMTEgQEAgQVhUZXh0TWFya2VyOjpvcGVy YXRvciBWaXNpYmxlUG9zaXRpb24oKSBjb25zdAogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7 CiAKICAgICBXZWFrUHRyIGNhY2hlID0gQVhUcmVlU3RvcmU8QVhPYmplY3RDYWNoZT46OmF4T2Jq ZWN0Q2FjaGVGb3JJRCh0cmVlSUQoKSk7Ci0gICAgcmV0dXJuIGNhY2hlID8gY2FjaGUtPnZpc2li bGVQb3NpdGlvbkZvclRleHRNYXJrZXJEYXRhKG1fZGF0YSkgOiBWaXNpYmxlUG9zaXRpb24oKTsK KyAgICBpZiAoIWNhY2hlKQorICAgICAgICByZXR1cm4geyB9OworCisgICAgc2V0Tm9kZUlmTmVl ZGVkKCk7CisgICAgcmV0dXJuIGNhY2hlLT52aXNpYmxlUG9zaXRpb25Gb3JUZXh0TWFya2VyRGF0 YShtX2RhdGEpOwogfQogCiBBWFRleHRNYXJrZXI6Om9wZXJhdG9yIENoYXJhY3Rlck9mZnNldCgp IGNvbnN0CkBAIC0xNDIsNiArMTQ3LDcgQEAgQVhUZXh0TWFya2VyOjpvcGVyYXRvciBDaGFyYWN0 ZXJPZmZzZXQoKSBjb25zdAogICAgIGlmIChpc0lnbm9yZWQoKSB8fCBpc051bGwoKSkKICAgICAg ICAgcmV0dXJuIHsgfTsKIAorICAgIHNldE5vZGVJZk5lZWRlZCgpOwogICAgIENoYXJhY3Rlck9m ZnNldCByZXN1bHQobV9kYXRhLm5vZGUsIG1fZGF0YS5jaGFyYWN0ZXJTdGFydCwgbV9kYXRhLmNo YXJhY3Rlck9mZnNldCk7CiAgICAgLy8gV2hlbiB3ZSBhcmUgYXQgYSBsaW5lIHdyYXAgYW5kIHRo ZSBWaXNpYmxlUG9zaXRpb24gaXMgdXBzdHJlYW0sIGl0IG1lYW5zIHRoZSB0ZXh0IG1hcmtlciBp cyBhdCB0aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBsaW5lLgogICAgIC8vIFdlIHVzZSB0aGUgcHJl dmlvdXMgQ2hhcmFjdGVyT2Zmc2V0IHNvIHRoYXQgaXQgd2lsbCBtYXRjaCB0aGUgUmFuZ2UuCkBA IC0yMzYsMTUgKzI0MiwxOCBAQCBBWFRleHRNYXJrZXJSYW5nZTo6QVhUZXh0TWFya2VyUmFuZ2Uo Y29uc3Qgc3RkOjpvcHRpb25hbDxTaW1wbGVSYW5nZT4mIHJhbmdlKQogfQogCiBBWFRleHRNYXJr ZXJSYW5nZTo6QVhUZXh0TWFya2VyUmFuZ2UoY29uc3QgQVhUZXh0TWFya2VyJiBzdGFydCwgY29u c3QgQVhUZXh0TWFya2VyJiBlbmQpCi0gICAgOiBtX3N0YXJ0KHN0YXJ0KQotICAgICwgbV9lbmQo ZW5kKQogeworICAgIGJvb2wgcmV2ZXJzZSA9IGlzX2d0KHBhcnRpYWxPcmRlcihzdGFydCwgZW5k KSk7CisgICAgbV9zdGFydCA9IHJldmVyc2UgPyBlbmQgOiBzdGFydDsKKyAgICBtX2VuZCA9IHJl dmVyc2UgPyBzdGFydCA6IGVuZDsKIH0KIAogQVhUZXh0TWFya2VyUmFuZ2U6OkFYVGV4dE1hcmtl clJhbmdlKEFYSUQgdHJlZUlELCBBWElEIG9iamVjdElELCB1bnNpZ25lZCBzdGFydCwgdW5zaWdu ZWQgZW5kKQotICAgIDogbV9zdGFydCh7IHRyZWVJRCwgb2JqZWN0SUQsIG51bGxwdHIsIHN0YXJ0 LCBQb3NpdGlvbjo6UG9zaXRpb25Jc09mZnNldEluQW5jaG9yLCBBZmZpbml0eTo6RG93bnN0cmVh bSwgMCwgc3RhcnQgfSkKLSAgICAsIG1fZW5kKHsgdHJlZUlELCBvYmplY3RJRCwgbnVsbHB0ciwg ZW5kLCBQb3NpdGlvbjo6UG9zaXRpb25Jc09mZnNldEluQW5jaG9yLCBBZmZpbml0eTo6RG93bnN0 cmVhbSwgMCwgZW5kIH0pCiB7CisgICAgaWYgKHN0YXJ0ID4gZW5kKQorICAgICAgICBzdGQ6OnN3 YXAoc3RhcnQsIGVuZCk7CisgICAgbV9zdGFydCA9IEFYVGV4dE1hcmtlcih7IHRyZWVJRCwgb2Jq ZWN0SUQsIG51bGxwdHIsIHN0YXJ0LCBQb3NpdGlvbjo6UG9zaXRpb25Jc09mZnNldEluQW5jaG9y LCBBZmZpbml0eTo6RG93bnN0cmVhbSwgMCwgc3RhcnQgfSk7CisgICAgbV9lbmQgPSBBWFRleHRN YXJrZXIoeyB0cmVlSUQsIG9iamVjdElELCBudWxscHRyLCBlbmQsIFBvc2l0aW9uOjpQb3NpdGlv bklzT2Zmc2V0SW5BbmNob3IsIEFmZmluaXR5OjpEb3duc3RyZWFtLCAwLCBlbmQgfSk7CiB9CiAK IEFYVGV4dE1hcmtlclJhbmdlOjpvcGVyYXRvciBWaXNpYmxlUG9zaXRpb25SYW5nZSgpIGNvbnN0 CkBAIC0yNjYsNCArMjc1LDIzIEBAIHN0ZDo6b3B0aW9uYWw8U2ltcGxlUmFuZ2U+IEFYVGV4dE1h cmtlclJhbmdlOjpzaW1wbGVSYW5nZSgpIGNvbnN0CiAgICAgcmV0dXJuIHsgeyAqc3RhcnRCb3Vu ZGFyeVBvaW50LCAqZW5kQm91bmRhcnlQb2ludCB9IH07CiB9CiAKK3N0ZDo6cGFydGlhbF9vcmRl cmluZyBwYXJ0aWFsT3JkZXIoY29uc3QgQVhUZXh0TWFya2VyJiBtYXJrZXIxLCBjb25zdCBBWFRl eHRNYXJrZXImIG1hcmtlcjIpCit7CisgICAgaWYgKG1hcmtlcjEub2JqZWN0SUQoKSA9PSBtYXJr ZXIyLm9iamVjdElEKCkgJiYgbWFya2VyMS50cmVlSUQoKSA9PSBtYXJrZXIyLnRyZWVJRCgpKSB7 CisgICAgICAgIGlmIChMSUtFTFkobWFya2VyMS5tX2RhdGEuY2hhcmFjdGVyT2Zmc2V0IDwgbWFy a2VyMi5tX2RhdGEuY2hhcmFjdGVyT2Zmc2V0KSkKKyAgICAgICAgICAgIHJldHVybiBzdGQ6OnBh cnRpYWxfb3JkZXJpbmc6Omxlc3M7CisgICAgICAgIGlmIChtYXJrZXIxLm1fZGF0YS5jaGFyYWN0 ZXJPZmZzZXQgPiBtYXJrZXIyLm1fZGF0YS5jaGFyYWN0ZXJPZmZzZXQpCisgICAgICAgICAgICBy ZXR1cm4gc3RkOjpwYXJ0aWFsX29yZGVyaW5nOjpncmVhdGVyOworICAgICAgICByZXR1cm4gc3Rk OjpwYXJ0aWFsX29yZGVyaW5nOjplcXVpdmFsZW50OworICAgIH0KKworICAgIGF1dG8gcmVzdWx0 ID0gc3RkOjpwYXJ0aWFsX29yZGVyaW5nOjp1bm9yZGVyZWQ7CisgICAgQWNjZXNzaWJpbGl0eTo6 cGVyZm9ybUZ1bmN0aW9uT25NYWluVGhyZWFkQW5kV2FpdChbbWFya2VyMSA9IFdURk1vdmUobWFy a2VyMSksIG1hcmtlcjIgPSBXVEZNb3ZlKG1hcmtlcjIpLCAmcmVzdWx0XSAoKSB7CisgICAgICAg IFBvc2l0aW9uIHBvc2l0aW9uMSA9IFZpc2libGVQb3NpdGlvbihtYXJrZXIxKS5kZWVwRXF1aXZh bGVudCgpOworICAgICAgICBQb3NpdGlvbiBwb3NpdGlvbjIgPSBWaXNpYmxlUG9zaXRpb24obWFy a2VyMikuZGVlcEVxdWl2YWxlbnQoKTsKKyAgICAgICAgcmVzdWx0ID0gZG9jdW1lbnRPcmRlcihw b3NpdGlvbjEsIHBvc2l0aW9uMik7CisgICAgfSk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWFRleHRNYXJrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhU ZXh0TWFya2VyLmgKaW5kZXggZjAwNmY2NmFjMTg5Li4wOTNmMjdlNDFlNjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhUZXh0TWFya2VyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuaApAQCAtOTQsNiArOTQsNyBAQCB1 c2luZyBQbGF0Zm9ybVRleHRNYXJrZXJEYXRhID0gTlNEYXRhICo7OwogY2xhc3MgQVhUZXh0TWFy a2VyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBmcmllbmQgY2xhc3MgQVhU ZXh0TWFya2VyUmFuZ2U7CisgICAgZnJpZW5kIHN0ZDo6cGFydGlhbF9vcmRlcmluZyBwYXJ0aWFs T3JkZXIoY29uc3QgQVhUZXh0TWFya2VyJiwgY29uc3QgQVhUZXh0TWFya2VyJik7CiBwdWJsaWM6 CiAgICAgLy8gQ29uc3RydWN0b3JzCiAgICAgQVhUZXh0TWFya2VyKGNvbnN0IFZpc2libGVQb3Np dGlvbiYpOwpAQCAtMTM0LDcgKzEzNSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICAvLyBT ZXRzIG1fZGF0YS5ub2RlIHdoZW4gdGhlIG1hcmtlciBpcyBiZWluZyBjcmVhdGVkIHdpdGggYSBQ bGF0Zm9ybVRleHRNYXJrZXJEYXRhIHRoYXQgbGFja3MgdGhlIG5vZGUgcG9pbnRlciBiZWNhdXNl IGl0IHdhcyBjcmVhdGVkIG9mZiB0aGUgbWFpbiB0aHJlYWQuCi0gICAgdm9pZCBzZXROb2RlKCk7 CisgICAgdm9pZCBzZXROb2RlSWZOZWVkZWQoKSBjb25zdDsKICAgICBUZXh0TWFya2VyRGF0YSBt X2RhdGE7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nv Y29hL0FYVGV4dE1hcmtlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9j b2NvYS9BWFRleHRNYXJrZXJDb2NvYS5tbQppbmRleCAwODRkMmQ1YWY1ZjkuLjQ5NWY0M2Y3Yzli MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jb2NvYS9BWFRleHRN YXJrZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2NvY29hL0FY VGV4dE1hcmtlckNvY29hLm1tCkBAIC01NCw4ICs1NCw4IEBAIEFYVGV4dE1hcmtlcjo6QVhUZXh0 TWFya2VyKFBsYXRmb3JtVGV4dE1hcmtlckRhdGEgcGxhdGZvcm1EYXRhKQogICAgIFtwbGF0Zm9y bURhdGEgZ2V0Qnl0ZXM6Jm1fZGF0YSBsZW5ndGg6c2l6ZW9mKG1fZGF0YSldOwogI2VuZGlmCiAK LSAgICBpZiAoaXNNYWluVGhyZWFkKCkgJiYgIW1fZGF0YS5ub2RlKQotICAgICAgICBzZXROb2Rl KCk7CisgICAgaWYgKGlzTWFpblRocmVhZCgpKQorICAgICAgICBzZXROb2RlSWZOZWVkZWQoKTsK IH0KIAogUmV0YWluUHRyPFBsYXRmb3JtVGV4dE1hcmtlckRhdGE+IEFYVGV4dE1hcmtlcjo6cGxh dGZvcm1EYXRhKCkgY29uc3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv dGV4dC1tYXJrZXIvdGV4dC1tYXJrZXItcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFya2Vycy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFy a2VyLXJhbmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uNTFiNmZjNTViNGY1Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1y YW5nZS13aXRoLXVub3JkZXJlZC1tYXJrZXJzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEzIEBA CitUaGlzIHRlc3QgZW5zdXJlcyB0aGF0IGNsaWV0bnMgY2FuIGJ1aWxkIGFuIEFYVGV4dE1hcmtl clJhbmdlIGZyb20gdW5vcmRlcmVkIFRleHRNYXJrZXJzLCBpLmUuLCBzdGFydCA+IGVuZC4KKwor UEFTUzogdGV4dC5zdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UocmFuZ2UpID09PSAnVGhpcyBpcyBh IHBhcmFncmFwaC4nCitQQVNTOiB0ZXh0LnRleHRNYXJrZXJSYW5nZUxlbmd0aChyYW5nZSkgPT09 IDIwCitQQVNTOiB0ZXh0LnN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZShyYW5nZTEpID09PSAnVGhp cyBpcyBhIHBhcmFncmFwaC4nCitQQVNTOiB0ZXh0LnRleHRNYXJrZXJSYW5nZUxlbmd0aChyYW5n ZTEpID09PSAyMAorUEFTUzogdGV4dC5zdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UocmFuZ2UyKSA9 PT0gJ3BhcmEnCitQQVNTOiB0ZXh0LnRleHRNYXJrZXJSYW5nZUxlbmd0aChyYW5nZTIpID09PSA0 CisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFy a2VyLXJhbmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvdGV4dC1tYXJrZXIvdGV4dC1tYXJrZXItcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFy a2Vycy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uYTkzM2Jh ZmNlMzg1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90ZXh0 LW1hcmtlci90ZXh0LW1hcmtlci1yYW5nZS13aXRoLXVub3JkZXJlZC1tYXJrZXJzLmh0bWwKQEAg LTAsMCArMSw0MCBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBz cmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIu Li8uLi9yZXNvdXJjZXMvYWNjZXNzaWJpbGl0eS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHk+CisKKzxwIGlkPSJ0ZXh0Ij5UaGlzIGlzIGEgcGFyYWdyYXBoLjwvcD4KKworPHNj cmlwdD4KK2lmIChhY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgIGxldCBvdXRwdXQgPSAi VGhpcyB0ZXN0IGVuc3VyZXMgdGhhdCBjbGlldG5zIGNhbiBidWlsZCBhbiBBWFRleHRNYXJrZXJS YW5nZSBmcm9tIHVub3JkZXJlZCBUZXh0TWFya2VycywgaS5lLiwgc3RhcnQgPiBlbmQuXG5cbiI7 CisKKyAgICB2YXIgdGV4dCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVt ZW50QnlJZCgidGV4dCIpLmNoaWxkQXRJbmRleCgwKTsKKyAgICB2YXIgcmFuZ2UgPSB0ZXh0LnRl eHRNYXJrZXJSYW5nZUZvckVsZW1lbnQodGV4dCk7CisgICAgb3V0cHV0ICs9IGV4cGVjdCgidGV4 dC5zdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UocmFuZ2UpIiwgIidUaGlzIGlzIGEgcGFyYWdyYXBo LiciKTsKKyAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0ZXh0LnRleHRNYXJrZXJSYW5nZUxlbmd0aChy YW5nZSkiLCAiMjAiKTsKKworICAgIGxldCBzdGFydCA9IHRleHQuc3RhcnRUZXh0TWFya2VyRm9y VGV4dE1hcmtlclJhbmdlKHJhbmdlKTsKKyAgICBsZXQgZW5kID0gdGV4dC5lbmRUZXh0TWFya2Vy Rm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlKTsKKyAgICB2YXIgcmFuZ2UxID0gdGV4dC50ZXh0TWFy a2VyUmFuZ2VGb3JNYXJrZXJzKGVuZCwgc3RhcnQpOworICAgIG91dHB1dCArPSBleHBlY3QoInRl eHQuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlMSkiLCAiJ1RoaXMgaXMgYSBwYXJhZ3Jh cGguJyIpOworICAgIG91dHB1dCArPSBleHBlY3QoInRleHQudGV4dE1hcmtlclJhbmdlTGVuZ3Ro KHJhbmdlMSkiLCAiMjAiKTsKKworICAgIC8vIEdldCB0aGUgcmFuZ2UgZm9yIHRoZSBzdWJzdHJp bmcgInBhcmEiIGFuZCBlbnN1cmUgdGhhdCBpdCB3b3JrcyBmb3IgdW5vcmRlcmVkIG1hcmtlcnMu CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgKytpKQorICAgICAgICBzdGFydCA9IHRleHQu bmV4dFRleHRNYXJrZXIoc3RhcnQpOworICAgIGZvciAobGV0IGkgPSAwOyBpIDwgNjsgKytpKQor ICAgICAgICBlbmQgPSB0ZXh0LnByZXZpb3VzVGV4dE1hcmtlcihlbmQpOworICAgIHZhciByYW5n ZTIgPSB0ZXh0LnRleHRNYXJrZXJSYW5nZUZvck1hcmtlcnMoZW5kLCBzdGFydCk7CisgICAgb3V0 cHV0ICs9IGV4cGVjdCgidGV4dC5zdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UocmFuZ2UyKSIsICIn cGFyYSciKTsKKyAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0ZXh0LnRleHRNYXJrZXJSYW5nZUxlbmd0 aChyYW5nZTIpIiwgIjQiKTsKKworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXh0Iiku c3R5bGUudmlzaWJpbGl0eSA9ICJoaWRkZW4iOworICAgIGRlYnVnKG91dHB1dCk7Cit9Cis8L3Nj cmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 466535 2023-05-30 09:10:37 -0700 2023-05-30 11:36:57 -0700 Patch bug-257410-20230530121036.patch text/plain 10390 andresg_22 RnJvbSAyZWQzYWM4MGE1ODU0ZjJlOWZiMjdhOWNkY2Q0ZDViZTdjZDc4YTgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBGcmksIDI2IE1heSAyMDIzIDIxOjM1OjU5IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEFYVGV4dE1hcmtlclJhbmdlRm9yVGV4dE1hcmtlcnNBdHRyaWJ1dGUgbmVlZHMgdG8gc3Vw cG9ydAogdW5vcmRlcmVkIFRleHRNYXJrZXJzLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjU3NDEwCiA8cmRhcjovL3Byb2JsZW0vMTA5ODE1OTMwPgoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgotIEFkZGVkIGEgcGFydGlhbE9yZGVyIGZ1bmN0aW9uIGZvciBB WFRleHRNcmtlcnMgYW5kIHVzZSBpdCB0byBzd2FwIHRoZSBzdGFydCBhbmQgZW5kIFRleHRNYXJr ZXJzIHBhc3NlZCB0byB0aGUgQVhUZXh0TWFya2VyUmFuZ2UgY29uc3RydWN0b3Igd2hlbiB0aGUg Y2xpZW50IHBhc3NlcyB1bm9yZGVyZWQgbWFya2Vycy4KLSBNb2RpZmllZCB0aGUgQVhUZXh0TWFy a2VyIG9wZXJhdG9ycyB0byBjb252ZXJ0IHRvIFZpc2libGVQb3NpdGlvbiBhbmQgQ2hhcmFjdGVy T2Zmc2V0IHRvIGluaXRpYWxpemUgdGhlIE5vZGUgKiBtZW1iZXIgdmFyaWFibGUgaWYgbmVlZGVk LgoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJh bmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKiBMYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5v cmRlcmVkLW1hcmtlcnMuaHRtbDogQWRkZWQuCiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWFRleHRNYXJrZXIuY3BwOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpzZXROb2RlSWZOZWVk ZWQgY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpvcGVyYXRvciBWaXNpYmxlUG9zaXRp b24gY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpvcGVyYXRvciBDaGFyYWN0ZXJPZmZz ZXQgY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyUmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdl KToKKFdlYkNvcmU6OnBhcnRpYWxPcmRlcik6CihXZWJDb3JlOjpBWFRleHRNYXJrZXI6OnNldE5v ZGUpOgpSZW5hbWVkIHNldE5vZGVJZk5lZWRlZC4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYVGV4dE1hcmtlci5oOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2Ev QVhUZXh0TWFya2VyQ29jb2EubW06CihXZWJDb3JlOjpBWFRleHRNYXJrZXI6OkFYVGV4dE1hcmtl cik6Ci0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuY3BwIHwg NDggKysrKysrKysrKysrKysrLS0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRl eHRNYXJrZXIuaCAgIHwgIDMgKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2NvY29hL0FYVGV4dE1hcmtl ckNvY29hLm1tICB8ICA0ICstCiAuLi4tcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFya2Vycy1leHBl Y3RlZC50eHQgfCAxMyArKysrKwogLi4udC1tYXJrZXItcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFy a2Vycy5odG1sIHwgNDAgKysrKysrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA5NyBpbnNl cnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5vcmRl cmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1yYW5nZS13aXRoLXVub3JkZXJl ZC1tYXJrZXJzLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYVGV4dE1hcmtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4dE1h cmtlci5jcHAKaW5kZXggNjllOWEzYzU2M2M0Li42ZDJjOGI5ZDg5NzggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhUZXh0TWFya2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4dE1hcmtlci5jcHAKQEAgLTEwNiwxMCArMTA2LDEx IEBAIEFYVGV4dE1hcmtlcjo6QVhUZXh0TWFya2VyKGNvbnN0IENoYXJhY3Rlck9mZnNldCYgY2hh cmFjdGVyT2Zmc2V0KQogICAgICAgICBtX2RhdGEgPSBjYWNoZS0+dGV4dE1hcmtlckRhdGFGb3JD aGFyYWN0ZXJPZmZzZXQoY2hhcmFjdGVyT2Zmc2V0KTsKIH0KIAotdm9pZCBBWFRleHRNYXJrZXI6 OnNldE5vZGUoKQordm9pZCBBWFRleHRNYXJrZXI6OnNldE5vZGVJZk5lZWRlZCgpIGNvbnN0CiB7 CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBBU1NFUlQoIW1fZGF0YS5ub2RlKTsK KyAgICBpZiAobV9kYXRhLm5vZGUpCisgICAgICAgIHJldHVybjsKIAogICAgIFdlYWtQdHIgY2Fj aGUgPSBzdGQ6OmdldDxXZWFrUHRyPEFYT2JqZWN0Q2FjaGU+PihheFRyZWVGb3JJRCh0cmVlSUQo KSkpOwogICAgIGlmICghY2FjaGUpCkBAIC0xMjMsNyArMTI0LDcgQEAgdm9pZCBBWFRleHRNYXJr ZXI6OnNldE5vZGUoKQogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9k YXRhLm5vZGUgPSBub2RlLmdldCgpOworICAgIGNvbnN0X2Nhc3Q8QVhUZXh0TWFya2VyKj4odGhp cyktPm1fZGF0YS5ub2RlID0gbm9kZS5nZXQoKTsKICAgICBjYWNoZS0+c2V0Tm9kZUluVXNlKG5v ZGUuZ2V0KCkpOwogfQogCkBAIC0xMzIsNyArMTMzLDExIEBAIEFYVGV4dE1hcmtlcjo6b3BlcmF0 b3IgVmlzaWJsZVBvc2l0aW9uKCkgY29uc3QKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwog CiAgICAgV2Vha1B0ciBjYWNoZSA9IEFYVHJlZVN0b3JlPEFYT2JqZWN0Q2FjaGU+OjpheE9iamVj dENhY2hlRm9ySUQodHJlZUlEKCkpOwotICAgIHJldHVybiBjYWNoZSA/IGNhY2hlLT52aXNpYmxl UG9zaXRpb25Gb3JUZXh0TWFya2VyRGF0YShtX2RhdGEpIDogVmlzaWJsZVBvc2l0aW9uKCk7Cisg ICAgaWYgKCFjYWNoZSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIHNldE5vZGVJZk5lZWRl ZCgpOworICAgIHJldHVybiBjYWNoZS0+dmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlckRhdGEo bV9kYXRhKTsKIH0KIAogQVhUZXh0TWFya2VyOjpvcGVyYXRvciBDaGFyYWN0ZXJPZmZzZXQoKSBj b25zdApAQCAtMTQyLDYgKzE0Nyw3IEBAIEFYVGV4dE1hcmtlcjo6b3BlcmF0b3IgQ2hhcmFjdGVy T2Zmc2V0KCkgY29uc3QKICAgICBpZiAoaXNJZ25vcmVkKCkgfHwgaXNOdWxsKCkpCiAgICAgICAg IHJldHVybiB7IH07CiAKKyAgICBzZXROb2RlSWZOZWVkZWQoKTsKICAgICBDaGFyYWN0ZXJPZmZz ZXQgcmVzdWx0KG1fZGF0YS5ub2RlLCBtX2RhdGEuY2hhcmFjdGVyU3RhcnQsIG1fZGF0YS5jaGFy YWN0ZXJPZmZzZXQpOwogICAgIC8vIFdoZW4gd2UgYXJlIGF0IGEgbGluZSB3cmFwIGFuZCB0aGUg VmlzaWJsZVBvc2l0aW9uIGlzIHVwc3RyZWFtLCBpdCBtZWFucyB0aGUgdGV4dCBtYXJrZXIgaXMg YXQgdGhlIGVuZCBvZiB0aGUgcHJldmlvdXMgbGluZS4KICAgICAvLyBXZSB1c2UgdGhlIHByZXZp b3VzIENoYXJhY3Rlck9mZnNldCBzbyB0aGF0IGl0IHdpbGwgbWF0Y2ggdGhlIFJhbmdlLgpAQCAt MjM2LDE1ICsyNDIsMTggQEAgQVhUZXh0TWFya2VyUmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdlKGNv bnN0IHN0ZDo6b3B0aW9uYWw8U2ltcGxlUmFuZ2U+JiByYW5nZSkKIH0KIAogQVhUZXh0TWFya2Vy UmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdlKGNvbnN0IEFYVGV4dE1hcmtlciYgc3RhcnQsIGNvbnN0 IEFYVGV4dE1hcmtlciYgZW5kKQotICAgIDogbV9zdGFydChzdGFydCkKLSAgICAsIG1fZW5kKGVu ZCkKIHsKKyAgICBib29sIHJldmVyc2UgPSBpc19ndChwYXJ0aWFsT3JkZXIoc3RhcnQsIGVuZCkp OworICAgIG1fc3RhcnQgPSByZXZlcnNlID8gZW5kIDogc3RhcnQ7CisgICAgbV9lbmQgPSByZXZl cnNlID8gc3RhcnQgOiBlbmQ7CiB9CiAKIEFYVGV4dE1hcmtlclJhbmdlOjpBWFRleHRNYXJrZXJS YW5nZShBWElEIHRyZWVJRCwgQVhJRCBvYmplY3RJRCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVk IGVuZCkKLSAgICA6IG1fc3RhcnQoeyB0cmVlSUQsIG9iamVjdElELCBudWxscHRyLCBzdGFydCwg UG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciwgQWZmaW5pdHk6OkRvd25zdHJlYW0s IDAsIHN0YXJ0IH0pCi0gICAgLCBtX2VuZCh7IHRyZWVJRCwgb2JqZWN0SUQsIG51bGxwdHIsIGVu ZCwgUG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciwgQWZmaW5pdHk6OkRvd25zdHJl YW0sIDAsIGVuZCB9KQogeworICAgIGlmIChzdGFydCA+IGVuZCkKKyAgICAgICAgc3RkOjpzd2Fw KHN0YXJ0LCBlbmQpOworICAgIG1fc3RhcnQgPSBBWFRleHRNYXJrZXIoeyB0cmVlSUQsIG9iamVj dElELCBudWxscHRyLCBzdGFydCwgUG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciwg QWZmaW5pdHk6OkRvd25zdHJlYW0sIDAsIHN0YXJ0IH0pOworICAgIG1fZW5kID0gQVhUZXh0TWFy a2VyKHsgdHJlZUlELCBvYmplY3RJRCwgbnVsbHB0ciwgZW5kLCBQb3NpdGlvbjo6UG9zaXRpb25J c09mZnNldEluQW5jaG9yLCBBZmZpbml0eTo6RG93bnN0cmVhbSwgMCwgZW5kIH0pOwogfQogCiBB WFRleHRNYXJrZXJSYW5nZTo6b3BlcmF0b3IgVmlzaWJsZVBvc2l0aW9uUmFuZ2UoKSBjb25zdApA QCAtMjY2LDQgKzI3NSwyNyBAQCBzdGQ6Om9wdGlvbmFsPFNpbXBsZVJhbmdlPiBBWFRleHRNYXJr ZXJSYW5nZTo6c2ltcGxlUmFuZ2UoKSBjb25zdAogICAgIHJldHVybiB7IHsgKnN0YXJ0Qm91bmRh cnlQb2ludCwgKmVuZEJvdW5kYXJ5UG9pbnQgfSB9OwogfQogCitzdGQ6OnBhcnRpYWxfb3JkZXJp bmcgcGFydGlhbE9yZGVyKGNvbnN0IEFYVGV4dE1hcmtlciYgbWFya2VyMSwgY29uc3QgQVhUZXh0 TWFya2VyJiBtYXJrZXIyKQoreworICAgIGlmIChtYXJrZXIxLm9iamVjdElEKCkgPT0gbWFya2Vy Mi5vYmplY3RJRCgpICYmIG1hcmtlcjEudHJlZUlEKCkgPT0gbWFya2VyMi50cmVlSUQoKSkgewor ICAgICAgICBpZiAoTElLRUxZKG1hcmtlcjEubV9kYXRhLmNoYXJhY3Rlck9mZnNldCA8IG1hcmtl cjIubV9kYXRhLmNoYXJhY3Rlck9mZnNldCkpCisgICAgICAgICAgICByZXR1cm4gc3RkOjpwYXJ0 aWFsX29yZGVyaW5nOjpsZXNzOworICAgICAgICBpZiAobWFya2VyMS5tX2RhdGEuY2hhcmFjdGVy T2Zmc2V0ID4gbWFya2VyMi5tX2RhdGEuY2hhcmFjdGVyT2Zmc2V0KQorICAgICAgICAgICAgcmV0 dXJuIHN0ZDo6cGFydGlhbF9vcmRlcmluZzo6Z3JlYXRlcjsKKyAgICAgICAgcmV0dXJuIHN0ZDo6 cGFydGlhbF9vcmRlcmluZzo6ZXF1aXZhbGVudDsKKyAgICB9CisKKyAgICBhdXRvIHJlc3VsdCA9 IHN0ZDo6cGFydGlhbF9vcmRlcmluZzo6dW5vcmRlcmVkOworICAgIEFjY2Vzc2liaWxpdHk6OnBl cmZvcm1GdW5jdGlvbk9uTWFpblRocmVhZEFuZFdhaXQoW21hcmtlcjEgPSBXVEZNb3ZlKG1hcmtl cjEpLCBtYXJrZXIyID0gV1RGTW92ZShtYXJrZXIyKSwgJnJlc3VsdF0gKCkgeworICAgICAgICBh dXRvIHN0YXJ0Qm91bmRhcnlQb2ludCA9IG1hcmtlcjEuYm91bmRhcnlQb2ludCgpOworICAgICAg ICBpZiAoIXN0YXJ0Qm91bmRhcnlQb2ludCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg YXV0byBlbmRCb3VuZGFyeVBvaW50ID0gbWFya2VyMi5ib3VuZGFyeVBvaW50KCk7CisgICAgICAg IGlmICghZW5kQm91bmRhcnlQb2ludCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgcmVz dWx0ID0gdHJlZU9yZGVyPENvbXBvc2VkVHJlZT4oKnN0YXJ0Qm91bmRhcnlQb2ludCwgKmVuZEJv dW5kYXJ5UG9pbnQpOworICAgIH0pOworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QVhUZXh0TWFya2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4dE1hcmtl ci5oCmluZGV4IGYwMDZmNjZhYzE4OS4uMDkzZjI3ZTQxZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4dE1hcmtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhUZXh0TWFya2VyLmgKQEAgLTk0LDYgKzk0LDcgQEAgdXNpbmcgUGxh dGZvcm1UZXh0TWFya2VyRGF0YSA9IE5TRGF0YSAqOzsKIGNsYXNzIEFYVGV4dE1hcmtlciB7CiAg ICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgZnJpZW5kIGNsYXNzIEFYVGV4dE1hcmtl clJhbmdlOworICAgIGZyaWVuZCBzdGQ6OnBhcnRpYWxfb3JkZXJpbmcgcGFydGlhbE9yZGVyKGNv bnN0IEFYVGV4dE1hcmtlciYsIGNvbnN0IEFYVGV4dE1hcmtlciYpOwogcHVibGljOgogICAgIC8v IENvbnN0cnVjdG9ycwogICAgIEFYVGV4dE1hcmtlcihjb25zdCBWaXNpYmxlUG9zaXRpb24mKTsK QEAgLTEzNCw3ICsxMzUsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgLy8gU2V0cyBtX2Rh dGEubm9kZSB3aGVuIHRoZSBtYXJrZXIgaXMgYmVpbmcgY3JlYXRlZCB3aXRoIGEgUGxhdGZvcm1U ZXh0TWFya2VyRGF0YSB0aGF0IGxhY2tzIHRoZSBub2RlIHBvaW50ZXIgYmVjYXVzZSBpdCB3YXMg Y3JlYXRlZCBvZmYgdGhlIG1haW4gdGhyZWFkLgotICAgIHZvaWQgc2V0Tm9kZSgpOworICAgIHZv aWQgc2V0Tm9kZUlmTmVlZGVkKCkgY29uc3Q7CiAgICAgVGV4dE1hcmtlckRhdGEgbV9kYXRhOwog fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jb2NvYS9BWFRl eHRNYXJrZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2EvQVhU ZXh0TWFya2VyQ29jb2EubW0KaW5kZXggMDg0ZDJkNWFmNWY5Li40OTVmNDNmN2M5YjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2EvQVhUZXh0TWFya2VyQ29j b2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jb2NvYS9BWFRleHRNYXJr ZXJDb2NvYS5tbQpAQCAtNTQsOCArNTQsOCBAQCBBWFRleHRNYXJrZXI6OkFYVGV4dE1hcmtlcihQ bGF0Zm9ybVRleHRNYXJrZXJEYXRhIHBsYXRmb3JtRGF0YSkKICAgICBbcGxhdGZvcm1EYXRhIGdl dEJ5dGVzOiZtX2RhdGEgbGVuZ3RoOnNpemVvZihtX2RhdGEpXTsKICNlbmRpZgogCi0gICAgaWYg KGlzTWFpblRocmVhZCgpICYmICFtX2RhdGEubm9kZSkKLSAgICAgICAgc2V0Tm9kZSgpOworICAg IGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAgICAgc2V0Tm9kZUlmTmVlZGVkKCk7CiB9CiAKIFJl dGFpblB0cjxQbGF0Zm9ybVRleHRNYXJrZXJEYXRhPiBBWFRleHRNYXJrZXI6OnBsYXRmb3JtRGF0 YSgpIGNvbnN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFy a2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1yYW5n ZS13aXRoLXVub3JkZXJlZC1tYXJrZXJzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAuLjUxYjZmYzU1YjRmNQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvdGV4dC1tYXJrZXIvdGV4dC1tYXJrZXItcmFuZ2Utd2l0 aC11bm9yZGVyZWQtbWFya2Vycy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMyBAQAorVGhpcyB0 ZXN0IGVuc3VyZXMgdGhhdCBjbGlldG5zIGNhbiBidWlsZCBhbiBBWFRleHRNYXJrZXJSYW5nZSBm cm9tIHVub3JkZXJlZCBUZXh0TWFya2VycywgaS5lLiwgc3RhcnQgPiBlbmQuCisKK1BBU1M6IHRl eHQuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlKSA9PT0gJ1RoaXMgaXMgYSBwYXJhZ3Jh cGguJworUEFTUzogdGV4dC50ZXh0TWFya2VyUmFuZ2VMZW5ndGgocmFuZ2UpID09PSAyMAorUEFT UzogdGV4dC5zdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UocmFuZ2UxKSA9PT0gJ1RoaXMgaXMgYSBw YXJhZ3JhcGguJworUEFTUzogdGV4dC50ZXh0TWFya2VyUmFuZ2VMZW5ndGgocmFuZ2UxKSA9PT0g MjAKK1BBU1M6IHRleHQuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlMikgPT09ICdwYXJh JworUEFTUzogdGV4dC50ZXh0TWFya2VyUmFuZ2VMZW5ndGgocmFuZ2UyKSA9PT0gNAorCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1yYW5n ZS13aXRoLXVub3JkZXJlZC1tYXJrZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmE5MzNiYWZjZTM4NQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvdGV4dC1tYXJrZXIv dGV4dC1tYXJrZXItcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFya2Vycy5odG1sCkBAIC0wLDAgKzEs NDAgQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8u Li9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVz b3VyY2VzL2FjY2Vzc2liaWxpdHktaGVscGVyLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 PgorCis8cCBpZD0idGV4dCI+VGhpcyBpcyBhIHBhcmFncmFwaC48L3A+CisKKzxzY3JpcHQ+Citp ZiAoYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICBsZXQgb3V0cHV0ID0gIlRoaXMgdGVz dCBlbnN1cmVzIHRoYXQgY2xpZXRucyBjYW4gYnVpbGQgYW4gQVhUZXh0TWFya2VyUmFuZ2UgZnJv bSB1bm9yZGVyZWQgVGV4dE1hcmtlcnMsIGkuZS4sIHN0YXJ0ID4gZW5kLlxuXG4iOworCisgICAg dmFyIHRleHQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQo InRleHQiKS5jaGlsZEF0SW5kZXgoMCk7CisgICAgdmFyIHJhbmdlID0gdGV4dC50ZXh0TWFya2Vy UmFuZ2VGb3JFbGVtZW50KHRleHQpOworICAgIG91dHB1dCArPSBleHBlY3QoInRleHQuc3RyaW5n Rm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlKSIsICInVGhpcyBpcyBhIHBhcmFncmFwaC4nIik7Cisg ICAgb3V0cHV0ICs9IGV4cGVjdCgidGV4dC50ZXh0TWFya2VyUmFuZ2VMZW5ndGgocmFuZ2UpIiwg IjIwIik7CisKKyAgICBsZXQgc3RhcnQgPSB0ZXh0LnN0YXJ0VGV4dE1hcmtlckZvclRleHRNYXJr ZXJSYW5nZShyYW5nZSk7CisgICAgbGV0IGVuZCA9IHRleHQuZW5kVGV4dE1hcmtlckZvclRleHRN YXJrZXJSYW5nZShyYW5nZSk7CisgICAgdmFyIHJhbmdlMSA9IHRleHQudGV4dE1hcmtlclJhbmdl Rm9yTWFya2VycyhlbmQsIHN0YXJ0KTsKKyAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0ZXh0LnN0cmlu Z0ZvclRleHRNYXJrZXJSYW5nZShyYW5nZTEpIiwgIidUaGlzIGlzIGEgcGFyYWdyYXBoLiciKTsK KyAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0ZXh0LnRleHRNYXJrZXJSYW5nZUxlbmd0aChyYW5nZTEp IiwgIjIwIik7CisKKyAgICAvLyBHZXQgdGhlIHJhbmdlIGZvciB0aGUgc3Vic3RyaW5nICJwYXJh IiBhbmQgZW5zdXJlIHRoYXQgaXQgd29ya3MgZm9yIHVub3JkZXJlZCBtYXJrZXJzLgorICAgIGZv ciAobGV0IGkgPSAwOyBpIDwgMTA7ICsraSkKKyAgICAgICAgc3RhcnQgPSB0ZXh0Lm5leHRUZXh0 TWFya2VyKHN0YXJ0KTsKKyAgICBmb3IgKGxldCBpID0gMDsgaSA8IDY7ICsraSkKKyAgICAgICAg ZW5kID0gdGV4dC5wcmV2aW91c1RleHRNYXJrZXIoZW5kKTsKKyAgICB2YXIgcmFuZ2UyID0gdGV4 dC50ZXh0TWFya2VyUmFuZ2VGb3JNYXJrZXJzKGVuZCwgc3RhcnQpOworICAgIG91dHB1dCArPSBl eHBlY3QoInRleHQuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlMikiLCAiJ3BhcmEnIik7 CisgICAgb3V0cHV0ICs9IGV4cGVjdCgidGV4dC50ZXh0TWFya2VyUmFuZ2VMZW5ndGgocmFuZ2Uy KSIsICI0Iik7CisKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGV4dCIpLnN0eWxlLnZp c2liaWxpdHkgPSAiaGlkZGVuIjsKKyAgICBkZWJ1ZyhvdXRwdXQpOworfQorPC9zY3JpcHQ+Cis8 L2JvZHk+Cis8L2h0bWw+Cg== 466536 2023-05-30 11:37:00 -0700 2023-05-31 11:03:43 -0700 Patch bug-257410-20230530143659.patch text/plain 10328 andresg_22 RnJvbSA3YjRiNDM5ZWY4MDgzYzkyMzg0MTgxYWUwZWViNzhhNDI4OWEyNjk1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBGcmksIDI2IE1heSAyMDIzIDIxOjM1OjU5IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEFYVGV4dE1hcmtlclJhbmdlRm9yVGV4dE1hcmtlcnNBdHRyaWJ1dGUgbmVlZHMgdG8gc3Vw cG9ydAogdW5vcmRlcmVkIFRleHRNYXJrZXJzLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjU3NDEwCiA8cmRhcjovL3Byb2JsZW0vMTA5ODE1OTMwPgoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgotIEFkZGVkIGEgcGFydGlhbE9yZGVyIGZ1bmN0aW9uIGZvciBB WFRleHRNcmtlcnMgYW5kIHVzZSBpdCB0byBzd2FwIHRoZSBzdGFydCBhbmQgZW5kIFRleHRNYXJr ZXJzIHBhc3NlZCB0byB0aGUgQVhUZXh0TWFya2VyUmFuZ2UgY29uc3RydWN0b3Igd2hlbiB0aGUg Y2xpZW50IHBhc3NlcyB1bm9yZGVyZWQgbWFya2Vycy4KLSBNb2RpZmllZCB0aGUgQVhUZXh0TWFy a2VyIG9wZXJhdG9ycyB0byBjb252ZXJ0IHRvIFZpc2libGVQb3NpdGlvbiBhbmQgQ2hhcmFjdGVy T2Zmc2V0IHRvIGluaXRpYWxpemUgdGhlIE5vZGUgKiBtZW1iZXIgdmFyaWFibGUgaWYgbmVlZGVk LgoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJh bmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKiBMYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5v cmRlcmVkLW1hcmtlcnMuaHRtbDogQWRkZWQuCiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWFRleHRNYXJrZXIuY3BwOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpzZXROb2RlSWZOZWVk ZWQgY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpvcGVyYXRvciBWaXNpYmxlUG9zaXRp b24gY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyOjpvcGVyYXRvciBDaGFyYWN0ZXJPZmZz ZXQgY29uc3QpOgooV2ViQ29yZTo6QVhUZXh0TWFya2VyUmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdl KToKKFdlYkNvcmU6OnBhcnRpYWxPcmRlcik6CihXZWJDb3JlOjpBWFRleHRNYXJrZXI6OnNldE5v ZGUpOgpSZW5hbWVkIHNldE5vZGVJZk5lZWRlZC4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYVGV4dE1hcmtlci5oOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2Ev QVhUZXh0TWFya2VyQ29jb2EubW06CihXZWJDb3JlOjpBWFRleHRNYXJrZXI6OkFYVGV4dE1hcmtl cik6Ci0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuY3BwIHwg NDggKysrKysrKysrKysrKysrLS0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRl eHRNYXJrZXIuaCAgIHwgIDMgKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2NvY29hL0FYVGV4dE1hcmtl ckNvY29hLm1tICB8ICA0ICstCiAuLi4tcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFya2Vycy1leHBl Y3RlZC50eHQgfCAxMyArKysrKwogLi4udC1tYXJrZXItcmFuZ2Utd2l0aC11bm9yZGVyZWQtbWFy a2Vycy5odG1sIHwgNDAgKysrKysrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA5NyBpbnNl cnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5vcmRl cmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1yYW5nZS13aXRoLXVub3JkZXJl ZC1tYXJrZXJzLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYVGV4dE1hcmtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4dE1h cmtlci5jcHAKaW5kZXggNjllOWEzYzU2M2M0Li4xMWRmMmIwOTExM2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhUZXh0TWFya2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4dE1hcmtlci5jcHAKQEAgLTEwNiwxMCArMTA2LDEx IEBAIEFYVGV4dE1hcmtlcjo6QVhUZXh0TWFya2VyKGNvbnN0IENoYXJhY3Rlck9mZnNldCYgY2hh cmFjdGVyT2Zmc2V0KQogICAgICAgICBtX2RhdGEgPSBjYWNoZS0+dGV4dE1hcmtlckRhdGFGb3JD aGFyYWN0ZXJPZmZzZXQoY2hhcmFjdGVyT2Zmc2V0KTsKIH0KIAotdm9pZCBBWFRleHRNYXJrZXI6 OnNldE5vZGUoKQordm9pZCBBWFRleHRNYXJrZXI6OnNldE5vZGVJZk5lZWRlZCgpIGNvbnN0CiB7 CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBBU1NFUlQoIW1fZGF0YS5ub2RlKTsK KyAgICBpZiAobV9kYXRhLm5vZGUpCisgICAgICAgIHJldHVybjsKIAogICAgIFdlYWtQdHIgY2Fj aGUgPSBzdGQ6OmdldDxXZWFrUHRyPEFYT2JqZWN0Q2FjaGU+PihheFRyZWVGb3JJRCh0cmVlSUQo KSkpOwogICAgIGlmICghY2FjaGUpCkBAIC0xMjMsNyArMTI0LDcgQEAgdm9pZCBBWFRleHRNYXJr ZXI6OnNldE5vZGUoKQogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9k YXRhLm5vZGUgPSBub2RlLmdldCgpOworICAgIGNvbnN0X2Nhc3Q8QVhUZXh0TWFya2VyKj4odGhp cyktPm1fZGF0YS5ub2RlID0gbm9kZS5nZXQoKTsKICAgICBjYWNoZS0+c2V0Tm9kZUluVXNlKG5v ZGUuZ2V0KCkpOwogfQogCkBAIC0xMzIsNyArMTMzLDExIEBAIEFYVGV4dE1hcmtlcjo6b3BlcmF0 b3IgVmlzaWJsZVBvc2l0aW9uKCkgY29uc3QKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwog CiAgICAgV2Vha1B0ciBjYWNoZSA9IEFYVHJlZVN0b3JlPEFYT2JqZWN0Q2FjaGU+OjpheE9iamVj dENhY2hlRm9ySUQodHJlZUlEKCkpOwotICAgIHJldHVybiBjYWNoZSA/IGNhY2hlLT52aXNpYmxl UG9zaXRpb25Gb3JUZXh0TWFya2VyRGF0YShtX2RhdGEpIDogVmlzaWJsZVBvc2l0aW9uKCk7Cisg ICAgaWYgKCFjYWNoZSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIHNldE5vZGVJZk5lZWRl ZCgpOworICAgIHJldHVybiBjYWNoZS0+dmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlckRhdGEo bV9kYXRhKTsKIH0KIAogQVhUZXh0TWFya2VyOjpvcGVyYXRvciBDaGFyYWN0ZXJPZmZzZXQoKSBj b25zdApAQCAtMTQyLDYgKzE0Nyw3IEBAIEFYVGV4dE1hcmtlcjo6b3BlcmF0b3IgQ2hhcmFjdGVy T2Zmc2V0KCkgY29uc3QKICAgICBpZiAoaXNJZ25vcmVkKCkgfHwgaXNOdWxsKCkpCiAgICAgICAg IHJldHVybiB7IH07CiAKKyAgICBzZXROb2RlSWZOZWVkZWQoKTsKICAgICBDaGFyYWN0ZXJPZmZz ZXQgcmVzdWx0KG1fZGF0YS5ub2RlLCBtX2RhdGEuY2hhcmFjdGVyU3RhcnQsIG1fZGF0YS5jaGFy YWN0ZXJPZmZzZXQpOwogICAgIC8vIFdoZW4gd2UgYXJlIGF0IGEgbGluZSB3cmFwIGFuZCB0aGUg VmlzaWJsZVBvc2l0aW9uIGlzIHVwc3RyZWFtLCBpdCBtZWFucyB0aGUgdGV4dCBtYXJrZXIgaXMg YXQgdGhlIGVuZCBvZiB0aGUgcHJldmlvdXMgbGluZS4KICAgICAvLyBXZSB1c2UgdGhlIHByZXZp b3VzIENoYXJhY3Rlck9mZnNldCBzbyB0aGF0IGl0IHdpbGwgbWF0Y2ggdGhlIFJhbmdlLgpAQCAt MjM2LDE1ICsyNDIsMTggQEAgQVhUZXh0TWFya2VyUmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdlKGNv bnN0IHN0ZDo6b3B0aW9uYWw8U2ltcGxlUmFuZ2U+JiByYW5nZSkKIH0KIAogQVhUZXh0TWFya2Vy UmFuZ2U6OkFYVGV4dE1hcmtlclJhbmdlKGNvbnN0IEFYVGV4dE1hcmtlciYgc3RhcnQsIGNvbnN0 IEFYVGV4dE1hcmtlciYgZW5kKQotICAgIDogbV9zdGFydChzdGFydCkKLSAgICAsIG1fZW5kKGVu ZCkKIHsKKyAgICBib29sIHJldmVyc2UgPSBpc19ndChwYXJ0aWFsT3JkZXIoc3RhcnQsIGVuZCkp OworICAgIG1fc3RhcnQgPSByZXZlcnNlID8gZW5kIDogc3RhcnQ7CisgICAgbV9lbmQgPSByZXZl cnNlID8gc3RhcnQgOiBlbmQ7CiB9CiAKIEFYVGV4dE1hcmtlclJhbmdlOjpBWFRleHRNYXJrZXJS YW5nZShBWElEIHRyZWVJRCwgQVhJRCBvYmplY3RJRCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVk IGVuZCkKLSAgICA6IG1fc3RhcnQoeyB0cmVlSUQsIG9iamVjdElELCBudWxscHRyLCBzdGFydCwg UG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciwgQWZmaW5pdHk6OkRvd25zdHJlYW0s IDAsIHN0YXJ0IH0pCi0gICAgLCBtX2VuZCh7IHRyZWVJRCwgb2JqZWN0SUQsIG51bGxwdHIsIGVu ZCwgUG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciwgQWZmaW5pdHk6OkRvd25zdHJl YW0sIDAsIGVuZCB9KQogeworICAgIGlmIChzdGFydCA+IGVuZCkKKyAgICAgICAgc3RkOjpzd2Fw KHN0YXJ0LCBlbmQpOworICAgIG1fc3RhcnQgPSBBWFRleHRNYXJrZXIoeyB0cmVlSUQsIG9iamVj dElELCBudWxscHRyLCBzdGFydCwgUG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciwg QWZmaW5pdHk6OkRvd25zdHJlYW0sIDAsIHN0YXJ0IH0pOworICAgIG1fZW5kID0gQVhUZXh0TWFy a2VyKHsgdHJlZUlELCBvYmplY3RJRCwgbnVsbHB0ciwgZW5kLCBQb3NpdGlvbjo6UG9zaXRpb25J c09mZnNldEluQW5jaG9yLCBBZmZpbml0eTo6RG93bnN0cmVhbSwgMCwgZW5kIH0pOwogfQogCiBB WFRleHRNYXJrZXJSYW5nZTo6b3BlcmF0b3IgVmlzaWJsZVBvc2l0aW9uUmFuZ2UoKSBjb25zdApA QCAtMjY2LDQgKzI3NSwyNyBAQCBzdGQ6Om9wdGlvbmFsPFNpbXBsZVJhbmdlPiBBWFRleHRNYXJr ZXJSYW5nZTo6c2ltcGxlUmFuZ2UoKSBjb25zdAogICAgIHJldHVybiB7IHsgKnN0YXJ0Qm91bmRh cnlQb2ludCwgKmVuZEJvdW5kYXJ5UG9pbnQgfSB9OwogfQogCitzdGQ6OnBhcnRpYWxfb3JkZXJp bmcgcGFydGlhbE9yZGVyKGNvbnN0IEFYVGV4dE1hcmtlciYgbWFya2VyMSwgY29uc3QgQVhUZXh0 TWFya2VyJiBtYXJrZXIyKQoreworICAgIGlmIChtYXJrZXIxLm9iamVjdElEKCkgPT0gbWFya2Vy Mi5vYmplY3RJRCgpICYmIG1hcmtlcjEudHJlZUlEKCkgPT0gbWFya2VyMi50cmVlSUQoKSkgewor ICAgICAgICBpZiAoTElLRUxZKG1hcmtlcjEubV9kYXRhLmNoYXJhY3Rlck9mZnNldCA8IG1hcmtl cjIubV9kYXRhLmNoYXJhY3Rlck9mZnNldCkpCisgICAgICAgICAgICByZXR1cm4gc3RkOjpwYXJ0 aWFsX29yZGVyaW5nOjpsZXNzOworICAgICAgICBpZiAobWFya2VyMS5tX2RhdGEuY2hhcmFjdGVy T2Zmc2V0ID4gbWFya2VyMi5tX2RhdGEuY2hhcmFjdGVyT2Zmc2V0KQorICAgICAgICAgICAgcmV0 dXJuIHN0ZDo6cGFydGlhbF9vcmRlcmluZzo6Z3JlYXRlcjsKKyAgICAgICAgcmV0dXJuIHN0ZDo6 cGFydGlhbF9vcmRlcmluZzo6ZXF1aXZhbGVudDsKKyAgICB9CisKKyAgICBhdXRvIHJlc3VsdCA9 IHN0ZDo6cGFydGlhbF9vcmRlcmluZzo6dW5vcmRlcmVkOworICAgIEFjY2Vzc2liaWxpdHk6OnBl cmZvcm1GdW5jdGlvbk9uTWFpblRocmVhZEFuZFdhaXQoWyZdICgpIHsKKyAgICAgICAgYXV0byBz dGFydEJvdW5kYXJ5UG9pbnQgPSBtYXJrZXIxLmJvdW5kYXJ5UG9pbnQoKTsKKyAgICAgICAgaWYg KCFzdGFydEJvdW5kYXJ5UG9pbnQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGF1dG8g ZW5kQm91bmRhcnlQb2ludCA9IG1hcmtlcjIuYm91bmRhcnlQb2ludCgpOworICAgICAgICBpZiAo IWVuZEJvdW5kYXJ5UG9pbnQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHJlc3VsdCA9 IHRyZWVPcmRlcjxDb21wb3NlZFRyZWU+KCpzdGFydEJvdW5kYXJ5UG9pbnQsICplbmRCb3VuZGFy eVBvaW50KTsKKyAgICB9KTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYVGV4 dE1hcmtlci5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuaApp bmRleCBmMDA2ZjY2YWMxODkuLjA5M2YyN2U0MWU2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWFRleHRNYXJrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYVGV4dE1hcmtlci5oCkBAIC05NCw2ICs5NCw3IEBAIHVzaW5nIFBsYXRmb3Jt VGV4dE1hcmtlckRhdGEgPSBOU0RhdGEgKjs7CiBjbGFzcyBBWFRleHRNYXJrZXIgewogICAgIFdU Rl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIGZyaWVuZCBjbGFzcyBBWFRleHRNYXJrZXJSYW5n ZTsKKyAgICBmcmllbmQgc3RkOjpwYXJ0aWFsX29yZGVyaW5nIHBhcnRpYWxPcmRlcihjb25zdCBB WFRleHRNYXJrZXImLCBjb25zdCBBWFRleHRNYXJrZXImKTsKIHB1YmxpYzoKICAgICAvLyBDb25z dHJ1Y3RvcnMKICAgICBBWFRleHRNYXJrZXIoY29uc3QgVmlzaWJsZVBvc2l0aW9uJik7CkBAIC0x MzQsNyArMTM1LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIC8vIFNldHMgbV9kYXRhLm5v ZGUgd2hlbiB0aGUgbWFya2VyIGlzIGJlaW5nIGNyZWF0ZWQgd2l0aCBhIFBsYXRmb3JtVGV4dE1h cmtlckRhdGEgdGhhdCBsYWNrcyB0aGUgbm9kZSBwb2ludGVyIGJlY2F1c2UgaXQgd2FzIGNyZWF0 ZWQgb2ZmIHRoZSBtYWluIHRocmVhZC4KLSAgICB2b2lkIHNldE5vZGUoKTsKKyAgICB2b2lkIHNl dE5vZGVJZk5lZWRlZCgpIGNvbnN0OwogICAgIFRleHRNYXJrZXJEYXRhIG1fZGF0YTsKIH07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2EvQVhUZXh0TWFy a2VyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2NvY29hL0FYVGV4dE1h cmtlckNvY29hLm1tCmluZGV4IDA4NGQyZDVhZjVmOS4uNDk1ZjQzZjdjOWIzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2NvY29hL0FYVGV4dE1hcmtlckNvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvY29jb2EvQVhUZXh0TWFya2VyQ29j b2EubW0KQEAgLTU0LDggKzU0LDggQEAgQVhUZXh0TWFya2VyOjpBWFRleHRNYXJrZXIoUGxhdGZv cm1UZXh0TWFya2VyRGF0YSBwbGF0Zm9ybURhdGEpCiAgICAgW3BsYXRmb3JtRGF0YSBnZXRCeXRl czombV9kYXRhIGxlbmd0aDpzaXplb2YobV9kYXRhKV07CiAjZW5kaWYKIAotICAgIGlmIChpc01h aW5UaHJlYWQoKSAmJiAhbV9kYXRhLm5vZGUpCi0gICAgICAgIHNldE5vZGUoKTsKKyAgICBpZiAo aXNNYWluVGhyZWFkKCkpCisgICAgICAgIHNldE5vZGVJZk5lZWRlZCgpOwogfQogCiBSZXRhaW5Q dHI8UGxhdGZvcm1UZXh0TWFya2VyRGF0YT4gQVhUZXh0TWFya2VyOjpwbGF0Zm9ybURhdGEoKSBj b25zdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90 ZXh0LW1hcmtlci1yYW5nZS13aXRoLXVub3JkZXJlZC1tYXJrZXJzLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvdGV4dC1tYXJrZXIvdGV4dC1tYXJrZXItcmFuZ2Utd2l0 aC11bm9yZGVyZWQtbWFya2Vycy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwLi41MWI2ZmM1NWI0ZjUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQtbWFya2VyLXJhbmdlLXdpdGgtdW5v cmRlcmVkLW1hcmtlcnMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK1RoaXMgdGVzdCBl bnN1cmVzIHRoYXQgY2xpZXRucyBjYW4gYnVpbGQgYW4gQVhUZXh0TWFya2VyUmFuZ2UgZnJvbSB1 bm9yZGVyZWQgVGV4dE1hcmtlcnMsIGkuZS4sIHN0YXJ0ID4gZW5kLgorCitQQVNTOiB0ZXh0LnN0 cmluZ0ZvclRleHRNYXJrZXJSYW5nZShyYW5nZSkgPT09ICdUaGlzIGlzIGEgcGFyYWdyYXBoLicK K1BBU1M6IHRleHQudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHJhbmdlKSA9PT0gMjAKK1BBU1M6IHRl eHQuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHJhbmdlMSkgPT09ICdUaGlzIGlzIGEgcGFyYWdy YXBoLicKK1BBU1M6IHRleHQudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHJhbmdlMSkgPT09IDIwCitQ QVNTOiB0ZXh0LnN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZShyYW5nZTIpID09PSAncGFyYScKK1BB U1M6IHRleHQudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHJhbmdlMikgPT09IDQKKworUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvdGV4dC1tYXJrZXIvdGV4dC1tYXJrZXItcmFuZ2Utd2l0 aC11bm9yZGVyZWQtbWFya2Vycy5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90ZXh0 LW1hcmtlci90ZXh0LW1hcmtlci1yYW5nZS13aXRoLXVub3JkZXJlZC1tYXJrZXJzLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5hOTMzYmFmY2UzODUKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RleHQtbWFya2VyL3RleHQt bWFya2VyLXJhbmdlLXdpdGgtdW5vcmRlcmVkLW1hcmtlcnMuaHRtbApAQCAtMCwwICsxLDQwIEBA Cis8IURPQ1RZUEUgSFRNTD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVz b3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNl cy9hY2Nlc3NpYmlsaXR5LWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKwor PHAgaWQ9InRleHQiPlRoaXMgaXMgYSBwYXJhZ3JhcGguPC9wPgorCis8c2NyaXB0PgoraWYgKGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgbGV0IG91dHB1dCA9ICJUaGlzIHRlc3QgZW5z dXJlcyB0aGF0IGNsaWV0bnMgY2FuIGJ1aWxkIGFuIEFYVGV4dE1hcmtlclJhbmdlIGZyb20gdW5v cmRlcmVkIFRleHRNYXJrZXJzLCBpLmUuLCBzdGFydCA+IGVuZC5cblxuIjsKKworICAgIHZhciB0 ZXh0ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0 IikuY2hpbGRBdEluZGV4KDApOworICAgIHZhciByYW5nZSA9IHRleHQudGV4dE1hcmtlclJhbmdl Rm9yRWxlbWVudCh0ZXh0KTsKKyAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0ZXh0LnN0cmluZ0ZvclRl eHRNYXJrZXJSYW5nZShyYW5nZSkiLCAiJ1RoaXMgaXMgYSBwYXJhZ3JhcGguJyIpOworICAgIG91 dHB1dCArPSBleHBlY3QoInRleHQudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHJhbmdlKSIsICIyMCIp OworCisgICAgbGV0IHN0YXJ0ID0gdGV4dC5zdGFydFRleHRNYXJrZXJGb3JUZXh0TWFya2VyUmFu Z2UocmFuZ2UpOworICAgIGxldCBlbmQgPSB0ZXh0LmVuZFRleHRNYXJrZXJGb3JUZXh0TWFya2Vy UmFuZ2UocmFuZ2UpOworICAgIHZhciByYW5nZTEgPSB0ZXh0LnRleHRNYXJrZXJSYW5nZUZvck1h cmtlcnMoZW5kLCBzdGFydCk7CisgICAgb3V0cHV0ICs9IGV4cGVjdCgidGV4dC5zdHJpbmdGb3JU ZXh0TWFya2VyUmFuZ2UocmFuZ2UxKSIsICInVGhpcyBpcyBhIHBhcmFncmFwaC4nIik7CisgICAg b3V0cHV0ICs9IGV4cGVjdCgidGV4dC50ZXh0TWFya2VyUmFuZ2VMZW5ndGgocmFuZ2UxKSIsICIy MCIpOworCisgICAgLy8gR2V0IHRoZSByYW5nZSBmb3IgdGhlIHN1YnN0cmluZyAicGFyYSIgYW5k IGVuc3VyZSB0aGF0IGl0IHdvcmtzIGZvciB1bm9yZGVyZWQgbWFya2Vycy4KKyAgICBmb3IgKGxl dCBpID0gMDsgaSA8IDEwOyArK2kpCisgICAgICAgIHN0YXJ0ID0gdGV4dC5uZXh0VGV4dE1hcmtl cihzdGFydCk7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCA2OyArK2kpCisgICAgICAgIGVuZCA9 IHRleHQucHJldmlvdXNUZXh0TWFya2VyKGVuZCk7CisgICAgdmFyIHJhbmdlMiA9IHRleHQudGV4 dE1hcmtlclJhbmdlRm9yTWFya2VycyhlbmQsIHN0YXJ0KTsKKyAgICBvdXRwdXQgKz0gZXhwZWN0 KCJ0ZXh0LnN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZShyYW5nZTIpIiwgIidwYXJhJyIpOworICAg IG91dHB1dCArPSBleHBlY3QoInRleHQudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHJhbmdlMikiLCAi NCIpOworCisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHQiKS5zdHlsZS52aXNpYmls aXR5ID0gImhpZGRlbiI7CisgICAgZGVidWcob3V0cHV0KTsKK30KKzwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgo=