233815 2021-12-03 08:29:45 -0800 Change WTR::AccessibilityUIElement::descriptionOfValue(id) to return a RetainPtr. 2021-12-04 20:14:58 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 andresg_22 cfleizach webkit-bug-importer oldest_to_newest 1820139 0 andresg_22 2021-12-03 08:29:45 -0800 Change WTR::AccessibilityUIElement::descriptionOfValue(id) to return a RetainPtr. 1820140 1 webkit-bug-importer 2021-12-03 08:30:04 -0800 <rdar://problem/86019373> 1820144 2 445859 andresg_22 2021-12-03 08:35:28 -0800 Created attachment 445859 Patch 1820478 3 ews-feeder 2021-12-04 20:14:57 -0800 Committed r286536 (244868@main): <https://commits.webkit.org/244868@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445859. 445859 2021-12-03 08:35:28 -0800 2021-12-04 20:14:58 -0800 Patch bug-233815-20211203113527.patch text/plain 10135 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MjEwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjBkNjE2NjIyMDZlYjc5Zjg4YmI1YTgyODNmODYzNzEy MThkOGY1YS4uNWQ1MTQxNzJhNTU5MDhkNGM2NGUwMWUxMjczNWEyZTMzYjQ4ODI3YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIxLTEyLTAzICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4K KworICAgICAgICBDaGFuZ2UgV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpkZXNjcmlwdGlv bk9mVmFsdWUoaWQpIHRvIHJldHVybiBhIFJldGFpblB0ci4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzgxNQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODYwMTkzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBmaXhlcyBzZXZlcmFsIHRlc3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZSwgaW4g cGFydGljdWxhcjoKKyAgICAgICAgYWNjZXNzaWJpbGl0eS9tYWMvZm9jdXMtY3Jhc2guaHRtbAor ICAgICAgICBhY2Nlc3NpYmlsaXR5L21hYy9zZWFyY2gtcHJlZGljYXRlLmh0bWwKKworICAgICAg ICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQWNjZXNzaWJpbGl0eVVJRWxlbWVu dC5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vz c2liaWxpdHlVSUVsZW1lbnRNYWMubW06CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVs ZW1lbnQ6OmRlc2NyaXB0aW9uT2ZWYWx1ZSBjb25zdCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2li aWxpdHlVSUVsZW1lbnQ6OmFsbEF0dHJpYnV0ZXMpOgorICAgICAgICAoV1RSOjpBY2Nlc3NpYmls aXR5VUlFbGVtZW50OjpzdHJpbmdEZXNjcmlwdGlvbk9mQXR0cmlidXRlVmFsdWUpOgorICAgICAg ICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpyb2xlKToKKyAgICAgICAgKFdUUjo6QWNj ZXNzaWJpbGl0eVVJRWxlbWVudDo6c3Vicm9sZSk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxp dHlVSUVsZW1lbnQ6OnJvbGVEZXNjcmlwdGlvbik6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxp dHlVSUVsZW1lbnQ6OmNvbXB1dGVkUm9sZVN0cmluZyk6CisgICAgICAgIChXVFI6OkFjY2Vzc2li aWxpdHlVSUVsZW1lbnQ6OnRpdGxlKToKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6ZGVzY3JpcHRpb24pOgorICAgICAgICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjpvcmllbnRhdGlvbiBjb25zdCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1l bnQ6OnN0cmluZ1ZhbHVlKToKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6 bGFuZ3VhZ2UpOgorICAgICAgICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpoZWxwVGV4 dCBjb25zdCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmVtYmVkZGVk SW1hZ2VEZXNjcmlwdGlvbiBjb25zdCk6CisKIDIwMjEtMTEtMjkgIE5pa29sYXMgWmltbWVybWFu biAgPG56aW1tZXJtYW5uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0xCU0VdIEFkZCBydW50aW1l IGZsYWcgZm9yIExheWVyLWJhc2VkIFNWRyBlbmdpbmUgKExCU0UpCmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQu aCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudC5oCmluZGV4IGYzZmNjOTJjZDQ2YzAzMzdkOWZjMDQ5MGNhY2RhNDM5NjZmMGI0ZmQu LmM2MTAxNGY3YWMwZTk3YWFmODFjODhlNWVkMTNmOGVkOGFiYzM1ZjMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQWNjZXNzaWJpbGl0eVVJRWxlbWVu dC5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQWNjZXNzaWJp bGl0eVVJRWxlbWVudC5oCkBAIC00MDIsNyArNDAyLDcgQEAgcHJpdmF0ZToKIAogI2lmIFBMQVRG T1JNKE1BQykKICAgICBSZXRhaW5QdHI8aWQ+IGF0dHJpYnV0ZVZhbHVlRm9yUGFyYW1ldGVyKE5T U3RyaW5nICosIGlkKSBjb25zdDsKLSAgICBOU1N0cmluZyAqZGVzY3JpcHRpb25PZlZhbHVlKGlk IHZhbHVlT2JqZWN0KSBjb25zdDsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IGRlc2NyaXB0aW9u T2ZWYWx1ZShpZCB2YWx1ZU9iamVjdCkgY29uc3Q7CiAjZW5kaWYKIAogI2lmICFQTEFURk9STShD T0NPQSkgJiYgIVVTRShBVFNQSSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW0gYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50 TWFjLm1tCmluZGV4IGFlYTRjMzMzNTEyM2FkOWUyNmRiOGM1OGRhZWQxNDkyMDk3NzEwMjIuLmY5 YTFjMDM2N2VlZjVmZTIxYWM0MDY5MDcwNTAwMDg1MGRjOTc5ZjkgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1l bnRNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMv QWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQpAQCAtMTY5LDcgKzE2OSw3IEBAIHZvaWQgc2V0 QXR0cmlidXRlVmFsdWUoaWQgZWxlbWVudCwgTlNTdHJpbmcqIGF0dHJpYnV0ZSwgaWQgdmFsdWUs IGJvb2wgc3luY2hyb25vCiAgICAgRU5EX0FYX09CSkNfRVhDRVBUSU9OUwogfQogCi1OU1N0cmlu ZyAqQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6ZGVzY3JpcHRpb25PZlZhbHVlKGlkIHZhbHVlT2Jq ZWN0KSBjb25zdAorUmV0YWluUHRyPE5TU3RyaW5nPiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpk ZXNjcmlwdGlvbk9mVmFsdWUoaWQgdmFsdWVPYmplY3QpIGNvbnN0CiB7CiAgICAgaWYgKCF2YWx1 ZU9iamVjdCkKICAgICAgICAgcmV0dXJuIG5pbDsKQEAgLTU5MSw3ICs1OTEsNyBAQCBKU1JldGFp blB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6YWxsQXR0cmlidXRlcygp CiAgICAgICAgICAgICB8fCBbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpAIkFYUmVsYXRpdmVG cmFtZSJdKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgUmV0YWluUHRyPE5TU3Ry aW5nPiB2YWx1ZSA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1dGVWYWx1ZShhdHRyaWJ1dGUp LmdldCgpKTsKKyAgICAgICAgYXV0byB2YWx1ZSA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1 dGVWYWx1ZShhdHRyaWJ1dGUpLmdldCgpKTsKICAgICAgICAgW3ZhbHVlcyBhcHBlbmRGb3JtYXQ6 QCIlQDogJUBcbiIsIGF0dHJpYnV0ZSwgdmFsdWUuZ2V0KCldOwogICAgIH0KIApAQCAtNjAxLDcg KzYwMSw3IEBAIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjphbGxBdHRyaWJ1dGVzKCkKIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50OjpzdHJpbmdEZXNjcmlwdGlvbk9mQXR0cmlidXRlVmFsdWUoSlNTdHJpbmdSZWYg YXR0cmlidXRlKQogewogICAgIGF1dG8gdmFsdWUgPSBhdHRyaWJ1dGVWYWx1ZShbTlNTdHJpbmcg c3RyaW5nV2l0aEpTU3RyaW5nUmVmOmF0dHJpYnV0ZV0pOwotICAgIE5TU3RyaW5nICp2YWx1ZURl c2NyaXB0aW9uID0gZGVzY3JpcHRpb25PZlZhbHVlKHZhbHVlLmdldCgpKTsKKyAgICBhdXRvIHZh bHVlRGVzY3JpcHRpb24gPSBkZXNjcmlwdGlvbk9mVmFsdWUodmFsdWUuZ2V0KCkpOwogICAgIHJl dHVybiBbdmFsdWVEZXNjcmlwdGlvbiBjcmVhdGVKU1N0cmluZ1JlZl07CiB9CiAKQEAgLTcwOSw4 ICs3MDksOCBAQCBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVu dDo6cGFyYW1ldGVyaXplZEF0dHJpYnV0ZU5hbWVzKCkKIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVm PiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpyb2xlKCkKIHsKICAgICBCRUdJTl9BWF9PQkpDX0VY Q0VQVElPTlMKLSAgICBOU1N0cmluZyAqcm9sZSA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1 dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlSb2xlQXR0cmlidXRlKS5nZXQoKSk7Ci0gICAgcmV0dXJu IGNvbmNhdGVuYXRlQXR0cmlidXRlQW5kVmFsdWUoQCJBWFJvbGUiLCByb2xlKTsKKyAgICBhdXRv IHJvbGUgPSBkZXNjcmlwdGlvbk9mVmFsdWUoYXR0cmlidXRlVmFsdWUoTlNBY2Nlc3NpYmlsaXR5 Um9sZUF0dHJpYnV0ZSkuZ2V0KCkpOworICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFu ZFZhbHVlKEAiQVhSb2xlIiwgcm9sZS5nZXQoKSk7CiAgICAgRU5EX0FYX09CSkNfRVhDRVBUSU9O UwogCiAgICAgcmV0dXJuIG51bGxwdHI7CkBAIC03MTksOCArNzE5LDggQEAgSlNSZXRhaW5QdHI8 SlNTdHJpbmdSZWY+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnJvbGUoKQogSlNSZXRhaW5QdHI8 SlNTdHJpbmdSZWY+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN1YnJvbGUoKQogewogICAgIEJF R0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIE5TU3RyaW5nICpzdWJyb2xlID0gZGVzY3JpcHRp b25PZlZhbHVlKGF0dHJpYnV0ZVZhbHVlKE5TQWNjZXNzaWJpbGl0eVN1YnJvbGVBdHRyaWJ1dGUp LmdldCgpKTsKLSAgICByZXR1cm4gY29uY2F0ZW5hdGVBdHRyaWJ1dGVBbmRWYWx1ZShAIkFYU3Vi cm9sZSIsIHN1YnJvbGUpOworICAgIGF1dG8gc3Vicm9sZSA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShh dHRyaWJ1dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlTdWJyb2xlQXR0cmlidXRlKS5nZXQoKSk7Cisg ICAgcmV0dXJuIGNvbmNhdGVuYXRlQXR0cmlidXRlQW5kVmFsdWUoQCJBWFN1YnJvbGUiLCBzdWJy b2xlLmdldCgpKTsKICAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCiAKICAgICByZXR1cm4gbnVs bHB0cjsKQEAgLTcyOSw4ICs3MjksOCBAQCBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNjZXNz aWJpbGl0eVVJRWxlbWVudDo6c3Vicm9sZSgpCiBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNj ZXNzaWJpbGl0eVVJRWxlbWVudDo6cm9sZURlc2NyaXB0aW9uKCkKIHsKICAgICBCRUdJTl9BWF9P QkpDX0VYQ0VQVElPTlMKLSAgICBOU1N0cmluZyAqcm9sZSA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShh dHRyaWJ1dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlSb2xlRGVzY3JpcHRpb25BdHRyaWJ1dGUpLmdl dCgpKTsKLSAgICByZXR1cm4gY29uY2F0ZW5hdGVBdHRyaWJ1dGVBbmRWYWx1ZShAIkFYUm9sZURl c2NyaXB0aW9uIiwgcm9sZSk7CisgICAgYXV0byByb2xlID0gZGVzY3JpcHRpb25PZlZhbHVlKGF0 dHJpYnV0ZVZhbHVlKE5TQWNjZXNzaWJpbGl0eVJvbGVEZXNjcmlwdGlvbkF0dHJpYnV0ZSkuZ2V0 KCkpOworICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZhbHVlKEAiQVhSb2xlRGVz Y3JpcHRpb24iLCByb2xlLmdldCgpKTsKICAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCiAKICAg ICByZXR1cm4gbnVsbHB0cjsKQEAgLTczOSw3ICs3MzksNyBAQCBKU1JldGFpblB0cjxKU1N0cmlu Z1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm9sZURlc2NyaXB0aW9uKCkKIEpTUmV0YWlu UHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpjb21wdXRlZFJvbGVTdHJp bmcoKQogewogICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIE5TU3RyaW5nICpjb21w dXRlZFJvbGVTdHJpbmcgPSBkZXNjcmlwdGlvbk9mVmFsdWUoYXR0cmlidXRlVmFsdWUoQCJBWEFS SUFSb2xlIikuZ2V0KCkpOworICAgIGF1dG8gY29tcHV0ZWRSb2xlU3RyaW5nID0gZGVzY3JpcHRp b25PZlZhbHVlKGF0dHJpYnV0ZVZhbHVlKEAiQVhBUklBUm9sZSIpLmdldCgpKTsKICAgICByZXR1 cm4gW2NvbXB1dGVkUm9sZVN0cmluZyBjcmVhdGVKU1N0cmluZ1JlZl07CiAgICAgRU5EX0FYX09C SkNfRVhDRVBUSU9OUwogCkBAIC03NDksOCArNzQ5LDggQEAgSlNSZXRhaW5QdHI8SlNTdHJpbmdS ZWY+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmNvbXB1dGVkUm9sZVN0cmluZygpCiBKU1JldGFp blB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6dGl0bGUoKQogewogICAg IEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIE5TU3RyaW5nICp0aXRsZSA9IGRlc2NyaXB0 aW9uT2ZWYWx1ZShhdHRyaWJ1dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlUaXRsZUF0dHJpYnV0ZSku Z2V0KCkpOwotICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZhbHVlKEAiQVhUaXRs ZSIsIHRpdGxlKTsKKyAgICBhdXRvIHRpdGxlID0gZGVzY3JpcHRpb25PZlZhbHVlKGF0dHJpYnV0 ZVZhbHVlKE5TQWNjZXNzaWJpbGl0eVRpdGxlQXR0cmlidXRlKS5nZXQoKSk7CisgICAgcmV0dXJu IGNvbmNhdGVuYXRlQXR0cmlidXRlQW5kVmFsdWUoQCJBWFRpdGxlIiwgdGl0bGUuZ2V0KCkpOwog ICAgIEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKIAogICAgIHJldHVybiBudWxscHRyOwpAQCAtNzU5 LDggKzc1OSw4IEBAIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUlFbGVt ZW50Ojp0aXRsZSgpCiBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6ZGVzY3JpcHRpb24oKQogewogICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAg IE5TU3RyaW5nICpkZXNjcmlwdGlvbiA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1dGVWYWx1 ZShOU0FjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbkF0dHJpYnV0ZSkuZ2V0KCkpOwotICAgIHJldHVy biBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZhbHVlKEAiQVhEZXNjcmlwdGlvbiIsIGRlc2NyaXB0 aW9uKTsKKyAgICBhdXRvIGRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb25PZlZhbHVlKGF0dHJpYnV0 ZVZhbHVlKE5TQWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uQXR0cmlidXRlKS5nZXQoKSk7CisgICAg cmV0dXJuIGNvbmNhdGVuYXRlQXR0cmlidXRlQW5kVmFsdWUoQCJBWERlc2NyaXB0aW9uIiwgZGVz Y3JpcHRpb24uZ2V0KCkpOwogICAgIEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKIAogICAgIHJldHVy biBudWxscHRyOwpAQCAtNzY5LDggKzc2OSw4IEBAIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpkZXNjcmlwdGlvbigpCiBKU1JldGFpblB0cjxKU1N0cmlu Z1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6b3JpZW50YXRpb24oKSBjb25zdAogewogICAg IEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIE5TU3RyaW5nICpkZXNjcmlwdGlvbiA9IGRl c2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlPcmllbnRhdGlv bkF0dHJpYnV0ZSkuZ2V0KCkpOwotICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZh bHVlKEAiQVhPcmllbnRhdGlvbiIsIGRlc2NyaXB0aW9uKTsgICAgCisgICAgYXV0byBkZXNjcmlw dGlvbiA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlP cmllbnRhdGlvbkF0dHJpYnV0ZSkuZ2V0KCkpOworICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJp YnV0ZUFuZFZhbHVlKEAiQVhPcmllbnRhdGlvbiIsIGRlc2NyaXB0aW9uLmdldCgpKTsKICAgICBF TkRfQVhfT0JKQ19FWENFUFRJT05TCiAKICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTc4MCw5ICs3 ODAsOSBAQCBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6 c3RyaW5nVmFsdWUoKQogewogICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwogICAgIGF1dG8g dmFsdWUgPSBhdHRyaWJ1dGVWYWx1ZShOU0FjY2Vzc2liaWxpdHlWYWx1ZUF0dHJpYnV0ZSk7Ci0g ICAgTlNTdHJpbmcgKmRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb25PZlZhbHVlKHZhbHVlLmdldCgp KTsKKyAgICBhdXRvIGRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb25PZlZhbHVlKHZhbHVlLmdldCgp KTsKICAgICBpZiAoZGVzY3JpcHRpb24pCi0gICAgICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJp YnV0ZUFuZFZhbHVlKEAiQVhWYWx1ZSIsIGRlc2NyaXB0aW9uKTsKKyAgICAgICAgcmV0dXJuIGNv bmNhdGVuYXRlQXR0cmlidXRlQW5kVmFsdWUoQCJBWFZhbHVlIiwgZGVzY3JpcHRpb24uZ2V0KCkp OwogICAgIEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKIAogICAgIHJldHVybiBudWxscHRyOwpAQCAt NzkxLDggKzc5MSw4IEBAIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUlF bGVtZW50OjpzdHJpbmdWYWx1ZSgpCiBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6bGFuZ3VhZ2UoKQogewogICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9O UwotICAgIE5TU3RyaW5nICpkZXNjcmlwdGlvbiA9IGRlc2NyaXB0aW9uT2ZWYWx1ZShhdHRyaWJ1 dGVWYWx1ZShAIkFYTGFuZ3VhZ2UiKS5nZXQoKSk7Ci0gICAgcmV0dXJuIGNvbmNhdGVuYXRlQXR0 cmlidXRlQW5kVmFsdWUoQCJBWExhbmd1YWdlIiwgZGVzY3JpcHRpb24pOworICAgIGF1dG8gZGVz Y3JpcHRpb24gPSBkZXNjcmlwdGlvbk9mVmFsdWUoYXR0cmlidXRlVmFsdWUoQCJBWExhbmd1YWdl IikuZ2V0KCkpOworICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZhbHVlKEAiQVhM YW5ndWFnZSIsIGRlc2NyaXB0aW9uLmdldCgpKTsKICAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05T CiAKICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTgwMSw4ICs4MDEsOCBAQCBKU1JldGFpblB0cjxK U1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6bGFuZ3VhZ2UoKQogSlNSZXRhaW5Q dHI8SlNTdHJpbmdSZWY+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmhlbHBUZXh0KCkgY29uc3QK IHsKICAgICBCRUdJTl9BWF9PQkpDX0VYQ0VQVElPTlMKLSAgICBOU1N0cmluZyAqZGVzY3JpcHRp b24gPSBkZXNjcmlwdGlvbk9mVmFsdWUoYXR0cmlidXRlVmFsdWUoTlNBY2Nlc3NpYmlsaXR5SGVs cEF0dHJpYnV0ZSkuZ2V0KCkpOwotICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZh bHVlKEAiQVhIZWxwIiwgZGVzY3JpcHRpb24pOworICAgIGF1dG8gZGVzY3JpcHRpb24gPSBkZXNj cmlwdGlvbk9mVmFsdWUoYXR0cmlidXRlVmFsdWUoTlNBY2Nlc3NpYmlsaXR5SGVscEF0dHJpYnV0 ZSkuZ2V0KCkpOworICAgIHJldHVybiBjb25jYXRlbmF0ZUF0dHJpYnV0ZUFuZFZhbHVlKEAiQVhI ZWxwIiwgZGVzY3JpcHRpb24uZ2V0KCkpOwogICAgIEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKICAg ICAKICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTE3MjUsOCArMTcyNSw4IEBAIGJvb2wgQWNjZXNz aWJpbGl0eVVJRWxlbWVudDo6aXNDb2xsYXBzZWQoKSBjb25zdAogSlNSZXRhaW5QdHI8SlNTdHJp bmdSZWY+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmVtYmVkZGVkSW1hZ2VEZXNjcmlwdGlvbigp IGNvbnN0CiB7CiAgICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJT05TCi0gICAgTlNTdHJpbmcgKnZh bHVlID0gZGVzY3JpcHRpb25PZlZhbHVlKGF0dHJpYnV0ZVZhbHVlKEAiQVhFbWJlZGRlZEltYWdl RGVzY3JpcHRpb24iKS5nZXQoKSk7Ci0gICAgcmV0dXJuIGNvbmNhdGVuYXRlQXR0cmlidXRlQW5k VmFsdWUoQCJBWEVtYmVkZGVkSW1hZ2VEZXNjcmlwdGlvbiIsIHZhbHVlKTsKKyAgICBhdXRvIHZh bHVlID0gZGVzY3JpcHRpb25PZlZhbHVlKGF0dHJpYnV0ZVZhbHVlKEAiQVhFbWJlZGRlZEltYWdl RGVzY3JpcHRpb24iKS5nZXQoKSk7CisgICAgcmV0dXJuIGNvbmNhdGVuYXRlQXR0cmlidXRlQW5k VmFsdWUoQCJBWEVtYmVkZGVkSW1hZ2VEZXNjcmlwdGlvbiIsIHZhbHVlLmdldCgpKTsKICAgICBF TkRfQVhfT0JKQ19FWENFUFRJT05TCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9Cg==