219883 2020-12-14 19:02:57 -0800 Add logging for Accessibility::findMatchingObjects. 2020-12-15 05:46:42 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1714668 0 andresg_22 2020-12-14 19:02:57 -0800 Add logging for Accessibility::findMatchingObjects. 1714671 1 416221 andresg_22 2020-12-14 19:48:21 -0800 Created attachment 416221 Patch 1714718 2 ews-feeder 2020-12-15 05:45:13 -0800 Committed r270834: <https://trac.webkit.org/changeset/270834> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416221. 1714719 3 webkit-bug-importer 2020-12-15 05:46:42 -0800 <rdar://problem/72339210> 416221 2020-12-14 19:48:21 -0800 2020-12-15 05:45:14 -0800 Patch bug-219883-20201214224820.patch text/plain 17558 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQyZDAwMjdkYTY1MWY1 YjliMDAxNzBhYmYyNDYwY2YzY2JmODM0OC4uMTBhZDhmNzZmYWNjN2Q1ZGUxZjZkZTFhZDFlYmY1 NTdkODRmMjI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTE0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbG9nZ2lu ZyBmb3IgQWNjZXNzaWJpbGl0eTo6ZmluZE1hdGNoaW5nT2JqZWN0cy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTg4MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFs aXR5LCBsb2dnaW5nIGNvZGUuCisKKyAgICAgICAgLSBPdmVybG9hZGVkIDw8IG9wZXJhdG9yIGZv ciBBY2Nlc3NpYmlsaXR5U2VhcmNoRGlyZWN0aW9uLCBTZWFyY2hLZXkgYW5kCisgICAgICAgIFNl YXJjaENyaXRlcmlhLgorICAgICAgICAtIFByb3ZpZGVkIGNvcnJlc3BvbmRpbmcgQVhMb2dnZXI6 OmxvZyBvdmVybG9hZHMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFYTG9nZ2VyOjpsb2cpOgorICAgICAgICAoV2ViQ29yZTo6b3Bl cmF0b3I8PCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5oOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5OjphcHBlbmRDaGlsZHJlblRvQXJyYXkpOgorICAgICAgICBNb3ZlZCB0 byB0aGUgQWNjZXNzaWJpbGl0eSBuYW1lc3BhY2UuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5OjpmaW5kTWF0Y2hpbmdPYmplY3RzKTogQWRkZWQgbG9nZ2luZy4KKyAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaDoKKwogMjAyMC0xMi0x NCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBHUFUg cHJvY2VzcyBzb21ldGltZXMgaGFuZ3MgZHVyaW5nIE1vdGlvbk1hcmsgRm9jdXMgd2hlbiBlbmFi bGluZyBHUFUgUHJvY2VzcyBmb3IgRE9NCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYTG9nZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhM b2dnZXIuY3BwCmluZGV4IGI4NWFkMzQwMTFhMDYwYWYyODU1YjVmNjg3M2YwZmFjZjFhODIzM2Mu LjNhNTkzNGE5ZjNjNzRjYWM2ZjBlYzJlMDEyN2JlOThjOTM5ZTkwOTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwCkBAIC03NCw2ICs3NCwyMiBAQCB2b2lkIEFY TG9nZ2VyOjpsb2coUmVmUHRyPEFYQ29yZU9iamVjdD4gb2JqZWN0KQogICAgIExPRyhBY2Nlc3Np YmlsaXR5LCAiJXMiLCBzdHJlYW0ucmVsZWFzZSgpLnV0ZjgoKS5kYXRhKCkpOwogfQogCit2b2lk IEFYTG9nZ2VyOjpsb2coY29uc3QgVmVjdG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiYgb2JqZWN0 cykKK3sKKyAgICBUZXh0U3RyZWFtIHN0cmVhbShUZXh0U3RyZWFtOjpMaW5lTW9kZTo6TXVsdGlw bGVMaW5lKTsKKworICAgIHN0cmVhbSA8PCAiWyI7CisgICAgZm9yIChhdXRvIG9iamVjdCA6IG9i amVjdHMpIHsKKyAgICAgICAgaWYgKG9iamVjdCkKKyAgICAgICAgICAgIHN0cmVhbSA8PCAqb2Jq ZWN0OworICAgICAgICBlbHNlCisgICAgICAgICAgICBzdHJlYW0gPDwgIm51bGwiOworICAgIH0K KyAgICBzdHJlYW0gPDwgIl0iOworCisgICAgTE9HKEFjY2Vzc2liaWxpdHksICIlcyIsIHN0cmVh bS5yZWxlYXNlKCkudXRmOCgpLmRhdGEoKSk7Cit9CisKIHZvaWQgQVhMb2dnZXI6OmFkZChUZXh0 U3RyZWFtJiBzdHJlYW0sIGNvbnN0IFJlZlB0cjxBWENvcmVPYmplY3Q+JiBvYmplY3QsIGJvb2wg cmVjdXJzaXZlKQogewogICAgIGlmICghb2JqZWN0KQpAQCAtMTAwLDYgKzExNiwxMyBAQCB2b2lk IEFYTG9nZ2VyOjpsb2coY29uc3Qgc3RkOjpwYWlyPFJlZlB0cjxBWENvcmVPYmplY3Q+LCBBWE9i amVjdENhY2hlOjpBWE5vdGlmaQogICAgIExPRyhBY2Nlc3NpYmlsaXR5LCAiJXMiLCBzdHJlYW0u cmVsZWFzZSgpLnV0ZjgoKS5kYXRhKCkpOwogfQogCit2b2lkIEFYTG9nZ2VyOjpsb2coY29uc3Qg QWNjZXNzaWJpbGl0eVNlYXJjaENyaXRlcmlhJiBjcml0ZXJpYSkKK3sKKyAgICBUZXh0U3RyZWFt IHN0cmVhbShUZXh0U3RyZWFtOjpMaW5lTW9kZTo6TXVsdGlwbGVMaW5lKTsKKyAgICBzdHJlYW0g PDwgY3JpdGVyaWE7CisgICAgTE9HKEFjY2Vzc2liaWxpdHksICIlcyIsIHN0cmVhbS5yZWxlYXNl KCkudXRmOCgpLmRhdGEoKSk7Cit9CisKIHZvaWQgQVhMb2dnZXI6OmxvZyhBY2Nlc3NpYmlsaXR5 T2JqZWN0SW5jbHVzaW9uIGluY2x1c2lvbikKIHsKICAgICBUZXh0U3RyZWFtIHN0cmVhbShUZXh0 U3RyZWFtOjpMaW5lTW9kZTo6U2luZ2xlTGluZSk7CkBAIC0xMjksNiArMTUyLDE3MyBAQCBUZXh0 U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgQWNjZXNzaWJpbGl0eVJvbGUg cm9sZSkKICAgICByZXR1cm4gc3RyZWFtOwogfQogCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRl eHRTdHJlYW0mIHN0cmVhbSwgQWNjZXNzaWJpbGl0eVNlYXJjaERpcmVjdGlvbiBkaXJlY3Rpb24p Cit7CisgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFy Y2hEaXJlY3Rpb246Ok5leHQ6CisgICAgICAgIHN0cmVhbSA8PCAiTmV4dCI7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaERpcmVjdGlvbjo6UHJldmlvdXM6Cisg ICAgICAgIHN0cmVhbSA8PCAiUHJldmlvdXMiOworICAgICAgICBicmVhazsKKyAgICB9OworCisg ICAgcmV0dXJuIHN0cmVhbTsKK30KKworVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFt JiBzdHJlYW0sIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXkgc2VhcmNoS2V5KQoreworICAgIHN3aXRj aCAoc2VhcmNoS2V5KSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpBbnlUeXBl OgorICAgICAgICBzdHJlYW0gPDwgIkFueVR5cGUiOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OkFydGljbGU6CisgICAgICAgIHN0cmVhbSA8PCAiQXJ0 aWNsZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaEtleTo6 QmxvY2txdW90ZVNhbWVMZXZlbDoKKyAgICAgICAgc3RyZWFtIDw8ICJCbG9ja3F1b3RlU2FtZUxl dmVsIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpC bG9ja3F1b3RlOgorICAgICAgICBzdHJlYW0gPDwgIkJsb2NrcXVvdGUiOworICAgICAgICBicmVh azsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OkJvbGRGb250OgorICAgICAgICBz dHJlYW0gPDwgIkJvbGRGb250IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmls aXR5U2VhcmNoS2V5OjpCdXR0b246CisgICAgICAgIHN0cmVhbSA8PCAiQnV0dG9uIjsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpDaGVja0JveDoKKyAg ICAgICAgc3RyZWFtIDw8ICJDaGVja0JveCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNj ZXNzaWJpbGl0eVNlYXJjaEtleTo6Q29udHJvbDoKKyAgICAgICAgc3RyZWFtIDw8ICJDb250cm9s IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpEaWZm ZXJlbnRUeXBlOgorICAgICAgICBzdHJlYW0gPDwgIkRpZmZlcmVudFR5cGUiOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OkZvbnRDaGFuZ2U6CisgICAg ICAgIHN0cmVhbSA8PCAiRm9udENoYW5nZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNj ZXNzaWJpbGl0eVNlYXJjaEtleTo6Rm9udENvbG9yQ2hhbmdlOgorICAgICAgICBzdHJlYW0gPDwg IkZvbnRDb2xvckNoYW5nZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0 eVNlYXJjaEtleTo6RnJhbWU6CisgICAgICAgIHN0cmVhbSA8PCAiRnJhbWUiOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OkdyYXBoaWM6CisgICAgICAg IHN0cmVhbSA8PCAiR3JhcGhpYyI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJp bGl0eVNlYXJjaEtleTo6SGVhZGluZ0xldmVsMToKKyAgICAgICAgc3RyZWFtIDw8ICJIZWFkaW5n TGV2ZWwxIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5 OjpIZWFkaW5nTGV2ZWwyOgorICAgICAgICBzdHJlYW0gPDwgIkhlYWRpbmdMZXZlbDIiOworICAg ICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OkhlYWRpbmdMZXZl bDM6CisgICAgICAgIHN0cmVhbSA8PCAiSGVhZGluZ0xldmVsMyI7CisgICAgICAgIGJyZWFrOwor ICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaEtleTo6SGVhZGluZ0xldmVsNDoKKyAgICAgICAg c3RyZWFtIDw8ICJIZWFkaW5nTGV2ZWw0IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5U2VhcmNoS2V5OjpIZWFkaW5nTGV2ZWw1OgorICAgICAgICBzdHJlYW0gPDwgIkhl YWRpbmdMZXZlbDUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFy Y2hLZXk6OkhlYWRpbmdMZXZlbDY6CisgICAgICAgIHN0cmVhbSA8PCAiSGVhZGluZ0xldmVsNiI7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaEtleTo6SGVhZGlu Z1NhbWVMZXZlbDoKKyAgICAgICAgc3RyZWFtIDw8ICJIZWFkaW5nU2FtZUxldmVsIjsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpIZWFkaW5nOgorICAg ICAgICBzdHJlYW0gPDwgIkhlYWRpbmciOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vz c2liaWxpdHlTZWFyY2hLZXk6OkhpZ2hsaWdodGVkOgorICAgICAgICBzdHJlYW0gPDwgIkhpZ2hs aWdodGVkIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5 OjpJdGFsaWNGb250OgorICAgICAgICBzdHJlYW0gPDwgIkl0YWxpY0ZvbnQiOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OktleWJvYXJkRm9jdXNhYmxl OgorICAgICAgICBzdHJlYW0gPDwgIktleWJvYXJkRm9jdXNhYmxlIjsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpMYW5kbWFyazoKKyAgICAgICAgc3Ry ZWFtIDw8ICJMYW5kbWFyayI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0 eVNlYXJjaEtleTo6TGluazoKKyAgICAgICAgc3RyZWFtIDw8ICJMaW5rIjsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpMaXN0OgorICAgICAgICBzdHJl YW0gPDwgIkxpc3QiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFy Y2hLZXk6OkxpdmVSZWdpb246CisgICAgICAgIHN0cmVhbSA8PCAiTGl2ZVJlZ2lvbiI7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaEtleTo6TWlzc3BlbGxlZFdv cmQ6CisgICAgICAgIHN0cmVhbSA8PCAiTWlzc3BlbGxlZFdvcmQiOworICAgICAgICBicmVhazsK KyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6Ok91dGxpbmU6CisgICAgICAgIHN0cmVh bSA8PCAiT3V0bGluZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNl YXJjaEtleTo6UGxhaW5UZXh0OgorICAgICAgICBzdHJlYW0gPDwgIlBsYWluVGV4dCI7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaEtleTo6UmFkaW9Hcm91cDoK KyAgICAgICAgc3RyZWFtIDw8ICJSYWRpb0dyb3VwIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpTYW1lVHlwZToKKyAgICAgICAgc3RyZWFtIDw8ICJT YW1lVHlwZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQWNjZXNzaWJpbGl0eVNlYXJjaEtl eTo6U3RhdGljVGV4dDoKKyAgICAgICAgc3RyZWFtIDw8ICJTdGF0aWNUZXh0IjsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpTdHlsZUNoYW5nZToKKyAg ICAgICAgc3RyZWFtIDw8ICJTdHlsZUNoYW5nZSI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug QWNjZXNzaWJpbGl0eVNlYXJjaEtleTo6VGFibGVTYW1lTGV2ZWw6CisgICAgICAgIHN0cmVhbSA8 PCAiVGFibGVTYW1lTGV2ZWwiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxp dHlTZWFyY2hLZXk6OlRhYmxlOgorICAgICAgICBzdHJlYW0gPDwgIlRhYmxlIjsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpUZXh0RmllbGQ6CisgICAg ICAgIHN0cmVhbSA8PCAiVGV4dEZpZWxkIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nl c3NpYmlsaXR5U2VhcmNoS2V5OjpVbmRlcmxpbmU6CisgICAgICAgIHN0cmVhbSA8PCAiVW5kZXJs aW5lIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5OjpV bnZpc2l0ZWRMaW5rOgorICAgICAgICBzdHJlYW0gPDwgIlVudmlzaXRlZExpbmsiOworICAgICAg ICBicmVhazsKKyAgICBjYXNlIEFjY2Vzc2liaWxpdHlTZWFyY2hLZXk6OlZpc2l0ZWRMaW5rOgor ICAgICAgICBzdHJlYW0gPDwgIlZpc2l0ZWRMaW5rIjsKKyAgICAgICAgYnJlYWs7CisgICAgfTsK KworICAgIHJldHVybiBzdHJlYW07Cit9CisKK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0 cmVhbSYgc3RyZWFtLCBjb25zdCBBY2Nlc3NpYmlsaXR5U2VhcmNoQ3JpdGVyaWEmIGNyaXRlcmlh KQoreworICAgIFRleHRTdHJlYW06Okdyb3VwU2NvcGUgZ3JvdXBTY29wZShzdHJlYW0pOworICAg IHN0cmVhbSA8PCAiU2VhcmNoQ3JpdGVyaWEgIiA8PCAmY3JpdGVyaWE7CisgICAgc3RyZWFtLmR1 bXBQcm9wZXJ0eSgiYW5jaG9yT2JqZWN0IiwgY3JpdGVyaWEuYW5jaG9yT2JqZWN0KTsKKyAgICBz dHJlYW0uZHVtcFByb3BlcnR5KCJzdGFydE9iamVjdCIsIGNyaXRlcmlhLnN0YXJ0T2JqZWN0KTsK KyAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJzZWFyY2hEaXJlY3Rpb24iLCBjcml0ZXJpYS5zZWFy Y2hEaXJlY3Rpb24pOworCisgICAgc3RyZWFtLm5leHRMaW5lKCk7CisgICAgc3RyZWFtIDw8ICIo c2VhcmNoS2V5cyBbIjsKKyAgICBmb3IgKGF1dG8gc2VhcmNoS2V5IDogY3JpdGVyaWEuc2VhcmNo S2V5cykKKyAgICAgICAgc3RyZWFtIDw8IHNlYXJjaEtleSA8PCAiLCAiOworICAgIHN0cmVhbSA8 PCAiXSkiOworCisgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgic2VhcmNoVGV4dCIsIGNyaXRlcmlh LnNlYXJjaFRleHQpOworICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoInJlc3VsdHNMaW1pdCIsIGNy aXRlcmlhLnJlc3VsdHNMaW1pdCk7CisgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgidmlzaWJsZU9u bHkiLCBjcml0ZXJpYS52aXNpYmxlT25seSk7CisgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiaW1t ZWRpYXRlRGVzY2VuZGFudHNPbmx5IiwgY3JpdGVyaWEuaW1tZWRpYXRlRGVzY2VuZGFudHNPbmx5 KTsKKworICAgIHJldHVybiBzdHJlYW07Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4 dFN0cmVhbSYgc3RyZWFtLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGluY2x1c2lvbikK IHsKICAgICBzd2l0Y2ggKGluY2x1c2lvbikgewpAQCAtMTQxLDggKzMzMSw2IEBAIFRleHRTdHJl YW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5j bHVzaW9uIGluY2x1c2lvCiAgICAgY2FzZSBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uOjpE ZWZhdWx0QmVoYXZpb3I6CiAgICAgICAgIHN0cmVhbSA8PCAiRGVmYXVsdEJlaGF2aW9yIjsKICAg ICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAg cmV0dXJuIHN0cmVhbTsKQEAgLTE3Miw2ICszNjAsMTUgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8 PChUZXh0U3RyZWFtJiBzdHJlYW0sIEFYT2JqZWN0Q2FjaGU6OkFYTm90aWZpY2F0aW9uIG5vdGlm aWMKICAgICBjYXNlIEFYT2JqZWN0Q2FjaGU6OkFYTm90aWZpY2F0aW9uOjpBWEZvY3VzZWRVSUVs ZW1lbnRDaGFuZ2VkOgogICAgICAgICBzdHJlYW0gPDwgIkFYRm9jdXNlZFVJRWxlbWVudENoYW5n ZWQiOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEFYT2JqZWN0Q2FjaGU6OkFYTm90aWZpY2F0 aW9uOjpBWEZyYW1lTG9hZENvbXBsZXRlOgorICAgICAgICBzdHJlYW0gPDwgIkFYRnJhbWVMb2Fk Q29tcGxldGUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFYT2JqZWN0Q2FjaGU6OkFYTm90 aWZpY2F0aW9uOjpBWElkQXR0cmlidXRlQ2hhbmdlZDoKKyAgICAgICAgc3RyZWFtIDw8ICJBWElk QXR0cmlidXRlQ2hhbmdlZCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQVhPYmplY3RDYWNo ZTo6QVhOb3RpZmljYXRpb246OkFYTGFuZ3VhZ2VDaGFuZ2VkOgorICAgICAgICBzdHJlYW0gPDwg IkFYTGFuZ3VhZ2VDaGFuZ2VkIjsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBWE9iamVjdENh Y2hlOjpBWE5vdGlmaWNhdGlvbjo6QVhMYXlvdXRDb21wbGV0ZToKICAgICAgICAgc3RyZWFtIDw8 ICJBWExheW91dENvbXBsZXRlIjsKICAgICAgICAgYnJlYWs7CkBAIC0yNTAsNyArNDQ3LDIwIEBA IFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBBWE9iamVjdENhY2hl OjpBWE5vdGlmaWNhdGlvbiBub3RpZmljCiAgICAgY2FzZSBBWE9iamVjdENhY2hlOjpBWE5vdGlm aWNhdGlvbjo6QVhFbGVtZW50QnVzeUNoYW5nZWQ6CiAgICAgICAgIHN0cmVhbSA8PCAiQVhFbGVt ZW50QnVzeUNoYW5nZWQiOwogICAgICAgICBicmVhazsKLSAgICBkZWZhdWx0OgorICAgIGNhc2Ug QVhPYmplY3RDYWNoZTo6QVhOb3RpZmljYXRpb246OkFYRHJhZ2dpbmdTdGFydGVkOgorICAgICAg ICBzdHJlYW0gPDwgIkFYRHJhZ2dpbmdTdGFydGVkIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBBWE9iamVjdENhY2hlOjpBWE5vdGlmaWNhdGlvbjo6QVhEcmFnZ2luZ0VuZGVkOgorICAgICAg ICBzdHJlYW0gPDwgIkFYRHJhZ2dpbmdFbmRlZCI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug QVhPYmplY3RDYWNoZTo6QVhOb3RpZmljYXRpb246OkFYRHJhZ2dpbmdFbnRlcmVkRHJvcFpvbmU6 CisgICAgICAgIHN0cmVhbSA8PCAiQVhEcmFnZ2luZ0VudGVyZWREcm9wWm9uZSI7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgQVhPYmplY3RDYWNoZTo6QVhOb3RpZmljYXRpb246OkFYRHJhZ2dp bmdEcm9wcGVkOgorICAgICAgICBzdHJlYW0gPDwgIkFYRHJhZ2dpbmdEcm9wcGVkIjsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBBWE9iamVjdENhY2hlOjpBWE5vdGlmaWNhdGlvbjo6QVhEcmFn Z2luZ0V4aXRlZERyb3Bab25lOgorICAgICAgICBzdHJlYW0gPDwgIkFYRHJhZ2dpbmdFeGl0ZWRE cm9wWm9uZSI7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWExvZ2dlci5oCmluZGV4IGViYzEyN2Q2MmM4MTNhMGU3MzliNTdhY2ZjMGFlN2MzNjFh MDlhODUuLmNlYzczYjkzNDAxOTRiZjUzMTZjNzYxZWFiOTdkNTkwYzFmYzcxN2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmgKQEAgLTM5LDcgKzM5LDkgQEAgcHVibGlj OgogICAgIH5BWExvZ2dlcigpOwogICAgIHN0YXRpYyB2b2lkIGxvZyhjb25zdCBTdHJpbmcmKTsK ICAgICBzdGF0aWMgdm9pZCBsb2coUmVmUHRyPEFYQ29yZU9iamVjdD4pOworICAgIHN0YXRpYyB2 b2lkIGxvZyhjb25zdCBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+Jik7CiAgICAgc3RhdGlj IHZvaWQgbG9nKGNvbnN0IHN0ZDo6cGFpcjxSZWZQdHI8QVhDb3JlT2JqZWN0PiwgQVhPYmplY3RD YWNoZTo6QVhOb3RpZmljYXRpb24+Jik7CisgICAgc3RhdGljIHZvaWQgbG9nKGNvbnN0IEFjY2Vz c2liaWxpdHlTZWFyY2hDcml0ZXJpYSYpOwogICAgIHN0YXRpYyB2b2lkIGxvZyhBY2Nlc3NpYmls aXR5T2JqZWN0SW5jbHVzaW9uKTsKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9U UkVFKQogICAgIHN0YXRpYyB2b2lkIGxvZyhBWElzb2xhdGVkVHJlZSYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXgg N2VjNjMyMWZjYjAzN2NhMGIyYzc1NDcyMWUxMjgzZDllZTlhMWFhNS4uNjgzZmE1YzEwOTNhYmQ3 ODA5ZGE5MDZhNzhkNjg4ZmVmYjU3OWRiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC00OTMsNTEgKzQ5Myw2IEBA IHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdDo6YWRkQ2hpbGQoQVhDb3JlT2JqZWN0KiBjaGlsZCkK ICAgICBpbnNlcnRDaGlsZChjaGlsZCwgbV9jaGlsZHJlbi5zaXplKCkpOwogfQogICAgIAotc3Rh dGljIHZvaWQgYXBwZW5kQ2hpbGRyZW5Ub0FycmF5KEFYQ29yZU9iamVjdCogb2JqZWN0LCBib29s IGlzRm9yd2FyZCwgQVhDb3JlT2JqZWN0KiBzdGFydE9iamVjdCwgQWNjZXNzaWJpbGl0eU9iamVj dDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiByZXN1bHRzKQotewotICAgIC8vIEEgdGFi bGUncyBjaGlsZHJlbiBpbmNsdWRlcyBlbGVtZW50cyB3aG9zZSBvd24gY2hpbGRyZW4gYXJlIGFs c28gdGhlIHRhYmxlJ3MgY2hpbGRyZW4gKGR1ZSB0byB0aGUgd2F5IHRoZSBNYWMgZXhwb3NlcyB0 YWJsZXMpLgotICAgIC8vIFRoZSByb3dzIGZyb20gdGhlIHRhYmxlIHNob3VsZCBiZSBxdWVyaWVk LCBzaW5jZSB0aG9zZSBhcmUgZGlyZWN0IGRlc2NlbmRhbnRzIG9mIHRoZSB0YWJsZSwgYW5kIHRo ZXkgY29udGFpbiBjb250ZW50LgotICAgIGNvbnN0IGF1dG8mIHNlYXJjaENoaWxkcmVuID0gb2Jq ZWN0LT5pc1RhYmxlKCkgJiYgb2JqZWN0LT5pc0V4cG9zYWJsZSgpID8gb2JqZWN0LT5yb3dzKCkg OiBvYmplY3QtPmNoaWxkcmVuKCk7Ci0KLSAgICBzaXplX3QgY2hpbGRyZW5TaXplID0gc2VhcmNo Q2hpbGRyZW4uc2l6ZSgpOwotCi0gICAgc2l6ZV90IHN0YXJ0SW5kZXggPSBpc0ZvcndhcmQgPyBj aGlsZHJlblNpemUgOiAwOwotICAgIHNpemVfdCBlbmRJbmRleCA9IGlzRm9yd2FyZCA/IDAgOiBj aGlsZHJlblNpemU7Ci0KLSAgICAvLyBJZiB0aGUgc3RhcnRPYmplY3QgaXMgaWdub3JlZCwgd2Ug c2hvdWxkIHVzZSBhbiBhY2Nlc3NpYmxlIHNpYmxpbmcgYXMgYSBzdGFydCBlbGVtZW50IGluc3Rl YWQuCi0gICAgaWYgKHN0YXJ0T2JqZWN0ICYmIHN0YXJ0T2JqZWN0LT5hY2Nlc3NpYmlsaXR5SXNJ Z25vcmVkKCkgJiYgc3RhcnRPYmplY3QtPmlzRGVzY2VuZGFudE9mT2JqZWN0KG9iamVjdCkpIHsK LSAgICAgICAgQVhDb3JlT2JqZWN0KiBwYXJlbnRPYmplY3QgPSBzdGFydE9iamVjdC0+cGFyZW50 T2JqZWN0KCk7Ci0gICAgICAgIC8vIEdvIHVwIHRoZSBwYXJlbnQgY2hhaW4gdG8gZmluZCB0aGUg aGlnaGVzdCBhbmNlc3RvciB0aGF0J3MgYWxzbyBiZWluZyBpZ25vcmVkLgotICAgICAgICB3aGls ZSAocGFyZW50T2JqZWN0ICYmIHBhcmVudE9iamVjdC0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgp KSB7Ci0gICAgICAgICAgICBpZiAocGFyZW50T2JqZWN0ID09IG9iamVjdCkKLSAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgIHN0YXJ0T2JqZWN0ID0gcGFyZW50T2JqZWN0OwotICAg ICAgICAgICAgcGFyZW50T2JqZWN0ID0gcGFyZW50T2JqZWN0LT5wYXJlbnRPYmplY3QoKTsKLSAg ICAgICAgfQotICAgICAgICAvLyBHZXQgdGhlIHVuLWlnbm9yZWQgc2libGluZyBiYXNlZCBvbiB0 aGUgc2VhcmNoIGRpcmVjdGlvbiwgYW5kIHVwZGF0ZSB0aGUgc2VhcmNoUG9zaXRpb24uCi0gICAg ICAgIHdoaWxlIChzdGFydE9iamVjdCAmJiBzdGFydE9iamVjdC0+YWNjZXNzaWJpbGl0eUlzSWdu b3JlZCgpKQotICAgICAgICAgICAgc3RhcnRPYmplY3QgPSBpc0ZvcndhcmQgPyBzdGFydE9iamVj dC0+cHJldmlvdXNTaWJsaW5nKCkgOiBzdGFydE9iamVjdC0+bmV4dFNpYmxpbmcoKTsKLSAgICB9 Ci0gICAgCi0gICAgc2l6ZV90IHNlYXJjaFBvc2l0aW9uID0gc3RhcnRPYmplY3QgPyBzZWFyY2hD aGlsZHJlbi5maW5kKHN0YXJ0T2JqZWN0KSA6IFdURjo6bm90Rm91bmQ7Ci0gICAgCi0gICAgaWYg KHNlYXJjaFBvc2l0aW9uICE9IFdURjo6bm90Rm91bmQpIHsKLSAgICAgICAgaWYgKGlzRm9yd2Fy ZCkKLSAgICAgICAgICAgIGVuZEluZGV4ID0gc2VhcmNoUG9zaXRpb24gKyAxOwotICAgICAgICBl bHNlCi0gICAgICAgICAgICBlbmRJbmRleCA9IHNlYXJjaFBvc2l0aW9uOwotICAgIH0KLQotICAg IC8vIFRoaXMgaXMgYnJva2VuIGludG8gdHdvIHN0YXRlbWVudHMgc28gdGhhdCBpdCdzIGVhc2ll ciByZWFkLgotICAgIGlmIChpc0ZvcndhcmQpIHsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IHN0 YXJ0SW5kZXg7IGkgPiBlbmRJbmRleDsgaS0tKQotICAgICAgICAgICAgYXBwZW5kQWNjZXNzaWJp bGl0eU9iamVjdChzZWFyY2hDaGlsZHJlbi5hdChpIC0gMSkuZ2V0KCksIHJlc3VsdHMpOwotICAg IH0gZWxzZSB7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSBzdGFydEluZGV4OyBpIDwgZW5kSW5k ZXg7IGkrKykKLSAgICAgICAgICAgIGFwcGVuZEFjY2Vzc2liaWxpdHlPYmplY3Qoc2VhcmNoQ2hp bGRyZW4uYXQoaSkuZ2V0KCksIHJlc3VsdHMpOwotICAgIH0KLX0KLQogdm9pZCBBY2Nlc3NpYmls aXR5T2JqZWN0OjpmaW5kTWF0Y2hpbmdPYmplY3RzKEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJp YSogY3JpdGVyaWEsIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgcmVzdWx0cykKIHsKICAg ICBBU1NFUlQoY3JpdGVyaWEpOwpAQCAtMzc5Miw4ICszNzQ3LDU2IEBAIHN0YXRpYyBib29sIG9i amVjdE1hdGNoZXNTZWFyY2hDcml0ZXJpYVdpdGhSZXN1bHRMaW1pdChBWENvcmVPYmplY3QqIG9i amVjdCwgQWNjCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgdm9pZCBhcHBlbmRDaGls ZHJlblRvQXJyYXkoQVhDb3JlT2JqZWN0KiBvYmplY3QsIGJvb2wgaXNGb3J3YXJkLCBBWENvcmVP YmplY3QqIHN0YXJ0T2JqZWN0LCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hp bGRyZW5WZWN0b3ImIHJlc3VsdHMpCit7CisgICAgLy8gQSB0YWJsZSdzIGNoaWxkcmVuIGluY2x1 ZGVzIGVsZW1lbnRzIHdob3NlIG93biBjaGlsZHJlbiBhcmUgYWxzbyB0aGUgdGFibGUncyBjaGls ZHJlbiAoZHVlIHRvIHRoZSB3YXkgdGhlIE1hYyBleHBvc2VzIHRhYmxlcykuCisgICAgLy8gVGhl IHJvd3MgZnJvbSB0aGUgdGFibGUgc2hvdWxkIGJlIHF1ZXJpZWQsIHNpbmNlIHRob3NlIGFyZSBk aXJlY3QgZGVzY2VuZGFudHMgb2YgdGhlIHRhYmxlLCBhbmQgdGhleSBjb250YWluIGNvbnRlbnQu CisgICAgY29uc3QgYXV0byYgc2VhcmNoQ2hpbGRyZW4gPSBvYmplY3QtPmlzVGFibGUoKSAmJiBv YmplY3QtPmlzRXhwb3NhYmxlKCkgPyBvYmplY3QtPnJvd3MoKSA6IG9iamVjdC0+Y2hpbGRyZW4o KTsKKworICAgIHNpemVfdCBjaGlsZHJlblNpemUgPSBzZWFyY2hDaGlsZHJlbi5zaXplKCk7CisK KyAgICBzaXplX3Qgc3RhcnRJbmRleCA9IGlzRm9yd2FyZCA/IGNoaWxkcmVuU2l6ZSA6IDA7Cisg ICAgc2l6ZV90IGVuZEluZGV4ID0gaXNGb3J3YXJkID8gMCA6IGNoaWxkcmVuU2l6ZTsKKworICAg IC8vIElmIHRoZSBzdGFydE9iamVjdCBpcyBpZ25vcmVkLCB3ZSBzaG91bGQgdXNlIGFuIGFjY2Vz c2libGUgc2libGluZyBhcyBhIHN0YXJ0IGVsZW1lbnQgaW5zdGVhZC4KKyAgICBpZiAoc3RhcnRP YmplY3QgJiYgc3RhcnRPYmplY3QtPmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSAmJiBzdGFydE9i amVjdC0+aXNEZXNjZW5kYW50T2ZPYmplY3Qob2JqZWN0KSkgeworICAgICAgICBBWENvcmVPYmpl Y3QqIHBhcmVudE9iamVjdCA9IHN0YXJ0T2JqZWN0LT5wYXJlbnRPYmplY3QoKTsKKyAgICAgICAg Ly8gR28gdXAgdGhlIHBhcmVudCBjaGFpbiB0byBmaW5kIHRoZSBoaWdoZXN0IGFuY2VzdG9yIHRo YXQncyBhbHNvIGJlaW5nIGlnbm9yZWQuCisgICAgICAgIHdoaWxlIChwYXJlbnRPYmplY3QgJiYg cGFyZW50T2JqZWN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpIHsKKyAgICAgICAgICAgIGlm IChwYXJlbnRPYmplY3QgPT0gb2JqZWN0KQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgc3RhcnRPYmplY3QgPSBwYXJlbnRPYmplY3Q7CisgICAgICAgICAgICBwYXJlbnRPYmpl Y3QgPSBwYXJlbnRPYmplY3QtPnBhcmVudE9iamVjdCgpOworICAgICAgICB9CisgICAgICAgIC8v IEdldCB0aGUgdW4taWdub3JlZCBzaWJsaW5nIGJhc2VkIG9uIHRoZSBzZWFyY2ggZGlyZWN0aW9u LCBhbmQgdXBkYXRlIHRoZSBzZWFyY2hQb3NpdGlvbi4KKyAgICAgICAgd2hpbGUgKHN0YXJ0T2Jq ZWN0ICYmIHN0YXJ0T2JqZWN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCisgICAgICAgICAg ICBzdGFydE9iamVjdCA9IGlzRm9yd2FyZCA/IHN0YXJ0T2JqZWN0LT5wcmV2aW91c1NpYmxpbmco KSA6IHN0YXJ0T2JqZWN0LT5uZXh0U2libGluZygpOworICAgIH0KKworICAgIHNpemVfdCBzZWFy Y2hQb3NpdGlvbiA9IHN0YXJ0T2JqZWN0ID8gc2VhcmNoQ2hpbGRyZW4uZmluZChzdGFydE9iamVj dCkgOiBXVEY6Om5vdEZvdW5kOworCisgICAgaWYgKHNlYXJjaFBvc2l0aW9uICE9IFdURjo6bm90 Rm91bmQpIHsKKyAgICAgICAgaWYgKGlzRm9yd2FyZCkKKyAgICAgICAgICAgIGVuZEluZGV4ID0g c2VhcmNoUG9zaXRpb24gKyAxOworICAgICAgICBlbHNlCisgICAgICAgICAgICBlbmRJbmRleCA9 IHNlYXJjaFBvc2l0aW9uOworICAgIH0KKworICAgIC8vIFRoaXMgaXMgYnJva2VuIGludG8gdHdv IHN0YXRlbWVudHMgc28gdGhhdCBpdCdzIGVhc2llciByZWFkLgorICAgIGlmIChpc0ZvcndhcmQp IHsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IHN0YXJ0SW5kZXg7IGkgPiBlbmRJbmRleDsgaS0t KQorICAgICAgICAgICAgYXBwZW5kQWNjZXNzaWJpbGl0eU9iamVjdChzZWFyY2hDaGlsZHJlbi5h dChpIC0gMSkuZ2V0KCksIHJlc3VsdHMpOworICAgIH0gZWxzZSB7CisgICAgICAgIGZvciAoc2l6 ZV90IGkgPSBzdGFydEluZGV4OyBpIDwgZW5kSW5kZXg7IGkrKykKKyAgICAgICAgICAgIGFwcGVu ZEFjY2Vzc2liaWxpdHlPYmplY3Qoc2VhcmNoQ2hpbGRyZW4uYXQoaSkuZ2V0KCksIHJlc3VsdHMp OworICAgIH0KK30KKwogdm9pZCBmaW5kTWF0Y2hpbmdPYmplY3RzKEFjY2Vzc2liaWxpdHlTZWFy Y2hDcml0ZXJpYSBjb25zdCYgY3JpdGVyaWEsIEFYQ29yZU9iamVjdDo6QWNjZXNzaWJpbGl0eUNo aWxkcmVuVmVjdG9yJiByZXN1bHRzKQogeworICAgIEFYVFJBQ0UoIkFjY2Vzc2liaWxpdHk6OmZp bmRNYXRjaGluZ09iamVjdHMiKTsKKyAgICBBWExPRyhjcml0ZXJpYSk7CisKICAgICAvLyBUaGlz IHNlYXJjaCBhbGdvcml0aG0gb25seSBzZWFyY2hlcyB0aGUgZWxlbWVudHMgYmVmb3JlL2FmdGVy IHRoZSBzdGFydGluZyBvYmplY3QuCiAgICAgLy8gSXQgZG9lcyB0aGlzIGJ5IHN0ZXBwaW5nIHVw IHRoZSBwYXJlbnQgY2hhaW4gYW5kIGF0IGVhY2ggbGV2ZWwgZG9pbmcgYSBERlMuCiAKQEAgLTM4 NDIsNiArMzg0NSw4IEBAIHZvaWQgZmluZE1hdGNoaW5nT2JqZWN0cyhBY2Nlc3NpYmlsaXR5U2Vh cmNoQ3JpdGVyaWEgY29uc3QmIGNyaXRlcmlhLCBBWENvcmVPYmplCiAKICAgICAgICAgcHJldmlv dXNPYmplY3QgPSBzdGFydE9iamVjdDsKICAgICB9CisKKyAgICBBWExPRyhyZXN1bHRzKTsKIH0K IAogfSAvLyBuYW1lc3BhY2UgQWNjZXNzaWJpbGl0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAppbmRl eCBjYmI4MDhjNDMzZTIyMDA1YmUxMmZmZjIyZDFjN2EyMmMyYzhhNTNlLi4xZjc2YjBmYTk4YjM3 MmE3MzQ4YzI0YzdlNzdkZmQyZWU3NTBkODFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaApAQCAt MTYxMiw2ICsxNjEyLDkgQEAgaW5saW5lIGJvb2wgQVhDb3JlT2JqZWN0Ojppc0FuY2VzdG9yT2ZP YmplY3QoY29uc3QgQVhDb3JlT2JqZWN0KiBheE9iamVjdCkgY29uc3QKIAogLy8gTG9nZ2luZyBo ZWxwZXJzLgogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIEFj Y2Vzc2liaWxpdHlSb2xlKTsKK1dURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRT dHJlYW0mLCBBY2Nlc3NpYmlsaXR5U2VhcmNoRGlyZWN0aW9uKTsKK1dURjo6VGV4dFN0cmVhbSYg b3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5U2VhcmNoS2V5KTsKK1dU Rjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBjb25zdCBBY2Nlc3Np YmlsaXR5U2VhcmNoQ3JpdGVyaWEmKTsKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6 OlRleHRTdHJlYW0mLCBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uKTsKIFdURjo6VGV4dFN0 cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBjb25zdCBBWENvcmVPYmplY3QmKTsK IAo=