261376 2023-09-09 13:26:43 -0700 AX: No accessibility label is exposed for display:contents role="treeitem" elements that have a newline before their child text 2023-09-10 00:14:20 -0700 1 1 1 Unclassified WebKit Accessibility Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1976648 0 tyler_w 2023-09-09 13:26:43 -0700 ... 1976649 1 webkit-bug-importer 2023-09-09 13:26:55 -0700 <rdar://problem/115226509> 1976650 2 467622 tyler_w 2023-09-09 13:33:31 -0700 Created attachment 467622 Patch 1976651 3 467622 tyler_w 2023-09-09 13:36:29 -0700 Comment on attachment 467622 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=467622&action=review > LayoutTests/accessibility/display-contents/tree-and-treeitems-expected.txt:14 > + AXDescription: Animals Prior to this patch, this description was blank. > LayoutTests/accessibility/display-contents/tree-and-treeitems-expected.txt:25 > + AXDescription: Birds Prior to this patch, this description was "Birds Cats", even though "Cats" is the text under an entirely different element. 1976652 4 467622 cfleizach 2023-09-09 14:04:26 -0700 Comment on attachment 467622 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=467622&action=review > Source/WebCore/accessibility/AccessibilityNodeObject.cpp:2392 > + if (childParentElement && is<Element>(node) && childParentElement != node) does it matter that node is an Element at this place? 1976653 5 467623 tyler_w 2023-09-09 14:24:09 -0700 Created attachment 467623 Patch 1976654 6 tyler_w 2023-09-09 14:24:59 -0700 (In reply to chris fleizach from comment #4) > Comment on attachment 467622 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=467622&action=review > > > Source/WebCore/accessibility/AccessibilityNodeObject.cpp:2392 > > + if (childParentElement && is<Element>(node) && childParentElement != node) > > does it matter that node is an Element at this place? Fixed! 1976655 7 467624 tyler_w 2023-09-09 14:30:41 -0700 Created attachment 467624 Patch 1976656 8 467625 tyler_w 2023-09-09 14:31:59 -0700 Created attachment 467625 Patch 1976666 9 467627 tyler_w 2023-09-09 17:46:36 -0700 Created attachment 467627 Patch 1976688 10 ews-feeder 2023-09-10 00:14:18 -0700 Committed 267839@main (6d76fb13fc78): <https://commits.webkit.org/267839@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467627. 467622 2023-09-09 13:33:31 -0700 2023-09-09 14:24:07 -0700 Patch bug-261376-20230909133330.patch text/plain 9653 tyler_w RnJvbSAzZmYxYjU0MTM0ZGFhNTAxMmRhNTk0OWNlM2FjNzQ0M2RhNGZmMWVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCA5IFNlcCAyMDIzIDEzOjI2OjQ4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IE5v IGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMgZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cwogcm9s ZT0idHJlZWl0ZW0iIGVsZW1lbnRzIHRoYXQgaGF2ZSBhIG5ld2xpbmUgYmVmb3JlIHRoZWlyIGNo aWxkIHRleHQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNzYg cmRhcjovL3Byb2JsZW0vMTE1MjI2NTA5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRo aXMgcGF0Y2ggZml4ZXMgdHdvIGJ1Z3M6CgogIDEuIE5vIGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMg ZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cyByb2xlPSJ0cmVlaXRlbSIgZWxlbWVudHMgdGhh dCBoYXZlIGEgbmV3bGluZSBiZWZvcmUgdGhlaXIgY2hpbGQgdGV4dAoKICAyLiBTb21lIGRpc3Bs YXk6Y29udGVudHMgcm9sZT0idHJlZWl0ZW0iIGV4cG9zZSB0ZXh0IGZvciBvdGhlcgogICAgIGVs ZW1lbnRzLCByZXN1bHRpbmcgaW4gdGhhdCB0ZXh0IGJlaW5nIGRvdWJseS1leHBvc2VkCgpUaGUg Zmlyc3Qgd2FzIGNhdXNlZCBieSBhIGxhY2sgb2YgcmVzaWxpZW5jZSBpbiBBY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZC4KQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRleHRVbmRl ckVsZW1lbnQgcmVsaWVzIG9uIGl0ZXJhdGluZyB0aHJvdWdoIGl0cyBhY2Nlc3NpYmxlIGNoaWxk cmVuIGxpa2Ugc286Cgpmb3IgKFJlZlB0ciBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgLi4uIGNvbXB1dGUgQVggdGV4dCAuLi4K fQoKSG93ZXZlciwgZm9yIGVsZW1lbnRzIHRoYXQgQVhPYmplY3RDYWNoZTo6Z2V0T3JDcmVhdGUg ZmFpbHMgdG8gY3JlYXRlIGFuCm9iamVjdCBmb3IsIHdlIHdvdWxkIG5ldmVyIGl0ZXJhdGUgYmVj YXVzZSBmaXJzdENoaWxkIHJldHVybmVkIG51bGxwdHIsCnRodXMgcmVzdWx0aW5nIGluIG5vIEFY IHRleHQgYmVpbmcgZ2F0aGVyZWQuIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpmaXJzdENoaWxk Cm5vdyBkZXRlY3RzIHRoaXMsIGFuZCBpdGVyYXRlcyB1bnRpbCBpdCBmaW5kcyB0aGUgZmlyc3Qg YWNjZXNzaWJsZSBjaGlsZC4KClRoZSBzZWNvbmQgYnVnIHdhcyBjYXVzZWQgYnkgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQKcmVjdXJzaXZlbHkgY2FsbGluZyBhbmQg dGV4dFVuZGVyRWxlbWVudCBmb3IgYW4gZWxlbWVudCB0aGF0IHdhcyBub3QKaXQncyBjaGlsZC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSBkZXRlY3QgdGhpcyBhbmQgY29udGludWUgdGhlIGxvb3Agd2hl bgppdCBoYXBwZW5zLgoKTmV3IHRlc3RjYXNlcyBhZGRlZCB0byBhY2Nlc3NpYmlsaXR5L2Rpc3Bs YXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0 OgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10 cmVlaXRlbXMuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNw cDoKKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmZpcnN0Q2hpbGQgY29uc3QpOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnRleHRVbmRlckVsZW1lbnQgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgotLS0KIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwICAgICB8IDQwICsrKysrKysrKysrKysrKysrKysKIC4u Li9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCB8IDIzICsrKysrKyst LS0tCiAuLi4vQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oICAgICAgICAgICAgfCAgMSAr CiAuLi4vdHJlZS1hbmQtdHJlZWl0ZW1zLWV4cGVjdGVkLnR4dCAgICAgICAgICAgfCAxNCArKysr KysrCiAuLi4vZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMuaHRtbCAgfCAgMyAr KwogNSBmaWxlcyBjaGFuZ2VkLCA3NCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAKaW5kZXggZjE2MDgzNDBmMTAx Li44NjBmOGU0ZTlkYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QVhMb2dnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIu Y3BwCkBAIC0zOTUsNiArMzk1LDQ2IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVh bSYgc3RyZWFtLCBjb25zdCBBY2Nlc3NpYmlsaXR5U2VhcmNoQ3JpdGVyaWEmIGNyCiAgICAgcmV0 dXJuIHN0cmVhbTsKIH0KIAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiBzdHJl YW0sIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlIHNvdXJjZSkKK3sKKyAgICBzd2l0Y2ggKHNvdXJj ZSkgeworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OkFsdGVybmF0aXZlOgorICAg ICAgICBzdHJlYW0gPDwgIkFsdGVybmF0aXZlIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBB Y2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6Q2hpbGRyZW46CisgICAgICAgIHN0cmVhbSA8PCAiQ2hp bGRyZW4iOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNl OjpTdW1tYXJ5OgorICAgICAgICBzdHJlYW0gPDwgIlN1bW1hcnkiOworICAgICAgICBicmVhazsK KyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpIZWxwOgorICAgICAgICBzdHJlYW0g PDwgIkhlbHAiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291 cmNlOjpWaXNpYmxlOgorICAgICAgICBzdHJlYW0gPDwgIlZpc2libGUiOworICAgICAgICBicmVh azsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpUaXRsZVRhZzoKKyAgICAgICAg c3RyZWFtIDw8ICJUaXRsZVRhZyI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJp bGl0eVRleHRTb3VyY2U6OlBsYWNlaG9sZGVyOgorICAgICAgICBzdHJlYW0gPDwgIlBsYWNlaG9s ZGVyIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6 TGFiZWxCeUVsZW1lbnQ6CisgICAgICAgIHN0cmVhbSA8PCAiTGFiZWxCeUVsZW1lbnQiOworICAg ICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpUaXRsZToKKyAg ICAgICAgc3RyZWFtIDw8ICJUaXRsZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNz aWJpbGl0eVRleHRTb3VyY2U6OlN1YnRpdGxlOgorICAgICAgICBzdHJlYW0gPDwgIlN1YnRpdGxl IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6QWN0 aW9uOgorICAgICAgICBzdHJlYW0gPDwgIkFjdGlvbiI7CisgICAgICAgIGJyZWFrOworICAgIH0K KyAgICByZXR1cm4gc3RyZWFtOworfQorCiBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJl YW0mIHN0cmVhbSwgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBpbmNsdXNpb24pCiB7CiAg ICAgc3dpdGNoIChpbmNsdXNpb24pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKaW5kZXggNTU3MDU0MGRkYTE1 Li5iM2U1ZDRkYWVmNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCkBAIC0xMzUsMTYgKzEzNSwyMCBAQCB2 b2lkIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp1cGRhdGVSb2xlKCkKIAogQWNjZXNzaWJpbGl0 eU9iamVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmZpcnN0Q2hpbGQoKSBjb25zdAogewot ICAgIGlmICghbm9kZSgpKQorICAgIGF1dG8qIGN1cnJlbnRDaGlsZCA9IG5vZGUoKSA/IG5vZGUo KS0+Zmlyc3RDaGlsZCgpIDogbnVsbHB0cjsKKyAgICBpZiAoIWN1cnJlbnRDaGlsZCkKICAgICAg ICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgCi0gICAgTm9kZSogZmlyc3RDaGlsZCA9IG5vZGUoKS0+ Zmlyc3RDaGlsZCgpOwogCi0gICAgaWYgKCFmaXJzdENoaWxkKQorICAgIGF1dG8qIGNhY2hlID0g YXhPYmplY3RDYWNoZSgpOworICAgIGlmICghY2FjaGUpCiAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgYXV0byBvYmplY3RDYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKLSAgICByZXR1cm4g b2JqZWN0Q2FjaGUgPyBvYmplY3RDYWNoZS0+Z2V0T3JDcmVhdGUoZmlyc3RDaGlsZCkgOiBudWxs cHRyOworICAgIGF1dG8qIGF4Q3VycmVudENoaWxkID0gY2FjaGUtPmdldE9yQ3JlYXRlKGN1cnJl bnRDaGlsZCk7CisgICAgd2hpbGUgKCFheEN1cnJlbnRDaGlsZCAmJiBjdXJyZW50Q2hpbGQpIHsK KyAgICAgICAgY3VycmVudENoaWxkID0gY3VycmVudENoaWxkLT5uZXh0U2libGluZygpOworICAg ICAgICBheEN1cnJlbnRDaGlsZCA9IGNhY2hlLT5nZXRPckNyZWF0ZShjdXJyZW50Q2hpbGQpOwor ICAgIH0KKyAgICByZXR1cm4gYXhDdXJyZW50Q2hpbGQ7CiB9CiAKIEFjY2Vzc2liaWxpdHlPYmpl Y3QqIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpsYXN0Q2hpbGQoKSBjb25zdApAQCAtMjM4Miw3 ICsyMzg2LDEyIEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGV4dFVuZGVyRWxl bWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vCiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAgLy8g RG8gbm90IHRha2UgdGhlIHRleHRVbmRlckVsZW1lbnQgZm9yIGEgZGlmZmVyZW50IGVsZW1lbnQg KGRldGVybWluZWQgYnkgY2hpbGQncyBlbGVtZW50IHBhcmVudCBub3QgYmVpbmcgdXMsIGFzc3Vt aW5nIHdlIGFyZSBhbiBlbGVtZW50KS4gT3RoZXJ3aXNlIHdlIG1heSBkb3VibHktZXhwb3NlIHRo ZSBzYW1lIHRleHQuCisgICAgICAgIGF1dG8qIGNoaWxkUGFyZW50RWxlbWVudCA9IGNoaWxkLT5u b2RlKCkgPyBjaGlsZC0+bm9kZSgpLT5wYXJlbnRFbGVtZW50KCkgOiBudWxscHRyOworICAgICAg ICBpZiAoY2hpbGRQYXJlbnRFbGVtZW50ICYmIGlzPEVsZW1lbnQ+KG5vZGUpICYmIGNoaWxkUGFy ZW50RWxlbWVudCAhPSBub2RlKQorICAgICAgICAgICAgY29udGludWU7CisKICAgICAgICAgU3Ry aW5nIGNoaWxkVGV4dCA9IGNoaWxkLT50ZXh0VW5kZXJFbGVtZW50KG1vZGUpOwogICAgICAgICBp ZiAoY2hpbGRUZXh0Lmxlbmd0aCgpKQogICAgICAgICAgICAgYXBwZW5kTmFtZVRvU3RyaW5nQnVp bGRlcihidWlsZGVyLCBjaGlsZFRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAppbmRleCA0YzNi NTU5ZTA1YzAuLjFkYmViMTNjZTQ5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTIwMTks NSArMjAxOSw2IEBAIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0m LCBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5KTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChX VEY6OlRleHRTdHJlYW0mLCBjb25zdCBBY2Nlc3NpYmlsaXR5U2VhcmNoQ3JpdGVyaWEmKTsKIFdU Rjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5 T2JqZWN0SW5jbHVzaW9uKTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRT dHJlYW0mLCBjb25zdCBBWENvcmVPYmplY3QmKTsKK1dURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8 PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZSk7CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlz cGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy1leHBl Y3RlZC50eHQKaW5kZXggMzM2M2Y1NDU4OTlkLi5lODhhZjJjOWExNDUgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRl bXMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1j b250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0CkBAIC05LDE3ICs5LDMxIEBA IFBBU1M6IHRyZWVpdGVtMS5pc0V4cGFuZGVkID09PSB0cnVlCiBQQVNTOiB0cmVlaXRlbTEuaGll cmFyY2hpY2FsTGV2ZWwgPT09IDAKIFBBU1M6IHRyZWVpdGVtMS5pc0F0dHJpYnV0ZVN1cHBvcnRl ZCgnQVhWYWx1ZScpID09PSB0cnVlCiBQQVNTOiBjYW5TZXREaXNjbG9zaW5nID09PSB0cnVlCit0 cmVlaXRlbTEgdGV4dDoKKwlBWFRpdGxlOgorCUFYRGVzY3JpcHRpb246IEFuaW1hbHMKKwlBWEhl bHA6CisKIFBBU1M6IHRyZWVpdGVtMi5yb2xlID09PSAnQVhSb2xlOiBBWFJvdycKIFBBU1M6IHRy ZWVpdGVtMi5zdWJyb2xlID09PSAnQVhTdWJyb2xlOiBBWE91dGxpbmVSb3cnCiBQQVNTOiB0cmVl aXRlbTIuaXNFeHBhbmRlZCA9PT0gZmFsc2UKIFBBU1M6IHRyZWVpdGVtMi5oaWVyYXJjaGljYWxM ZXZlbCA9PT0gMQogUEFTUzogdHJlZWl0ZW0yLmRpc2Nsb3NlZEJ5Um93KCkuaXNFcXVhbCh0cmVl aXRlbTEpID09PSB0cnVlCiBQQVNTOiBjYW5TZXREaXNjbG9zaW5nID09PSBmYWxzZQordHJlZWl0 ZW0yIHRleHQ6CisJQVhUaXRsZToKKwlBWERlc2NyaXB0aW9uOiBCaXJkcworCUFYSGVscDoKKwog UEFTUzogdHJlZWl0ZW0zLnN0cmluZ1ZhbHVlID09PSAnQVhWYWx1ZTogQmlyZHMnCiBQQVNTOiBj YW5TZXREaXNjbG9zaW5nID09PSBmYWxzZQogUEFTUzogdHJlZWl0ZW0zLnJvbGUgPT09ICdBWFJv bGU6IEFYUm93JwogUEFTUzogdHJlZWl0ZW0zLnN1YnJvbGUgPT09ICdBWFN1YnJvbGU6IEFYT3V0 bGluZVJvdycKIFBBU1M6IHRyZWVpdGVtMy5pc0V4cGFuZGVkID09PSB0cnVlCit0cmVlaXRlbTMg dGV4dDoKKwlBWFRpdGxlOgorCUFYRGVzY3JpcHRpb246IENhdHMKKwlBWEhlbHA6CiBQQVNTOiB0 cmVlaXRlbTMuaXNTZWxlY3RlZCA9PT0gZmFsc2UKIFBBU1M6IHRyZWVpdGVtMy5pc1NlbGVjdGVk ID09PSB0cnVlCiBQQVNTOiBzZWxlY3RlZFJvdy5pc0VxdWFsKHRyZWVpdGVtMykgPT09IHRydWUK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90 cmVlLWFuZC10cmVlaXRlbXMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxh eS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMuaHRtbAppbmRleCA3ZTZlYWFhMzJiYTYuLmYy ZTBlMDllOTI4NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5 LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMuaHRtbApAQCAtNjMs NiArNjMsNyBAQCBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CiAgICAgb3V0 cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0xLmlzQXR0cmlidXRlU3VwcG9ydGVkKCdBWFZhbHVlJyki LCAidHJ1ZSIpOwogICAgIHZhciBjYW5TZXREaXNjbG9zaW5nID0gdHJlZWl0ZW0xLmlzQXR0cmli dXRlU2V0dGFibGUoJ0FYRGlzY2xvc2luZycpOwogICAgIG91dHB1dCArPSBleHBlY3QoImNhblNl dERpc2Nsb3NpbmciLCAidHJ1ZSIpOworICAgIG91dHB1dCArPSBgdHJlZWl0ZW0xIHRleHQ6XG4k e3BsYXRmb3JtVGV4dEFsdGVybmF0aXZlcyh0cmVlaXRlbTEpfVxuXG5gOwogCiAgICAgdmFyIHRy ZWVpdGVtMiA9IHRyZWVpdGVtMS5kaXNjbG9zZWRSb3dBdEluZGV4KDApOwogICAgIG91dHB1dCAr PSBleHBlY3QoInRyZWVpdGVtMi5yb2xlIiwgIidBWFJvbGU6IEFYUm93JyIpOwpAQCAtNzIsNiAr NzMsNyBAQCBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CiAgICAgb3V0cHV0 ICs9IGV4cGVjdCgidHJlZWl0ZW0yLmRpc2Nsb3NlZEJ5Um93KCkuaXNFcXVhbCh0cmVlaXRlbTEp IiwgInRydWUiKTsKICAgICBjYW5TZXREaXNjbG9zaW5nID0gdHJlZWl0ZW0yLmlzQXR0cmlidXRl U2V0dGFibGUoJ0FYRGlzY2xvc2luZycpOwogICAgIG91dHB1dCArPSBleHBlY3QoImNhblNldERp c2Nsb3NpbmciLCAiZmFsc2UiKTsKKyAgICBvdXRwdXQgKz0gYHRyZWVpdGVtMiB0ZXh0OlxuJHtw bGF0Zm9ybVRleHRBbHRlcm5hdGl2ZXModHJlZWl0ZW0yKX1cblxuYDsKIAogICAgIHZhciB0cmVl aXRlbTMgPSB0cmVlaXRlbTIuY2hpbGRBdEluZGV4KDApOwogICAgIG91dHB1dCArPSBleHBlY3Qo InRyZWVpdGVtMy5zdHJpbmdWYWx1ZSIsICInQVhWYWx1ZTogQmlyZHMnIik7CkBAIC04Myw2ICs4 NSw3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKICAgICBvdXRwdXQg Kz0gZXhwZWN0KCJ0cmVlaXRlbTMucm9sZSIsICInQVhSb2xlOiBBWFJvdyciKTsKICAgICBvdXRw dXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTMuc3Vicm9sZSIsICInQVhTdWJyb2xlOiBBWE91dGxpbmVS b3cnIik7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0zLmlzRXhwYW5kZWQiLCAidHJ1 ZSIpOworICAgIG91dHB1dCArPSBgdHJlZWl0ZW0zIHRleHQ6XG4ke3BsYXRmb3JtVGV4dEFsdGVy bmF0aXZlcyh0cmVlaXRlbTMpfVxuYDsKIAogICAgIHZhciBzZWxlY3RlZFJvdywgdHJlZWl0ZW00 LCB0cmVlaXRlbTUsIHRyZWVpdGVtNjsKICAgICAvLyBUZXN0IHRoYXQgdGhlIHJvdyBjYW4gYmUg c2VsZWN0ZWQgY29ycmVjdGx5Lgo= 467623 2023-09-09 14:24:09 -0700 2023-09-09 14:30:39 -0700 Patch bug-261376-20230909142409.patch text/plain 9869 tyler_w RnJvbSA2ZDU1OWEyZmVhNzU5MzQyNDNhOTZmYzc0MmRhNzQzOGE1NzE0Y2ZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCA5IFNlcCAyMDIzIDEzOjI2OjQ4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IE5v IGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMgZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cwogcm9s ZT0idHJlZWl0ZW0iIGVsZW1lbnRzIHRoYXQgaGF2ZSBhIG5ld2xpbmUgYmVmb3JlIHRoZWlyIGNo aWxkIHRleHQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNzYg cmRhcjovL3Byb2JsZW0vMTE1MjI2NTA5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRo aXMgcGF0Y2ggZml4ZXMgdHdvIGJ1Z3M6CgogIDEuIE5vIGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMg ZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cyByb2xlPSJ0cmVlaXRlbSIgZWxlbWVudHMgdGhh dCBoYXZlIGEgbmV3bGluZSBiZWZvcmUgdGhlaXIgY2hpbGQgdGV4dAoKICAyLiBTb21lIGRpc3Bs YXk6Y29udGVudHMgcm9sZT0idHJlZWl0ZW0iIGV4cG9zZSB0ZXh0IGZvciBvdGhlcgogICAgIGVs ZW1lbnRzLCByZXN1bHRpbmcgaW4gdGhhdCB0ZXh0IGJlaW5nIGRvdWJseS1leHBvc2VkCgpUaGUg Zmlyc3Qgd2FzIGNhdXNlZCBieSBhIGxhY2sgb2YgcmVzaWxpZW5jZSBpbiBBY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZC4KQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRleHRVbmRl ckVsZW1lbnQgcmVsaWVzIG9uIGl0ZXJhdGluZyB0aHJvdWdoIGl0cyBhY2Nlc3NpYmxlIGNoaWxk cmVuIGxpa2Ugc286Cgpmb3IgKFJlZlB0ciBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgLi4uIGNvbXB1dGUgQVggdGV4dCAuLi4K fQoKSG93ZXZlciwgZm9yIGVsZW1lbnRzIHRoYXQgQVhPYmplY3RDYWNoZTo6Z2V0T3JDcmVhdGUg ZmFpbHMgdG8gY3JlYXRlIGFuCm9iamVjdCBmb3IsIHdlIHdvdWxkIG5ldmVyIGl0ZXJhdGUgYmVj YXVzZSBmaXJzdENoaWxkIHJldHVybmVkIG51bGxwdHIsCnRodXMgcmVzdWx0aW5nIGluIG5vIEFY IHRleHQgYmVpbmcgZ2F0aGVyZWQuIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpmaXJzdENoaWxk Cm5vdyBkZXRlY3RzIHRoaXMsIGFuZCBpdGVyYXRlcyB1bnRpbCBpdCBmaW5kcyB0aGUgZmlyc3Qg YWNjZXNzaWJsZSBjaGlsZC4KClRoZSBzZWNvbmQgYnVnIHdhcyBjYXVzZWQgYnkgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQKcmVjdXJzaXZlbHkgY2FsbGluZyBhbmQg dGV4dFVuZGVyRWxlbWVudCBmb3IgYW4gZWxlbWVudCB0aGF0IHdhcyBub3QKaXQncyBjaGlsZC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSBkZXRlY3QgdGhpcyBhbmQgY29udGludWUgdGhlIGxvb3Agd2hl bgppdCBoYXBwZW5zLgoKTmV3IHRlc3RjYXNlcyBhZGRlZCB0byBhY2Nlc3NpYmlsaXR5L2Rpc3Bs YXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0 OgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10 cmVlaXRlbXMuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNw cDoKKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmZpcnN0Q2hpbGQgY29uc3QpOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnRleHRVbmRlckVsZW1lbnQgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgotLS0KIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwICAgICB8IDQwICsrKysrKysrKysrKysrKysrKysKIC4u Li9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCB8IDI3ICsrKysrKysr Ky0tLS0KIC4uLi9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggICAgICAgICAgICB8ICAx ICsKIC4uLi90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0ICAgICAgICAgICB8IDE0ICsr KysrKysKIC4uLi9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sICB8ICAz ICsrCiA1IGZpbGVzIGNoYW5nZWQsIDc3IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCBmMTYwODM0MGYx MDEuLjg2MGY4ZTRlOWRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWExvZ2dlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dl ci5jcHAKQEAgLTM5NSw2ICszOTUsNDYgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3Ry ZWFtJiBzdHJlYW0sIGNvbnN0IEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJpYSYgY3IKICAgICBy ZXR1cm4gc3RyZWFtOwogfQogCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0 cmVhbSwgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2Ugc291cmNlKQoreworICAgIHN3aXRjaCAoc291 cmNlKSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6QWx0ZXJuYXRpdmU6Cisg ICAgICAgIHN0cmVhbSA8PCAiQWx0ZXJuYXRpdmUiOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpDaGlsZHJlbjoKKyAgICAgICAgc3RyZWFtIDw8ICJD aGlsZHJlbiI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3Vy Y2U6OlN1bW1hcnk6CisgICAgICAgIHN0cmVhbSA8PCAiU3VtbWFyeSI7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OkhlbHA6CisgICAgICAgIHN0cmVh bSA8PCAiSGVscCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRT b3VyY2U6OlZpc2libGU6CisgICAgICAgIHN0cmVhbSA8PCAiVmlzaWJsZSI7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlVGFnOgorICAgICAg ICBzdHJlYW0gPDwgIlRpdGxlVGFnIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3Np YmlsaXR5VGV4dFNvdXJjZTo6UGxhY2Vob2xkZXI6CisgICAgICAgIHN0cmVhbSA8PCAiUGxhY2Vo b2xkZXIiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNl OjpMYWJlbEJ5RWxlbWVudDoKKyAgICAgICAgc3RyZWFtIDw8ICJMYWJlbEJ5RWxlbWVudCI7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlOgor ICAgICAgICBzdHJlYW0gPDwgIlRpdGxlIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5VGV4dFNvdXJjZTo6U3VidGl0bGU6CisgICAgICAgIHN0cmVhbSA8PCAiU3VidGl0 bGUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpB Y3Rpb246CisgICAgICAgIHN0cmVhbSA8PCAiQWN0aW9uIjsKKyAgICAgICAgYnJlYWs7CisgICAg fQorICAgIHJldHVybiBzdHJlYW07Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0 cmVhbSYgc3RyZWFtLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGluY2x1c2lvbikKIHsK ICAgICBzd2l0Y2ggKGluY2x1c2lvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAppbmRleCA1NTcwNTQwZGRh MTUuLmE1OTY4MTcyYjcxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKQEAgLTEzNSwxNiArMTM1LDIwIEBA IHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnVwZGF0ZVJvbGUoKQogCiBBY2Nlc3NpYmls aXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZCgpIGNvbnN0CiB7 Ci0gICAgaWYgKCFub2RlKCkpCisgICAgYXV0byogY3VycmVudENoaWxkID0gbm9kZSgpID8gbm9k ZSgpLT5maXJzdENoaWxkKCkgOiBudWxscHRyOworICAgIGlmICghY3VycmVudENoaWxkKQogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAKLSAgICBOb2RlKiBmaXJzdENoaWxkID0gbm9kZSgp LT5maXJzdENoaWxkKCk7CiAKLSAgICBpZiAoIWZpcnN0Q2hpbGQpCisgICAgYXV0byogY2FjaGUg PSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKLSAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOwotICAgIHJldHVy biBvYmplY3RDYWNoZSA/IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShmaXJzdENoaWxkKSA6IG51 bGxwdHI7CisgICAgYXV0byogYXhDdXJyZW50Q2hpbGQgPSBjYWNoZS0+Z2V0T3JDcmVhdGUoY3Vy cmVudENoaWxkKTsKKyAgICB3aGlsZSAoIWF4Q3VycmVudENoaWxkICYmIGN1cnJlbnRDaGlsZCkg eworICAgICAgICBjdXJyZW50Q2hpbGQgPSBjdXJyZW50Q2hpbGQtPm5leHRTaWJsaW5nKCk7Cisg ICAgICAgIGF4Q3VycmVudENoaWxkID0gY2FjaGUtPmdldE9yQ3JlYXRlKGN1cnJlbnRDaGlsZCk7 CisgICAgfQorICAgIHJldHVybiBheEN1cnJlbnRDaGlsZDsKIH0KIAogQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6Omxhc3RDaGlsZCgpIGNvbnN0CkBAIC0yMzgy LDEwICsyMzg2LDE3IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGV4dFVuZGVy RWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vCiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAg Ly8gRG8gbm90IHRha2UgdGhlIHRleHRVbmRlckVsZW1lbnQgZm9yIGEgZGlmZmVyZW50IGVsZW1l bnQgKGRldGVybWluZWQgYnkgY2hpbGQncyBlbGVtZW50IHBhcmVudCBub3QgYmVpbmcgdXMsIGFz c3VtaW5nIHdlIGFyZSBhbiBlbGVtZW50KS4gT3RoZXJ3aXNlIHdlIG1heSBkb3VibHktZXhwb3Nl IHRoZSBzYW1lIHRleHQuCisgICAgICAgIGlmIChub2RlKSB7CisgICAgICAgICAgICBhdXRvKiBj aGlsZFBhcmVudEVsZW1lbnQgPSBjaGlsZC0+bm9kZSgpID8gY2hpbGQtPm5vZGUoKS0+cGFyZW50 RWxlbWVudCgpIDogbnVsbHB0cjsKKyAgICAgICAgICAgIGlmIChjaGlsZFBhcmVudEVsZW1lbnQg JiYgY2hpbGRQYXJlbnRFbGVtZW50ICE9IG5vZGUpCisgICAgICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIH0KKwogICAgICAgICBTdHJpbmcgY2hpbGRUZXh0ID0gY2hpbGQtPnRleHRVbmRl ckVsZW1lbnQobW9kZSk7CiAgICAgICAgIGlmIChjaGlsZFRleHQubGVuZ3RoKCkpCi0gICAgICAg ICAgICBhcHBlbmROYW1lVG9TdHJpbmdCdWlsZGVyKGJ1aWxkZXIsIGNoaWxkVGV4dCk7CisgICAg ICAgICAgICBhcHBlbmROYW1lVG9TdHJpbmdCdWlsZGVyKGJ1aWxkZXIsIFdURk1vdmUoY2hpbGRU ZXh0KSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKS50cmltKGRlcHJl Y2F0ZWRJc1NwYWNlT3JOZXdsaW5lKS5zaW1wbGlmeVdoaXRlU3BhY2UoaXNIVE1MU3BhY2VCdXRO b3RMaW5lQnJlYWspOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAppbmRleCA0YzNiNTU5ZTA1YzAuLjFk YmViMTNjZTQ5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTIwMTksNSArMjAxOSw2IEBA IFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmls aXR5U2VhcmNoS2V5KTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJl YW0mLCBjb25zdCBBY2Nlc3NpYmlsaXR5U2VhcmNoQ3JpdGVyaWEmKTsKIFdURjo6VGV4dFN0cmVh bSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVz aW9uKTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBjb25z dCBBWENvcmVPYmplY3QmKTsKK1dURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRT dHJlYW0mLCBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZSk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50 cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy1leHBlY3RlZC50eHQKaW5k ZXggMzM2M2Y1NDU4OTlkLi5lODhhZjJjOWExNDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVl LWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0CkBAIC05LDE3ICs5LDMxIEBAIFBBU1M6IHRyZWVp dGVtMS5pc0V4cGFuZGVkID09PSB0cnVlCiBQQVNTOiB0cmVlaXRlbTEuaGllcmFyY2hpY2FsTGV2 ZWwgPT09IDAKIFBBU1M6IHRyZWVpdGVtMS5pc0F0dHJpYnV0ZVN1cHBvcnRlZCgnQVhWYWx1ZScp ID09PSB0cnVlCiBQQVNTOiBjYW5TZXREaXNjbG9zaW5nID09PSB0cnVlCit0cmVlaXRlbTEgdGV4 dDoKKwlBWFRpdGxlOgorCUFYRGVzY3JpcHRpb246IEFuaW1hbHMKKwlBWEhlbHA6CisKIFBBU1M6 IHRyZWVpdGVtMi5yb2xlID09PSAnQVhSb2xlOiBBWFJvdycKIFBBU1M6IHRyZWVpdGVtMi5zdWJy b2xlID09PSAnQVhTdWJyb2xlOiBBWE91dGxpbmVSb3cnCiBQQVNTOiB0cmVlaXRlbTIuaXNFeHBh bmRlZCA9PT0gZmFsc2UKIFBBU1M6IHRyZWVpdGVtMi5oaWVyYXJjaGljYWxMZXZlbCA9PT0gMQog UEFTUzogdHJlZWl0ZW0yLmRpc2Nsb3NlZEJ5Um93KCkuaXNFcXVhbCh0cmVlaXRlbTEpID09PSB0 cnVlCiBQQVNTOiBjYW5TZXREaXNjbG9zaW5nID09PSBmYWxzZQordHJlZWl0ZW0yIHRleHQ6CisJ QVhUaXRsZToKKwlBWERlc2NyaXB0aW9uOiBCaXJkcworCUFYSGVscDoKKwogUEFTUzogdHJlZWl0 ZW0zLnN0cmluZ1ZhbHVlID09PSAnQVhWYWx1ZTogQmlyZHMnCiBQQVNTOiBjYW5TZXREaXNjbG9z aW5nID09PSBmYWxzZQogUEFTUzogdHJlZWl0ZW0zLnJvbGUgPT09ICdBWFJvbGU6IEFYUm93Jwog UEFTUzogdHJlZWl0ZW0zLnN1YnJvbGUgPT09ICdBWFN1YnJvbGU6IEFYT3V0bGluZVJvdycKIFBB U1M6IHRyZWVpdGVtMy5pc0V4cGFuZGVkID09PSB0cnVlCit0cmVlaXRlbTMgdGV4dDoKKwlBWFRp dGxlOgorCUFYRGVzY3JpcHRpb246IENhdHMKKwlBWEhlbHA6CiBQQVNTOiB0cmVlaXRlbTMuaXNT ZWxlY3RlZCA9PT0gZmFsc2UKIFBBU1M6IHRyZWVpdGVtMy5pc1NlbGVjdGVkID09PSB0cnVlCiBQ QVNTOiBzZWxlY3RlZFJvdy5pc0VxdWFsKHRyZWVpdGVtMykgPT09IHRydWUKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVl aXRlbXMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90 cmVlLWFuZC10cmVlaXRlbXMuaHRtbAppbmRleCA3ZTZlYWFhMzJiYTYuLmYyZTBlMDllOTI4NCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3Ry ZWUtYW5kLXRyZWVpdGVtcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlz cGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMuaHRtbApAQCAtNjMsNiArNjMsNyBAQCBp ZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CiAgICAgb3V0cHV0ICs9IGV4cGVj dCgidHJlZWl0ZW0xLmlzQXR0cmlidXRlU3VwcG9ydGVkKCdBWFZhbHVlJykiLCAidHJ1ZSIpOwog ICAgIHZhciBjYW5TZXREaXNjbG9zaW5nID0gdHJlZWl0ZW0xLmlzQXR0cmlidXRlU2V0dGFibGUo J0FYRGlzY2xvc2luZycpOwogICAgIG91dHB1dCArPSBleHBlY3QoImNhblNldERpc2Nsb3Npbmci LCAidHJ1ZSIpOworICAgIG91dHB1dCArPSBgdHJlZWl0ZW0xIHRleHQ6XG4ke3BsYXRmb3JtVGV4 dEFsdGVybmF0aXZlcyh0cmVlaXRlbTEpfVxuXG5gOwogCiAgICAgdmFyIHRyZWVpdGVtMiA9IHRy ZWVpdGVtMS5kaXNjbG9zZWRSb3dBdEluZGV4KDApOwogICAgIG91dHB1dCArPSBleHBlY3QoInRy ZWVpdGVtMi5yb2xlIiwgIidBWFJvbGU6IEFYUm93JyIpOwpAQCAtNzIsNiArNzMsNyBAQCBpZiAo d2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgi dHJlZWl0ZW0yLmRpc2Nsb3NlZEJ5Um93KCkuaXNFcXVhbCh0cmVlaXRlbTEpIiwgInRydWUiKTsK ICAgICBjYW5TZXREaXNjbG9zaW5nID0gdHJlZWl0ZW0yLmlzQXR0cmlidXRlU2V0dGFibGUoJ0FY RGlzY2xvc2luZycpOwogICAgIG91dHB1dCArPSBleHBlY3QoImNhblNldERpc2Nsb3NpbmciLCAi ZmFsc2UiKTsKKyAgICBvdXRwdXQgKz0gYHRyZWVpdGVtMiB0ZXh0OlxuJHtwbGF0Zm9ybVRleHRB bHRlcm5hdGl2ZXModHJlZWl0ZW0yKX1cblxuYDsKIAogICAgIHZhciB0cmVlaXRlbTMgPSB0cmVl aXRlbTIuY2hpbGRBdEluZGV4KDApOwogICAgIG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMy5z dHJpbmdWYWx1ZSIsICInQVhWYWx1ZTogQmlyZHMnIik7CkBAIC04Myw2ICs4NSw3IEBAIGlmICh3 aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0 cmVlaXRlbTMucm9sZSIsICInQVhSb2xlOiBBWFJvdyciKTsKICAgICBvdXRwdXQgKz0gZXhwZWN0 KCJ0cmVlaXRlbTMuc3Vicm9sZSIsICInQVhTdWJyb2xlOiBBWE91dGxpbmVSb3cnIik7CiAgICAg b3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0zLmlzRXhwYW5kZWQiLCAidHJ1ZSIpOworICAgIG91 dHB1dCArPSBgdHJlZWl0ZW0zIHRleHQ6XG4ke3BsYXRmb3JtVGV4dEFsdGVybmF0aXZlcyh0cmVl aXRlbTMpfVxuYDsKIAogICAgIHZhciBzZWxlY3RlZFJvdywgdHJlZWl0ZW00LCB0cmVlaXRlbTUs IHRyZWVpdGVtNjsKICAgICAvLyBUZXN0IHRoYXQgdGhlIHJvdyBjYW4gYmUgc2VsZWN0ZWQgY29y cmVjdGx5Lgo= 467624 2023-09-09 14:30:41 -0700 2023-09-09 14:31:57 -0700 Patch bug-261376-20230909143040.patch text/plain 9841 tyler_w RnJvbSAyNGE0YjM4MDA4ZWQyYmUyYTI5YmMwNzM2MzNkYjQ5Y2JhYTZhZGJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCA5IFNlcCAyMDIzIDEzOjI2OjQ4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IE5v IGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMgZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cwogcm9s ZT0idHJlZWl0ZW0iIGVsZW1lbnRzIHRoYXQgaGF2ZSBhIG5ld2xpbmUgYmVmb3JlIHRoZWlyIGNo aWxkIHRleHQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNzYg cmRhcjovL3Byb2JsZW0vMTE1MjI2NTA5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRo aXMgcGF0Y2ggZml4ZXMgdHdvIGJ1Z3M6CgogIDEuIE5vIGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMg ZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cyByb2xlPSJ0cmVlaXRlbSIgZWxlbWVudHMgdGhh dCBoYXZlIGEgbmV3bGluZSBiZWZvcmUgdGhlaXIgY2hpbGQgdGV4dAoKICAyLiBTb21lIGRpc3Bs YXk6Y29udGVudHMgcm9sZT0idHJlZWl0ZW0iIGV4cG9zZSB0ZXh0IGZvciBvdGhlcgogICAgIGVs ZW1lbnRzLCByZXN1bHRpbmcgaW4gdGhhdCB0ZXh0IGJlaW5nIGRvdWJseS1leHBvc2VkCgpUaGUg Zmlyc3Qgd2FzIGNhdXNlZCBieSBhIGxhY2sgb2YgcmVzaWxpZW5jZSBpbiBBY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZC4KQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRleHRVbmRl ckVsZW1lbnQgcmVsaWVzIG9uIGl0ZXJhdGluZyB0aHJvdWdoIGl0cyBhY2Nlc3NpYmxlIGNoaWxk cmVuIGxpa2Ugc286Cgpmb3IgKFJlZlB0ciBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgLi4uIGNvbXB1dGUgQVggdGV4dCAuLi4K fQoKSG93ZXZlciwgZm9yIGVsZW1lbnRzIHRoYXQgQVhPYmplY3RDYWNoZTo6Z2V0T3JDcmVhdGUg ZmFpbHMgdG8gY3JlYXRlIGFuCm9iamVjdCBmb3IsIHdlIHdvdWxkIG5ldmVyIGl0ZXJhdGUgYmVj YXVzZSBmaXJzdENoaWxkIHJldHVybmVkIG51bGxwdHIsCnRodXMgcmVzdWx0aW5nIGluIG5vIEFY IHRleHQgYmVpbmcgZ2F0aGVyZWQuIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpmaXJzdENoaWxk Cm5vdyBkZXRlY3RzIHRoaXMsIGFuZCBpdGVyYXRlcyB1bnRpbCBpdCBmaW5kcyB0aGUgZmlyc3Qg YWNjZXNzaWJsZSBjaGlsZC4KClRoZSBzZWNvbmQgYnVnIHdhcyBjYXVzZWQgYnkgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQKcmVjdXJzaXZlbHkgY2FsbGluZyBhbmQg dGV4dFVuZGVyRWxlbWVudCBmb3IgYW4gZWxlbWVudCB0aGF0IHdhcyBub3QKaXQncyBjaGlsZC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSBkZXRlY3QgdGhpcyBhbmQgY29udGludWUgdGhlIGxvb3Agd2hl bgppdCBoYXBwZW5zLgoKTmV3IHRlc3RjYXNlcyBhZGRlZCB0byBhY2Nlc3NpYmlsaXR5L2Rpc3Bs YXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0 OgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10 cmVlaXRlbXMuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNw cDoKKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmZpcnN0Q2hpbGQgY29uc3QpOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnRleHRVbmRlckVsZW1lbnQgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgotLS0KIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwICAgICB8IDQwICsrKysrKysrKysrKysrKysrKysKIC4u Li9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCB8IDI3ICsrKysrKysr Ky0tLS0KIC4uLi9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggICAgICAgICAgICB8ICAx ICsKIC4uLi90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0ICAgICAgICAgICB8IDE0ICsr KysrKysKIC4uLi9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sICB8ICAz ICsrCiA1IGZpbGVzIGNoYW5nZWQsIDc3IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCBmMTYwODM0MGYx MDEuLjg2MGY4ZTRlOWRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWExvZ2dlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dl ci5jcHAKQEAgLTM5NSw2ICszOTUsNDYgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3Ry ZWFtJiBzdHJlYW0sIGNvbnN0IEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJpYSYgY3IKICAgICBy ZXR1cm4gc3RyZWFtOwogfQogCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0 cmVhbSwgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2Ugc291cmNlKQoreworICAgIHN3aXRjaCAoc291 cmNlKSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6QWx0ZXJuYXRpdmU6Cisg ICAgICAgIHN0cmVhbSA8PCAiQWx0ZXJuYXRpdmUiOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpDaGlsZHJlbjoKKyAgICAgICAgc3RyZWFtIDw8ICJD aGlsZHJlbiI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3Vy Y2U6OlN1bW1hcnk6CisgICAgICAgIHN0cmVhbSA8PCAiU3VtbWFyeSI7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OkhlbHA6CisgICAgICAgIHN0cmVh bSA8PCAiSGVscCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRT b3VyY2U6OlZpc2libGU6CisgICAgICAgIHN0cmVhbSA8PCAiVmlzaWJsZSI7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlVGFnOgorICAgICAg ICBzdHJlYW0gPDwgIlRpdGxlVGFnIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3Np YmlsaXR5VGV4dFNvdXJjZTo6UGxhY2Vob2xkZXI6CisgICAgICAgIHN0cmVhbSA8PCAiUGxhY2Vo b2xkZXIiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNl OjpMYWJlbEJ5RWxlbWVudDoKKyAgICAgICAgc3RyZWFtIDw8ICJMYWJlbEJ5RWxlbWVudCI7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlOgor ICAgICAgICBzdHJlYW0gPDwgIlRpdGxlIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5VGV4dFNvdXJjZTo6U3VidGl0bGU6CisgICAgICAgIHN0cmVhbSA8PCAiU3VidGl0 bGUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpB Y3Rpb246CisgICAgICAgIHN0cmVhbSA8PCAiQWN0aW9uIjsKKyAgICAgICAgYnJlYWs7CisgICAg fQorICAgIHJldHVybiBzdHJlYW07Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0 cmVhbSYgc3RyZWFtLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGluY2x1c2lvbikKIHsK ICAgICBzd2l0Y2ggKGluY2x1c2lvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAppbmRleCA1NTcwNTQwZGRh MTUuLjYyY2YyZjJjMDBiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKQEAgLTEzNSwxNiArMTM1LDIwIEBA IHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnVwZGF0ZVJvbGUoKQogCiBBY2Nlc3NpYmls aXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZCgpIGNvbnN0CiB7 Ci0gICAgaWYgKCFub2RlKCkpCisgICAgYXV0byogY3VycmVudENoaWxkID0gbm9kZSgpID8gbm9k ZSgpLT5maXJzdENoaWxkKCkgOiBudWxscHRyOworICAgIGlmICghY3VycmVudENoaWxkKQogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAKLSAgICBOb2RlKiBmaXJzdENoaWxkID0gbm9kZSgp LT5maXJzdENoaWxkKCk7CiAKLSAgICBpZiAoIWZpcnN0Q2hpbGQpCisgICAgYXV0byogY2FjaGUg PSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKLSAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOwotICAgIHJldHVy biBvYmplY3RDYWNoZSA/IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShmaXJzdENoaWxkKSA6IG51 bGxwdHI7CisgICAgYXV0byogYXhDdXJyZW50Q2hpbGQgPSBjYWNoZS0+Z2V0T3JDcmVhdGUoY3Vy cmVudENoaWxkKTsKKyAgICB3aGlsZSAoIWF4Q3VycmVudENoaWxkICYmIGN1cnJlbnRDaGlsZCkg eworICAgICAgICBjdXJyZW50Q2hpbGQgPSBjdXJyZW50Q2hpbGQtPm5leHRTaWJsaW5nKCk7Cisg ICAgICAgIGF4Q3VycmVudENoaWxkID0gY2FjaGUtPmdldE9yQ3JlYXRlKGN1cnJlbnRDaGlsZCk7 CisgICAgfQorICAgIHJldHVybiBheEN1cnJlbnRDaGlsZDsKIH0KIAogQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6Omxhc3RDaGlsZCgpIGNvbnN0CkBAIC0yMzgy LDEwICsyMzg2LDE3IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGV4dFVuZGVy RWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vCiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAg Ly8gRG8gbm90IHRha2UgdGhlIHRleHRVbmRlckVsZW1lbnQgZm9yIGEgZGlmZmVyZW50IGVsZW1l bnQgKGRldGVybWluZWQgYnkgY2hpbGQncyBlbGVtZW50IHBhcmVudCBub3QgYmVpbmcgdXMpLiBP dGhlcndpc2Ugd2UgbWF5IGRvdWJseS1leHBvc2UgdGhlIHNhbWUgdGV4dC4KKyAgICAgICAgaWYg KG5vZGUpIHsKKyAgICAgICAgICAgIGF1dG8qIGNoaWxkUGFyZW50RWxlbWVudCA9IGNoaWxkLT5u b2RlKCkgPyBjaGlsZC0+bm9kZSgpLT5wYXJlbnRFbGVtZW50KCkgOiBudWxscHRyOworICAgICAg ICAgICAgaWYgKGNoaWxkUGFyZW50RWxlbWVudCAmJiBjaGlsZFBhcmVudEVsZW1lbnQgIT0gbm9k ZSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCiAgICAgICAgIFN0cmlu ZyBjaGlsZFRleHQgPSBjaGlsZC0+dGV4dFVuZGVyRWxlbWVudChtb2RlKTsKICAgICAgICAgaWYg KGNoaWxkVGV4dC5sZW5ndGgoKSkKLSAgICAgICAgICAgIGFwcGVuZE5hbWVUb1N0cmluZ0J1aWxk ZXIoYnVpbGRlciwgY2hpbGRUZXh0KTsKKyAgICAgICAgICAgIGFwcGVuZE5hbWVUb1N0cmluZ0J1 aWxkZXIoYnVpbGRlciwgV1RGTW92ZShjaGlsZFRleHQpKTsKICAgICB9CiAKICAgICByZXR1cm4g YnVpbGRlci50b1N0cmluZygpLnRyaW0oZGVwcmVjYXRlZElzU3BhY2VPck5ld2xpbmUpLnNpbXBs aWZ5V2hpdGVTcGFjZShpc0hUTUxTcGFjZUJ1dE5vdExpbmVCcmVhayk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVy ZmFjZS5oCmluZGV4IDRjM2I1NTllMDVjMC4uMWRiZWIxM2NlNDkzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRl cmZhY2UuaApAQCAtMjAxOSw1ICsyMDE5LDYgQEAgV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8 KFdURjo6VGV4dFN0cmVhbSYsIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXkpOwogV1RGOjpUZXh0U3Ry ZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIGNvbnN0IEFjY2Vzc2liaWxpdHlTZWFy Y2hDcml0ZXJpYSYpOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVh bSYsIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24pOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVy YXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIGNvbnN0IEFYQ29yZU9iamVjdCYpOworV1RGOjpUZXh0 U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIEFjY2Vzc2liaWxpdHlUZXh0U291 cmNlKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Rpc3BsYXktY29udGVudHMvdHJlZS1h bmQtdHJlZWl0ZW1zLWV4cGVjdGVkLnR4dAppbmRleCAzMzYzZjU0NTg5OWQuLmU4OGFmMmM5YTE0 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRz L3RyZWUtYW5kLXRyZWVpdGVtcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy1leHBlY3RlZC50eHQK QEAgLTksMTcgKzksMzEgQEAgUEFTUzogdHJlZWl0ZW0xLmlzRXhwYW5kZWQgPT09IHRydWUKIFBB U1M6IHRyZWVpdGVtMS5oaWVyYXJjaGljYWxMZXZlbCA9PT0gMAogUEFTUzogdHJlZWl0ZW0xLmlz QXR0cmlidXRlU3VwcG9ydGVkKCdBWFZhbHVlJykgPT09IHRydWUKIFBBU1M6IGNhblNldERpc2Ns b3NpbmcgPT09IHRydWUKK3RyZWVpdGVtMSB0ZXh0OgorCUFYVGl0bGU6CisJQVhEZXNjcmlwdGlv bjogQW5pbWFscworCUFYSGVscDoKKwogUEFTUzogdHJlZWl0ZW0yLnJvbGUgPT09ICdBWFJvbGU6 IEFYUm93JwogUEFTUzogdHJlZWl0ZW0yLnN1YnJvbGUgPT09ICdBWFN1YnJvbGU6IEFYT3V0bGlu ZVJvdycKIFBBU1M6IHRyZWVpdGVtMi5pc0V4cGFuZGVkID09PSBmYWxzZQogUEFTUzogdHJlZWl0 ZW0yLmhpZXJhcmNoaWNhbExldmVsID09PSAxCiBQQVNTOiB0cmVlaXRlbTIuZGlzY2xvc2VkQnlS b3coKS5pc0VxdWFsKHRyZWVpdGVtMSkgPT09IHRydWUKIFBBU1M6IGNhblNldERpc2Nsb3Npbmcg PT09IGZhbHNlCit0cmVlaXRlbTIgdGV4dDoKKwlBWFRpdGxlOgorCUFYRGVzY3JpcHRpb246IEJp cmRzCisJQVhIZWxwOgorCiBQQVNTOiB0cmVlaXRlbTMuc3RyaW5nVmFsdWUgPT09ICdBWFZhbHVl OiBCaXJkcycKIFBBU1M6IGNhblNldERpc2Nsb3NpbmcgPT09IGZhbHNlCiBQQVNTOiB0cmVlaXRl bTMucm9sZSA9PT0gJ0FYUm9sZTogQVhSb3cnCiBQQVNTOiB0cmVlaXRlbTMuc3Vicm9sZSA9PT0g J0FYU3Vicm9sZTogQVhPdXRsaW5lUm93JwogUEFTUzogdHJlZWl0ZW0zLmlzRXhwYW5kZWQgPT09 IHRydWUKK3RyZWVpdGVtMyB0ZXh0OgorCUFYVGl0bGU6CisJQVhEZXNjcmlwdGlvbjogQ2F0cwor CUFYSGVscDoKIFBBU1M6IHRyZWVpdGVtMy5pc1NlbGVjdGVkID09PSBmYWxzZQogUEFTUzogdHJl ZWl0ZW0zLmlzU2VsZWN0ZWQgPT09IHRydWUKIFBBU1M6IHNlbGVjdGVkUm93LmlzRXF1YWwodHJl ZWl0ZW0zKSA9PT0gdHJ1ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9k aXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sIGIvTGF5b3V0VGVzdHMvYWNj ZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sCmluZGV4 IDdlNmVhYWEzMmJhNi4uZjJlMGUwOWU5Mjg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2Rpc3BsYXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVp dGVtcy5odG1sCkBAIC02Myw2ICs2Myw3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIpIHsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTEuaXNBdHRyaWJ1dGVTdXBw b3J0ZWQoJ0FYVmFsdWUnKSIsICJ0cnVlIik7CiAgICAgdmFyIGNhblNldERpc2Nsb3NpbmcgPSB0 cmVlaXRlbTEuaXNBdHRyaWJ1dGVTZXR0YWJsZSgnQVhEaXNjbG9zaW5nJyk7CiAgICAgb3V0cHV0 ICs9IGV4cGVjdCgiY2FuU2V0RGlzY2xvc2luZyIsICJ0cnVlIik7CisgICAgb3V0cHV0ICs9IGB0 cmVlaXRlbTEgdGV4dDpcbiR7cGxhdGZvcm1UZXh0QWx0ZXJuYXRpdmVzKHRyZWVpdGVtMSl9XG5c bmA7CiAKICAgICB2YXIgdHJlZWl0ZW0yID0gdHJlZWl0ZW0xLmRpc2Nsb3NlZFJvd0F0SW5kZXgo MCk7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0yLnJvbGUiLCAiJ0FYUm9sZTogQVhS b3cnIik7CkBAIC03Miw2ICs3Myw3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIpIHsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTIuZGlzY2xvc2VkQnlSb3coKS5p c0VxdWFsKHRyZWVpdGVtMSkiLCAidHJ1ZSIpOwogICAgIGNhblNldERpc2Nsb3NpbmcgPSB0cmVl aXRlbTIuaXNBdHRyaWJ1dGVTZXR0YWJsZSgnQVhEaXNjbG9zaW5nJyk7CiAgICAgb3V0cHV0ICs9 IGV4cGVjdCgiY2FuU2V0RGlzY2xvc2luZyIsICJmYWxzZSIpOworICAgIG91dHB1dCArPSBgdHJl ZWl0ZW0yIHRleHQ6XG4ke3BsYXRmb3JtVGV4dEFsdGVybmF0aXZlcyh0cmVlaXRlbTIpfVxuXG5g OwogCiAgICAgdmFyIHRyZWVpdGVtMyA9IHRyZWVpdGVtMi5jaGlsZEF0SW5kZXgoMCk7CiAgICAg b3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0zLnN0cmluZ1ZhbHVlIiwgIidBWFZhbHVlOiBCaXJk cyciKTsKQEAgLTgzLDYgKzg1LDcgQEAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxl cikgewogICAgIG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMy5yb2xlIiwgIidBWFJvbGU6IEFY Um93JyIpOwogICAgIG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMy5zdWJyb2xlIiwgIidBWFN1 YnJvbGU6IEFYT3V0bGluZVJvdyciKTsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTMu aXNFeHBhbmRlZCIsICJ0cnVlIik7CisgICAgb3V0cHV0ICs9IGB0cmVlaXRlbTMgdGV4dDpcbiR7 cGxhdGZvcm1UZXh0QWx0ZXJuYXRpdmVzKHRyZWVpdGVtMyl9XG5gOwogCiAgICAgdmFyIHNlbGVj dGVkUm93LCB0cmVlaXRlbTQsIHRyZWVpdGVtNSwgdHJlZWl0ZW02OwogICAgIC8vIFRlc3QgdGhh dCB0aGUgcm93IGNhbiBiZSBzZWxlY3RlZCBjb3JyZWN0bHkuCg== 467625 2023-09-09 14:31:59 -0700 2023-09-09 17:46:34 -0700 Patch bug-261376-20230909143158.patch text/plain 9845 tyler_w RnJvbSA3YzYxMWJkYTc1OWE0ODI4ODA4NDZmMmZhNDFmZDZmZDI1NmU2OTAxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCA5IFNlcCAyMDIzIDEzOjI2OjQ4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IE5v IGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMgZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cwogcm9s ZT0idHJlZWl0ZW0iIGVsZW1lbnRzIHRoYXQgaGF2ZSBhIG5ld2xpbmUgYmVmb3JlIHRoZWlyIGNo aWxkIHRleHQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNzYg cmRhcjovL3Byb2JsZW0vMTE1MjI2NTA5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRo aXMgcGF0Y2ggZml4ZXMgdHdvIGJ1Z3M6CgogIDEuIE5vIGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMg ZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cyByb2xlPSJ0cmVlaXRlbSIgZWxlbWVudHMgdGhh dCBoYXZlIGEgbmV3bGluZSBiZWZvcmUgdGhlaXIgY2hpbGQgdGV4dAoKICAyLiBTb21lIGRpc3Bs YXk6Y29udGVudHMgcm9sZT0idHJlZWl0ZW0iIGV4cG9zZSB0ZXh0IGZvciBvdGhlcgogICAgIGVs ZW1lbnRzLCByZXN1bHRpbmcgaW4gdGhhdCB0ZXh0IGJlaW5nIGRvdWJseS1leHBvc2VkCgpUaGUg Zmlyc3Qgd2FzIGNhdXNlZCBieSBhIGxhY2sgb2YgcmVzaWxpZW5jZSBpbiBBY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZC4KQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRleHRVbmRl ckVsZW1lbnQgcmVsaWVzIG9uIGl0ZXJhdGluZyB0aHJvdWdoIGl0cyBhY2Nlc3NpYmxlIGNoaWxk cmVuIGxpa2Ugc286Cgpmb3IgKFJlZlB0ciBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgLi4uIGNvbXB1dGUgQVggdGV4dCAuLi4K fQoKSG93ZXZlciwgZm9yIGVsZW1lbnRzIHRoYXQgQVhPYmplY3RDYWNoZTo6Z2V0T3JDcmVhdGUg ZmFpbHMgdG8gY3JlYXRlIGFuCm9iamVjdCBmb3IsIHdlIHdvdWxkIG5ldmVyIGl0ZXJhdGUgYmVj YXVzZSBmaXJzdENoaWxkIHJldHVybmVkIG51bGxwdHIsCnRodXMgcmVzdWx0aW5nIGluIG5vIEFY IHRleHQgYmVpbmcgZ2F0aGVyZWQuIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpmaXJzdENoaWxk Cm5vdyBkZXRlY3RzIHRoaXMsIGFuZCBpdGVyYXRlcyB1bnRpbCBpdCBmaW5kcyB0aGUgZmlyc3Qg YWNjZXNzaWJsZSBjaGlsZC4KClRoZSBzZWNvbmQgYnVnIHdhcyBjYXVzZWQgYnkgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQKcmVjdXJzaXZlbHkgY2FsbGluZyBhbmQg dGV4dFVuZGVyRWxlbWVudCBmb3IgYW4gZWxlbWVudCB0aGF0IHdhcyBub3QKaXQncyBjaGlsZC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSBkZXRlY3QgdGhpcyBhbmQgY29udGludWUgdGhlIGxvb3Agd2hl bgppdCBoYXBwZW5zLgoKTmV3IHRlc3RjYXNlcyBhZGRlZCB0byBhY2Nlc3NpYmlsaXR5L2Rpc3Bs YXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0 OgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10 cmVlaXRlbXMuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNw cDoKKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmZpcnN0Q2hpbGQgY29uc3QpOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnRleHRVbmRlckVsZW1lbnQgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgotLS0KIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwICAgICB8IDQwICsrKysrKysrKysrKysrKysrKysKIC4u Li9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCB8IDI3ICsrKysrKysr Ky0tLS0KIC4uLi9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggICAgICAgICAgICB8ICAx ICsKIC4uLi90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0ICAgICAgICAgICB8IDE0ICsr KysrKysKIC4uLi9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sICB8ICAz ICsrCiA1IGZpbGVzIGNoYW5nZWQsIDc3IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCBmMTYwODM0MGYx MDEuLjg2MGY4ZTRlOWRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWExvZ2dlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dl ci5jcHAKQEAgLTM5NSw2ICszOTUsNDYgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3Ry ZWFtJiBzdHJlYW0sIGNvbnN0IEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJpYSYgY3IKICAgICBy ZXR1cm4gc3RyZWFtOwogfQogCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0 cmVhbSwgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2Ugc291cmNlKQoreworICAgIHN3aXRjaCAoc291 cmNlKSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6QWx0ZXJuYXRpdmU6Cisg ICAgICAgIHN0cmVhbSA8PCAiQWx0ZXJuYXRpdmUiOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpDaGlsZHJlbjoKKyAgICAgICAgc3RyZWFtIDw8ICJD aGlsZHJlbiI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3Vy Y2U6OlN1bW1hcnk6CisgICAgICAgIHN0cmVhbSA8PCAiU3VtbWFyeSI7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OkhlbHA6CisgICAgICAgIHN0cmVh bSA8PCAiSGVscCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRT b3VyY2U6OlZpc2libGU6CisgICAgICAgIHN0cmVhbSA8PCAiVmlzaWJsZSI7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlVGFnOgorICAgICAg ICBzdHJlYW0gPDwgIlRpdGxlVGFnIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3Np YmlsaXR5VGV4dFNvdXJjZTo6UGxhY2Vob2xkZXI6CisgICAgICAgIHN0cmVhbSA8PCAiUGxhY2Vo b2xkZXIiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNl OjpMYWJlbEJ5RWxlbWVudDoKKyAgICAgICAgc3RyZWFtIDw8ICJMYWJlbEJ5RWxlbWVudCI7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlOgor ICAgICAgICBzdHJlYW0gPDwgIlRpdGxlIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5VGV4dFNvdXJjZTo6U3VidGl0bGU6CisgICAgICAgIHN0cmVhbSA8PCAiU3VidGl0 bGUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpB Y3Rpb246CisgICAgICAgIHN0cmVhbSA8PCAiQWN0aW9uIjsKKyAgICAgICAgYnJlYWs7CisgICAg fQorICAgIHJldHVybiBzdHJlYW07Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0 cmVhbSYgc3RyZWFtLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGluY2x1c2lvbikKIHsK ICAgICBzd2l0Y2ggKGluY2x1c2lvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAppbmRleCA1NTcwNTQwZGRh MTUuLjJhMDM5NDdjMTFhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKQEAgLTEzNSwxNiArMTM1LDIwIEBA IHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnVwZGF0ZVJvbGUoKQogCiBBY2Nlc3NpYmls aXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZCgpIGNvbnN0CiB7 Ci0gICAgaWYgKCFub2RlKCkpCisgICAgYXV0byogY3VycmVudENoaWxkID0gbm9kZSgpID8gbm9k ZSgpLT5maXJzdENoaWxkKCkgOiBudWxscHRyOworICAgIGlmICghY3VycmVudENoaWxkKQogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAKLSAgICBOb2RlKiBmaXJzdENoaWxkID0gbm9kZSgp LT5maXJzdENoaWxkKCk7CiAKLSAgICBpZiAoIWZpcnN0Q2hpbGQpCisgICAgYXV0byogY2FjaGUg PSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKLSAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOwotICAgIHJldHVy biBvYmplY3RDYWNoZSA/IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShmaXJzdENoaWxkKSA6IG51 bGxwdHI7CisgICAgYXV0byogYXhDdXJyZW50Q2hpbGQgPSBjYWNoZS0+Z2V0T3JDcmVhdGUoY3Vy cmVudENoaWxkKTsKKyAgICB3aGlsZSAoIWF4Q3VycmVudENoaWxkICYmIGN1cnJlbnRDaGlsZCkg eworICAgICAgICBjdXJyZW50Q2hpbGQgPSBjdXJyZW50Q2hpbGQtPm5leHRTaWJsaW5nKCk7Cisg ICAgICAgIGF4Q3VycmVudENoaWxkID0gY2FjaGUtPmdldE9yQ3JlYXRlKGN1cnJlbnRDaGlsZCk7 CisgICAgfQorICAgIHJldHVybiBheEN1cnJlbnRDaGlsZDsKIH0KIAogQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6Omxhc3RDaGlsZCgpIGNvbnN0CkBAIC0yMzgy LDEwICsyMzg2LDE3IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGV4dFVuZGVy RWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vCiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAg aWYgKG5vZGUpIHsKKyAgICAgICAgICAgIGF1dG8qIGNoaWxkUGFyZW50RWxlbWVudCA9IGNoaWxk LT5ub2RlKCkgPyBjaGlsZC0+bm9kZSgpLT5wYXJlbnRFbGVtZW50KCkgOiBudWxscHRyOworICAg ICAgICAgICAgLy8gRG8gbm90IHRha2UgdGhlIHRleHRVbmRlckVsZW1lbnQgZm9yIGEgZGlmZmVy ZW50IGVsZW1lbnQgKGRldGVybWluZWQgYnkgY2hpbGQncyBlbGVtZW50IHBhcmVudCBub3QgYmVp bmcgdXMpLiBPdGhlcndpc2Ugd2UgbWF5IGRvdWJseS1leHBvc2UgdGhlIHNhbWUgdGV4dC4KKyAg ICAgICAgICAgIGlmIChjaGlsZFBhcmVudEVsZW1lbnQgJiYgY2hpbGRQYXJlbnRFbGVtZW50ICE9 IG5vZGUpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKwogICAgICAgICBT dHJpbmcgY2hpbGRUZXh0ID0gY2hpbGQtPnRleHRVbmRlckVsZW1lbnQobW9kZSk7CiAgICAgICAg IGlmIChjaGlsZFRleHQubGVuZ3RoKCkpCi0gICAgICAgICAgICBhcHBlbmROYW1lVG9TdHJpbmdC dWlsZGVyKGJ1aWxkZXIsIGNoaWxkVGV4dCk7CisgICAgICAgICAgICBhcHBlbmROYW1lVG9TdHJp bmdCdWlsZGVyKGJ1aWxkZXIsIFdURk1vdmUoY2hpbGRUZXh0KSk7CiAgICAgfQogCiAgICAgcmV0 dXJuIGJ1aWxkZXIudG9TdHJpbmcoKS50cmltKGRlcHJlY2F0ZWRJc1NwYWNlT3JOZXdsaW5lKS5z aW1wbGlmeVdoaXRlU3BhY2UoaXNIVE1MU3BhY2VCdXROb3RMaW5lQnJlYWspOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaAppbmRleCA0YzNiNTU5ZTA1YzAuLjFkYmViMTNjZTQ5MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0 SW50ZXJmYWNlLmgKQEAgLTIwMTksNSArMjAxOSw2IEBAIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0 b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5KTsKIFdURjo6VGV4 dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBjb25zdCBBY2Nlc3NpYmlsaXR5 U2VhcmNoQ3JpdGVyaWEmKTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRT dHJlYW0mLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uKTsKIFdURjo6VGV4dFN0cmVhbSYg b3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBjb25zdCBBWENvcmVPYmplY3QmKTsKK1dURjo6 VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5VGV4 dFNvdXJjZSk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3Ry ZWUtYW5kLXRyZWVpdGVtcy1leHBlY3RlZC50eHQKaW5kZXggMzM2M2Y1NDU4OTlkLi5lODhhZjJj OWExNDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250 ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQu dHh0CkBAIC05LDE3ICs5LDMxIEBAIFBBU1M6IHRyZWVpdGVtMS5pc0V4cGFuZGVkID09PSB0cnVl CiBQQVNTOiB0cmVlaXRlbTEuaGllcmFyY2hpY2FsTGV2ZWwgPT09IDAKIFBBU1M6IHRyZWVpdGVt MS5pc0F0dHJpYnV0ZVN1cHBvcnRlZCgnQVhWYWx1ZScpID09PSB0cnVlCiBQQVNTOiBjYW5TZXRE aXNjbG9zaW5nID09PSB0cnVlCit0cmVlaXRlbTEgdGV4dDoKKwlBWFRpdGxlOgorCUFYRGVzY3Jp cHRpb246IEFuaW1hbHMKKwlBWEhlbHA6CisKIFBBU1M6IHRyZWVpdGVtMi5yb2xlID09PSAnQVhS b2xlOiBBWFJvdycKIFBBU1M6IHRyZWVpdGVtMi5zdWJyb2xlID09PSAnQVhTdWJyb2xlOiBBWE91 dGxpbmVSb3cnCiBQQVNTOiB0cmVlaXRlbTIuaXNFeHBhbmRlZCA9PT0gZmFsc2UKIFBBU1M6IHRy ZWVpdGVtMi5oaWVyYXJjaGljYWxMZXZlbCA9PT0gMQogUEFTUzogdHJlZWl0ZW0yLmRpc2Nsb3Nl ZEJ5Um93KCkuaXNFcXVhbCh0cmVlaXRlbTEpID09PSB0cnVlCiBQQVNTOiBjYW5TZXREaXNjbG9z aW5nID09PSBmYWxzZQordHJlZWl0ZW0yIHRleHQ6CisJQVhUaXRsZToKKwlBWERlc2NyaXB0aW9u OiBCaXJkcworCUFYSGVscDoKKwogUEFTUzogdHJlZWl0ZW0zLnN0cmluZ1ZhbHVlID09PSAnQVhW YWx1ZTogQmlyZHMnCiBQQVNTOiBjYW5TZXREaXNjbG9zaW5nID09PSBmYWxzZQogUEFTUzogdHJl ZWl0ZW0zLnJvbGUgPT09ICdBWFJvbGU6IEFYUm93JwogUEFTUzogdHJlZWl0ZW0zLnN1YnJvbGUg PT09ICdBWFN1YnJvbGU6IEFYT3V0bGluZVJvdycKIFBBU1M6IHRyZWVpdGVtMy5pc0V4cGFuZGVk ID09PSB0cnVlCit0cmVlaXRlbTMgdGV4dDoKKwlBWFRpdGxlOgorCUFYRGVzY3JpcHRpb246IENh dHMKKwlBWEhlbHA6CiBQQVNTOiB0cmVlaXRlbTMuaXNTZWxlY3RlZCA9PT0gZmFsc2UKIFBBU1M6 IHRyZWVpdGVtMy5pc1NlbGVjdGVkID09PSB0cnVlCiBQQVNTOiBzZWxlY3RlZFJvdy5pc0VxdWFs KHRyZWVpdGVtMykgPT09IHRydWUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxp dHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMuaHRtbCBiL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMuaHRtbApp bmRleCA3ZTZlYWFhMzJiYTYuLmYyZTBlMDllOTI4NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sCisr KyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10 cmVlaXRlbXMuaHRtbApAQCAtNjMsNiArNjMsNyBAQCBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlD b250cm9sbGVyKSB7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0xLmlzQXR0cmlidXRl U3VwcG9ydGVkKCdBWFZhbHVlJykiLCAidHJ1ZSIpOwogICAgIHZhciBjYW5TZXREaXNjbG9zaW5n ID0gdHJlZWl0ZW0xLmlzQXR0cmlidXRlU2V0dGFibGUoJ0FYRGlzY2xvc2luZycpOwogICAgIG91 dHB1dCArPSBleHBlY3QoImNhblNldERpc2Nsb3NpbmciLCAidHJ1ZSIpOworICAgIG91dHB1dCAr PSBgdHJlZWl0ZW0xIHRleHQ6XG4ke3BsYXRmb3JtVGV4dEFsdGVybmF0aXZlcyh0cmVlaXRlbTEp fVxuXG5gOwogCiAgICAgdmFyIHRyZWVpdGVtMiA9IHRyZWVpdGVtMS5kaXNjbG9zZWRSb3dBdElu ZGV4KDApOwogICAgIG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMi5yb2xlIiwgIidBWFJvbGU6 IEFYUm93JyIpOwpAQCAtNzIsNiArNzMsNyBAQCBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250 cm9sbGVyKSB7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0yLmRpc2Nsb3NlZEJ5Um93 KCkuaXNFcXVhbCh0cmVlaXRlbTEpIiwgInRydWUiKTsKICAgICBjYW5TZXREaXNjbG9zaW5nID0g dHJlZWl0ZW0yLmlzQXR0cmlidXRlU2V0dGFibGUoJ0FYRGlzY2xvc2luZycpOwogICAgIG91dHB1 dCArPSBleHBlY3QoImNhblNldERpc2Nsb3NpbmciLCAiZmFsc2UiKTsKKyAgICBvdXRwdXQgKz0g YHRyZWVpdGVtMiB0ZXh0OlxuJHtwbGF0Zm9ybVRleHRBbHRlcm5hdGl2ZXModHJlZWl0ZW0yKX1c blxuYDsKIAogICAgIHZhciB0cmVlaXRlbTMgPSB0cmVlaXRlbTIuY2hpbGRBdEluZGV4KDApOwog ICAgIG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMy5zdHJpbmdWYWx1ZSIsICInQVhWYWx1ZTog QmlyZHMnIik7CkBAIC04Myw2ICs4NSw3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIpIHsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTMucm9sZSIsICInQVhSb2xl OiBBWFJvdyciKTsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTMuc3Vicm9sZSIsICIn QVhTdWJyb2xlOiBBWE91dGxpbmVSb3cnIik7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0 ZW0zLmlzRXhwYW5kZWQiLCAidHJ1ZSIpOworICAgIG91dHB1dCArPSBgdHJlZWl0ZW0zIHRleHQ6 XG4ke3BsYXRmb3JtVGV4dEFsdGVybmF0aXZlcyh0cmVlaXRlbTMpfVxuYDsKIAogICAgIHZhciBz ZWxlY3RlZFJvdywgdHJlZWl0ZW00LCB0cmVlaXRlbTUsIHRyZWVpdGVtNjsKICAgICAvLyBUZXN0 IHRoYXQgdGhlIHJvdyBjYW4gYmUgc2VsZWN0ZWQgY29ycmVjdGx5Lgo= 467627 2023-09-09 17:46:36 -0700 2023-09-10 00:14:19 -0700 Patch bug-261376-20230909174635.patch text/plain 9889 tyler_w RnJvbSA4ZjUxYTlhMTUxYjA3NWQyMzdhN2Q5OWYyNTE4NjhkNjNiZWMzMTE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCA5IFNlcCAyMDIzIDEzOjI2OjQ4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IE5v IGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMgZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cwogcm9s ZT0idHJlZWl0ZW0iIGVsZW1lbnRzIHRoYXQgaGF2ZSBhIG5ld2xpbmUgYmVmb3JlIHRoZWlyIGNo aWxkIHRleHQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNzYg cmRhcjovL3Byb2JsZW0vMTE1MjI2NTA5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRo aXMgcGF0Y2ggZml4ZXMgdHdvIGJ1Z3M6CgogIDEuIE5vIGFjY2Vzc2liaWxpdHkgbGFiZWwgaXMg ZXhwb3NlZCBmb3IgZGlzcGxheTpjb250ZW50cyByb2xlPSJ0cmVlaXRlbSIgZWxlbWVudHMgdGhh dCBoYXZlIGEgbmV3bGluZSBiZWZvcmUgdGhlaXIgY2hpbGQgdGV4dAoKICAyLiBTb21lIGRpc3Bs YXk6Y29udGVudHMgcm9sZT0idHJlZWl0ZW0iIGV4cG9zZSB0ZXh0IGZvciBvdGhlcgogICAgIGVs ZW1lbnRzLCByZXN1bHRpbmcgaW4gdGhhdCB0ZXh0IGJlaW5nIGRvdWJseS1leHBvc2VkCgpUaGUg Zmlyc3Qgd2FzIGNhdXNlZCBieSBhIGxhY2sgb2YgcmVzaWxpZW5jZSBpbiBBY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZC4KQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnRleHRVbmRl ckVsZW1lbnQgcmVsaWVzIG9uIGl0ZXJhdGluZyB0aHJvdWdoIGl0cyBhY2Nlc3NpYmxlIGNoaWxk cmVuIGxpa2Ugc286Cgpmb3IgKFJlZlB0ciBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgLi4uIGNvbXB1dGUgQVggdGV4dCAuLi4K fQoKSG93ZXZlciwgZm9yIGVsZW1lbnRzIHRoYXQgQVhPYmplY3RDYWNoZTo6Z2V0T3JDcmVhdGUg ZmFpbHMgdG8gY3JlYXRlIGFuCm9iamVjdCBmb3IsIHdlIHdvdWxkIG5ldmVyIGl0ZXJhdGUgYmVj YXVzZSBmaXJzdENoaWxkIHJldHVybmVkIG51bGxwdHIsCnRodXMgcmVzdWx0aW5nIGluIG5vIEFY IHRleHQgYmVpbmcgZ2F0aGVyZWQuIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpmaXJzdENoaWxk Cm5vdyBkZXRlY3RzIHRoaXMsIGFuZCBpdGVyYXRlcyB1bnRpbCBpdCBmaW5kcyB0aGUgZmlyc3Qg YWNjZXNzaWJsZSBjaGlsZC4KClRoZSBzZWNvbmQgYnVnIHdhcyBjYXVzZWQgYnkgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OnRleHRVbmRlckVsZW1lbnQKcmVjdXJzaXZlbHkgY2FsbGluZyBhbmQg dGV4dFVuZGVyRWxlbWVudCBmb3IgYW4gZWxlbWVudCB0aGF0IHdhcyBub3QKaXQncyBjaGlsZC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSBkZXRlY3QgdGhpcyBhbmQgY29udGludWUgdGhlIGxvb3Agd2hl bgppdCBoYXBwZW5zLgoKTmV3IHRlc3RjYXNlcyBhZGRlZCB0byBhY2Nlc3NpYmlsaXR5L2Rpc3Bs YXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwuCgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0 OgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZGlzcGxheS1jb250ZW50cy90cmVlLWFuZC10 cmVlaXRlbXMuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNw cDoKKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVP YmplY3Q6OmZpcnN0Q2hpbGQgY29uc3QpOgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnRleHRVbmRlckVsZW1lbnQgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgotLS0KIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwICAgICB8IDQwICsrKysrKysrKysrKysrKysrKysKIC4u Li9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCB8IDI3ICsrKysrKysr Ky0tLS0KIC4uLi9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggICAgICAgICAgICB8ICAx ICsKIC4uLi90cmVlLWFuZC10cmVlaXRlbXMtZXhwZWN0ZWQudHh0ICAgICAgICAgICB8IDE0ICsr KysrKysKIC4uLi9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sICB8ICAz ICsrCiA1IGZpbGVzIGNoYW5nZWQsIDc3IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCBmMTYwODM0MGYx MDEuLjg2MGY4ZTRlOWRhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWExvZ2dlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dl ci5jcHAKQEAgLTM5NSw2ICszOTUsNDYgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3Ry ZWFtJiBzdHJlYW0sIGNvbnN0IEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJpYSYgY3IKICAgICBy ZXR1cm4gc3RyZWFtOwogfQogCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0 cmVhbSwgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2Ugc291cmNlKQoreworICAgIHN3aXRjaCAoc291 cmNlKSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6QWx0ZXJuYXRpdmU6Cisg ICAgICAgIHN0cmVhbSA8PCAiQWx0ZXJuYXRpdmUiOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpDaGlsZHJlbjoKKyAgICAgICAgc3RyZWFtIDw8ICJD aGlsZHJlbiI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3Vy Y2U6OlN1bW1hcnk6CisgICAgICAgIHN0cmVhbSA8PCAiU3VtbWFyeSI7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OkhlbHA6CisgICAgICAgIHN0cmVh bSA8PCAiSGVscCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRT b3VyY2U6OlZpc2libGU6CisgICAgICAgIHN0cmVhbSA8PCAiVmlzaWJsZSI7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlVGFnOgorICAgICAg ICBzdHJlYW0gPDwgIlRpdGxlVGFnIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3Np YmlsaXR5VGV4dFNvdXJjZTo6UGxhY2Vob2xkZXI6CisgICAgICAgIHN0cmVhbSA8PCAiUGxhY2Vo b2xkZXIiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNl OjpMYWJlbEJ5RWxlbWVudDoKKyAgICAgICAgc3RyZWFtIDw8ICJMYWJlbEJ5RWxlbWVudCI7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OlRpdGxlOgor ICAgICAgICBzdHJlYW0gPDwgIlRpdGxlIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5VGV4dFNvdXJjZTo6U3VidGl0bGU6CisgICAgICAgIHN0cmVhbSA8PCAiU3VidGl0 bGUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpB Y3Rpb246CisgICAgICAgIHN0cmVhbSA8PCAiQWN0aW9uIjsKKyAgICAgICAgYnJlYWs7CisgICAg fQorICAgIHJldHVybiBzdHJlYW07Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0 cmVhbSYgc3RyZWFtLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGluY2x1c2lvbikKIHsK ICAgICBzd2l0Y2ggKGluY2x1c2lvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAppbmRleCA1NTcwNTQwZGRh MTUuLmY4NTRmYTA3YzU2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKQEAgLTEzNSwxNiArMTM1LDIwIEBA IHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnVwZGF0ZVJvbGUoKQogCiBBY2Nlc3NpYmls aXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Zmlyc3RDaGlsZCgpIGNvbnN0CiB7 Ci0gICAgaWYgKCFub2RlKCkpCisgICAgYXV0byogY3VycmVudENoaWxkID0gbm9kZSgpID8gbm9k ZSgpLT5maXJzdENoaWxkKCkgOiBudWxscHRyOworICAgIGlmICghY3VycmVudENoaWxkKQogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAKLSAgICBOb2RlKiBmaXJzdENoaWxkID0gbm9kZSgp LT5maXJzdENoaWxkKCk7CiAKLSAgICBpZiAoIWZpcnN0Q2hpbGQpCisgICAgYXV0byogY2FjaGUg PSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKLSAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOwotICAgIHJldHVy biBvYmplY3RDYWNoZSA/IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShmaXJzdENoaWxkKSA6IG51 bGxwdHI7CisgICAgYXV0byogYXhDdXJyZW50Q2hpbGQgPSBjYWNoZS0+Z2V0T3JDcmVhdGUoY3Vy cmVudENoaWxkKTsKKyAgICB3aGlsZSAoIWF4Q3VycmVudENoaWxkICYmIGN1cnJlbnRDaGlsZCkg eworICAgICAgICBjdXJyZW50Q2hpbGQgPSBjdXJyZW50Q2hpbGQtPm5leHRTaWJsaW5nKCk7Cisg ICAgICAgIGF4Q3VycmVudENoaWxkID0gY2FjaGUtPmdldE9yQ3JlYXRlKGN1cnJlbnRDaGlsZCk7 CisgICAgfQorICAgIHJldHVybiBheEN1cnJlbnRDaGlsZDsKIH0KIAogQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6Omxhc3RDaGlsZCgpIGNvbnN0CkBAIC0yMzgy LDEwICsyMzg2LDE3IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGV4dFVuZGVy RWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vCiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAg aWYgKG5vZGUpIHsKKyAgICAgICAgICAgIGF1dG8qIGNoaWxkUGFyZW50RWxlbWVudCA9IGNoaWxk LT5ub2RlKCkgPyBjaGlsZC0+bm9kZSgpLT5wYXJlbnRFbGVtZW50KCkgOiBudWxscHRyOworICAg ICAgICAgICAgLy8gRG8gbm90IHRha2UgdGhlIHRleHRVbmRlckVsZW1lbnQgZm9yIGEgZGlmZmVy ZW50IGVsZW1lbnQgKGRldGVybWluZWQgYnkgY2hpbGQncyBlbGVtZW50IHBhcmVudCBub3QgYmVp bmcgdXMpLiBPdGhlcndpc2Ugd2UgbWF5IGRvdWJseS1leHBvc2UgdGhlIHNhbWUgdGV4dC4KKyAg ICAgICAgICAgIGlmIChjaGlsZFBhcmVudEVsZW1lbnQgJiYgY2hpbGRQYXJlbnRFbGVtZW50ICE9 IG5vZGUgJiYgY2hpbGRQYXJlbnRFbGVtZW50LT5zaGFkb3dIb3N0KCkgIT0gbm9kZSkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCiAgICAgICAgIFN0cmluZyBjaGlsZFRl eHQgPSBjaGlsZC0+dGV4dFVuZGVyRWxlbWVudChtb2RlKTsKICAgICAgICAgaWYgKGNoaWxkVGV4 dC5sZW5ndGgoKSkKLSAgICAgICAgICAgIGFwcGVuZE5hbWVUb1N0cmluZ0J1aWxkZXIoYnVpbGRl ciwgY2hpbGRUZXh0KTsKKyAgICAgICAgICAgIGFwcGVuZE5hbWVUb1N0cmluZ0J1aWxkZXIoYnVp bGRlciwgV1RGTW92ZShjaGlsZFRleHQpKTsKICAgICB9CiAKICAgICByZXR1cm4gYnVpbGRlci50 b1N0cmluZygpLnRyaW0oZGVwcmVjYXRlZElzU3BhY2VPck5ld2xpbmUpLnNpbXBsaWZ5V2hpdGVT cGFjZShpc0hUTUxTcGFjZUJ1dE5vdExpbmVCcmVhayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaCBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oCmlu ZGV4IDRjM2I1NTllMDVjMC4uMWRiZWIxM2NlNDkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaApA QCAtMjAxOSw1ICsyMDE5LDYgQEAgV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4 dFN0cmVhbSYsIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXkpOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVy YXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIGNvbnN0IEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJp YSYpOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIEFjY2Vz c2liaWxpdHlPYmplY3RJbmNsdXNpb24pOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdU Rjo6VGV4dFN0cmVhbSYsIGNvbnN0IEFYQ29yZU9iamVjdCYpOworV1RGOjpUZXh0U3RyZWFtJiBv cGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIEFjY2Vzc2liaWxpdHlUZXh0U291cmNlKTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Rpc3BsYXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0 ZW1zLWV4cGVjdGVkLnR4dAppbmRleCAzMzYzZjU0NTg5OWQuLmU4OGFmMmM5YTE0NSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5k LXRyZWVpdGVtcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9k aXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy1leHBlY3RlZC50eHQKQEAgLTksMTcg KzksMzEgQEAgUEFTUzogdHJlZWl0ZW0xLmlzRXhwYW5kZWQgPT09IHRydWUKIFBBU1M6IHRyZWVp dGVtMS5oaWVyYXJjaGljYWxMZXZlbCA9PT0gMAogUEFTUzogdHJlZWl0ZW0xLmlzQXR0cmlidXRl U3VwcG9ydGVkKCdBWFZhbHVlJykgPT09IHRydWUKIFBBU1M6IGNhblNldERpc2Nsb3NpbmcgPT09 IHRydWUKK3RyZWVpdGVtMSB0ZXh0OgorCUFYVGl0bGU6CisJQVhEZXNjcmlwdGlvbjogQW5pbWFs cworCUFYSGVscDoKKwogUEFTUzogdHJlZWl0ZW0yLnJvbGUgPT09ICdBWFJvbGU6IEFYUm93Jwog UEFTUzogdHJlZWl0ZW0yLnN1YnJvbGUgPT09ICdBWFN1YnJvbGU6IEFYT3V0bGluZVJvdycKIFBB U1M6IHRyZWVpdGVtMi5pc0V4cGFuZGVkID09PSBmYWxzZQogUEFTUzogdHJlZWl0ZW0yLmhpZXJh cmNoaWNhbExldmVsID09PSAxCiBQQVNTOiB0cmVlaXRlbTIuZGlzY2xvc2VkQnlSb3coKS5pc0Vx dWFsKHRyZWVpdGVtMSkgPT09IHRydWUKIFBBU1M6IGNhblNldERpc2Nsb3NpbmcgPT09IGZhbHNl Cit0cmVlaXRlbTIgdGV4dDoKKwlBWFRpdGxlOgorCUFYRGVzY3JpcHRpb246IEJpcmRzCisJQVhI ZWxwOgorCiBQQVNTOiB0cmVlaXRlbTMuc3RyaW5nVmFsdWUgPT09ICdBWFZhbHVlOiBCaXJkcycK IFBBU1M6IGNhblNldERpc2Nsb3NpbmcgPT09IGZhbHNlCiBQQVNTOiB0cmVlaXRlbTMucm9sZSA9 PT0gJ0FYUm9sZTogQVhSb3cnCiBQQVNTOiB0cmVlaXRlbTMuc3Vicm9sZSA9PT0gJ0FYU3Vicm9s ZTogQVhPdXRsaW5lUm93JwogUEFTUzogdHJlZWl0ZW0zLmlzRXhwYW5kZWQgPT09IHRydWUKK3Ry ZWVpdGVtMyB0ZXh0OgorCUFYVGl0bGU6CisJQVhEZXNjcmlwdGlvbjogQ2F0cworCUFYSGVscDoK IFBBU1M6IHRyZWVpdGVtMy5pc1NlbGVjdGVkID09PSBmYWxzZQogUEFTUzogdHJlZWl0ZW0zLmlz U2VsZWN0ZWQgPT09IHRydWUKIFBBU1M6IHNlbGVjdGVkUm93LmlzRXF1YWwodHJlZWl0ZW0zKSA9 PT0gdHJ1ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNv bnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1sCmluZGV4IDdlNmVhYWEz MmJhNi4uZjJlMGUwOWU5Mjg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L2Rpc3BsYXktY29udGVudHMvdHJlZS1hbmQtdHJlZWl0ZW1zLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9kaXNwbGF5LWNvbnRlbnRzL3RyZWUtYW5kLXRyZWVpdGVtcy5odG1s CkBAIC02Myw2ICs2Myw3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsK ICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTEuaXNBdHRyaWJ1dGVTdXBwb3J0ZWQoJ0FY VmFsdWUnKSIsICJ0cnVlIik7CiAgICAgdmFyIGNhblNldERpc2Nsb3NpbmcgPSB0cmVlaXRlbTEu aXNBdHRyaWJ1dGVTZXR0YWJsZSgnQVhEaXNjbG9zaW5nJyk7CiAgICAgb3V0cHV0ICs9IGV4cGVj dCgiY2FuU2V0RGlzY2xvc2luZyIsICJ0cnVlIik7CisgICAgb3V0cHV0ICs9IGB0cmVlaXRlbTEg dGV4dDpcbiR7cGxhdGZvcm1UZXh0QWx0ZXJuYXRpdmVzKHRyZWVpdGVtMSl9XG5cbmA7CiAKICAg ICB2YXIgdHJlZWl0ZW0yID0gdHJlZWl0ZW0xLmRpc2Nsb3NlZFJvd0F0SW5kZXgoMCk7CiAgICAg b3V0cHV0ICs9IGV4cGVjdCgidHJlZWl0ZW0yLnJvbGUiLCAiJ0FYUm9sZTogQVhSb3cnIik7CkBA IC03Miw2ICs3Myw3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKICAg ICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTIuZGlzY2xvc2VkQnlSb3coKS5pc0VxdWFsKHRy ZWVpdGVtMSkiLCAidHJ1ZSIpOwogICAgIGNhblNldERpc2Nsb3NpbmcgPSB0cmVlaXRlbTIuaXNB dHRyaWJ1dGVTZXR0YWJsZSgnQVhEaXNjbG9zaW5nJyk7CiAgICAgb3V0cHV0ICs9IGV4cGVjdCgi Y2FuU2V0RGlzY2xvc2luZyIsICJmYWxzZSIpOworICAgIG91dHB1dCArPSBgdHJlZWl0ZW0yIHRl eHQ6XG4ke3BsYXRmb3JtVGV4dEFsdGVybmF0aXZlcyh0cmVlaXRlbTIpfVxuXG5gOwogCiAgICAg dmFyIHRyZWVpdGVtMyA9IHRyZWVpdGVtMi5jaGlsZEF0SW5kZXgoMCk7CiAgICAgb3V0cHV0ICs9 IGV4cGVjdCgidHJlZWl0ZW0zLnN0cmluZ1ZhbHVlIiwgIidBWFZhbHVlOiBCaXJkcyciKTsKQEAg LTgzLDYgKzg1LDcgQEAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgewogICAg IG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMy5yb2xlIiwgIidBWFJvbGU6IEFYUm93JyIpOwog ICAgIG91dHB1dCArPSBleHBlY3QoInRyZWVpdGVtMy5zdWJyb2xlIiwgIidBWFN1YnJvbGU6IEFY T3V0bGluZVJvdyciKTsKICAgICBvdXRwdXQgKz0gZXhwZWN0KCJ0cmVlaXRlbTMuaXNFeHBhbmRl ZCIsICJ0cnVlIik7CisgICAgb3V0cHV0ICs9IGB0cmVlaXRlbTMgdGV4dDpcbiR7cGxhdGZvcm1U ZXh0QWx0ZXJuYXRpdmVzKHRyZWVpdGVtMyl9XG5gOwogCiAgICAgdmFyIHNlbGVjdGVkUm93LCB0 cmVlaXRlbTQsIHRyZWVpdGVtNSwgdHJlZWl0ZW02OwogICAgIC8vIFRlc3QgdGhhdCB0aGUgcm93 IGNhbiBiZSBzZWxlY3RlZCBjb3JyZWN0bHkuCg==