208153 2020-02-24 13:06:56 -0800 [WebAccessibilityObjectWrapper updateObjectBackingStore] should return the backing object. 2020-02-24 14:20:17 -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 commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1622283 0 andresg_22 2020-02-24 13:06:56 -0800 [WebAccessibilityObjectWrapper updateObjectBackingStore] should return the backing object. 1622288 1 391570 andresg_22 2020-02-24 13:21:15 -0800 Created attachment 391570 Patch 1622317 2 391570 commit-queue 2020-02-24 14:19:05 -0800 Comment on attachment 391570 Patch Clearing flags on attachment: 391570 Committed r257255: <https://trac.webkit.org/changeset/257255> 1622318 3 commit-queue 2020-02-24 14:19:06 -0800 All reviewed patches have been landed. Closing bug. 1622320 4 webkit-bug-importer 2020-02-24 14:20:17 -0800 <rdar://problem/59740425> 391570 2020-02-24 13:21:15 -0800 2020-02-24 14:19:05 -0800 Patch bug-208153-20200224162114.patch text/plain 22089 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUxMDZiOTk5ZWRkM2Rh ZGQxMDZlOWNkZGY3MmZhMzEzYTM4ZTRkZi4uYjZhNmJiMGNmMmU1MDZlYTEyN2ZiODg3MTQwMDA1 YjQxOGIxNDMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIwLTAyLTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIgdXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlXSBzaG91bGQgcmV0 dXJuIHRoZSBiYWNraW5nIG9iamVjdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwODE1MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgQ3Vy cmVudGx5IGluIG1hbnkgV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIncyBtZXRob2RzIHdl IGNhbGwKKyAgICAgICAgdXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlIGZvbGxvd2VkIGJ5IG9uZSBv ciBtb3JlIGNhbGxzIHRvCisgICAgICAgIGF4QmFja2luZ09iamVjdC4gVGhpcyBwYXRjaCBlbGlt aW5hdGVzIHRoaXMgdW5uZWNlc3NhcnkgY2FsbCBieSBtYWtpbmcKKyAgICAgICAgdXBkYXRlT2Jq ZWN0QmFja2luZ1N0b3JlIHJldHVybiB0aGUgYmFja2luZyBvYmplY3QuIEl0IGFsc28gY2xlYW5z IHVwCisgICAgICAgIG90aGVyIHVubmVjZXNzYXJ5IGNhbGxzIHRvIGF4QmFja2luZ09iamVjdCBh bmQgZG9lcyBzb21lIG1pbm9yIGNvZGUKKyAgICAgICAgY2xlYW51cC4KKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5oOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFz ZS5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlIHVwZGF0 ZU9iamVjdEJhY2tpbmdTdG9yZV0pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlciBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkRdKToK KyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0 dHJpYnV0ZVZhbHVlOl0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ciBhY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudF0pOgorICAgICAgICAoLVtXZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5SGl0VGVzdDpdKToKKyAgICAgICAgKC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUlzQXR0cmlidXRlU2V0 dGFibGU6XSk6CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIF9hY2Nl c3NpYmlsaXR5UGVyZm9ybVByZXNzQWN0aW9uXSk6CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyIF9hY2Nlc3NpYmlsaXR5UGVyZm9ybUluY3JlbWVudEFjdGlvbl0pOgor ICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBfYWNjZXNzaWJpbGl0eVBl cmZvcm1EZWNyZW1lbnRBY3Rpb25dKToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIgYWNjZXNzaWJpbGl0eVBlcmZvcm1BY3Rpb246XSk6CisgICAgICAgICgtW1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlSZXBsYWNlUmFuZ2U6d2l0aFRl eHQ6XSk6CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2li aWxpdHlJbnNlcnRUZXh0Ol0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlciBfYWNjZXNzaWJpbGl0eVNldFZhbHVlOmZvckF0dHJpYnV0ZTpdKToKKyAgICAgICAgKC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVl OmZvclBhcmFtZXRlcjpdKToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXIgYWNjZXNzaWJpbGl0eUluZGV4T2ZDaGlsZDpdKToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUFycmF5QXR0cmlidXRlQ291bnQ6XSk6Cisg ICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBcnJh eUF0dHJpYnV0ZVZhbHVlczppbmRleDptYXhDb3VudDpdKToKKwogMjAyMC0wMi0yNCAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUmVtb3ZlIHJl ZHVuZGFudCB0cmFpbGluZyBsaW5lIGJyZWFrIGhhbmRsaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJC YXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckJhc2UuaAppbmRleCA0YTRlM2RiMGQzZWM3NGNlZjdmZDgyNzBjYzUxYjJh ZmE0ZThjMDdlLi45ZTE2MDRhYjgzZWI1YzJiODI5YWYyY2NmMWM0MWY2NjNhNDM0NTUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21h Yy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaApAQCAtNjEsNyArNjEsOSBAQCBj bGFzcyBWaXNpYmxlUG9zaXRpb247CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBhc3NpZ24pIFdl YkNvcmU6OkFYSUQgaWRlbnRpZmllcjsKIAotLSAoQk9PTCl1cGRhdGVPYmplY3RCYWNraW5nU3Rv cmU7CisvLyBVcGRhdGVzIHRoZSB1bmRlcmx5aW5nIG9iamVjdCBhbmQgYWNjZXNzaWJpbGl0eSBo aWVyYXJjaHkgLCBhbmQgcmV0dXJucyB0aGUKKy8vIGNvcnJlc3BvbmRpbmcgQVhDb3JlT2JqZWN0 LgorLSAoV2ViQ29yZTo6QVhDb3JlT2JqZWN0Kil1cGRhdGVPYmplY3RCYWNraW5nU3RvcmU7CiAK IC8vIFRoaXMgY2FuIGJlIGVpdGhlciBhbiBBY2Nlc3NpYmlsaXR5T2JqZWN0IG9yIGFuIEFYSXNv bGF0ZWRPYmplY3QKIC0gKFdlYkNvcmU6OkFYQ29yZU9iamVjdCopYXhCYWNraW5nT2JqZWN0Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCmluZGV4IDU5MmJlOTY4NTA1 MDE0ZTZmYjM4NDE1NWY1N2FkODEwYzNkMzJiYTMuLjhjZThhMGU1YzY3ZDdlZGFhMjNjZGFkMDU3 OTEwOWFjNWUyOWQ0OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2Uu bW0KQEAgLTMzNSw3ICszMzUsNyBAQCBOU0FycmF5ICpjb252ZXJ0VG9OU0FycmF5KGNvbnN0IFdl YkNvcmU6OkFYQ29yZU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdAogICAgIFtzZWxm IGRldGFjaEFYT2JqZWN0XTsKIH0KIAotLSAoQk9PTCl1cGRhdGVPYmplY3RCYWNraW5nU3RvcmUK Ky0gKFdlYkNvcmU6OkFYQ29yZU9iamVjdCopdXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlCiB7CiAg ICAgLy8gQ2FsbGluZyB1cGRhdGVCYWNraW5nU3RvcmUoKSBjYW4gaW52YWxpZGF0ZSB0aGlzIGVs ZW1lbnQgc28gc2VsZiBtdXN0IGJlIHJldGFpbmVkLgogICAgIC8vIElmIGl0IGRvZXMgYmVjb21l IGludmFsaWRhdGVkLCBzZWxmLmF4QmFja2luZ09iamVjdCB3aWxsIGJlIG5pbC4KQEAgLTM0Mywx MyArMzQzLDExIEBAIE5TQXJyYXkgKmNvbnZlcnRUb05TQXJyYXkoY29uc3QgV2ViQ29yZTo6QVhD b3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0CiAgICAgQ0ZBdXRvcmVsZWFzZSgo X19icmlkZ2UgQ0ZUeXBlUmVmKXNlbGYpOwogCiAgICAgaWYgKCFzZWxmLmF4QmFja2luZ09iamVj dCkKLSAgICAgICAgcmV0dXJuIE5POwotICAgIAorICAgICAgICByZXR1cm4gbmlsOworCiAgICAg c2VsZi5heEJhY2tpbmdPYmplY3QtPnVwZGF0ZUJhY2tpbmdTdG9yZSgpOwotICAgIGlmICghc2Vs Zi5heEJhY2tpbmdPYmplY3QpCi0gICAgICAgIHJldHVybiBOTzsKLSAgICAKLSAgICByZXR1cm4g WUVTOworCisgICAgcmV0dXJuIHNlbGYuYXhCYWNraW5nT2JqZWN0OwogfQogCiAtIChpZClhdHRh Y2htZW50VmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCAw MzRiNjBmNmJiMTRkYjgzMWJiYjk3Yzg1MTA5NDIzZmVhZDBjNDRmLi40NzM1NzVmY2M0NDU2ZWE4 YTg0Y2FhYWZlMTVjMDBiMjA3ZmQwMWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlck1hYy5tbQpAQCAtMTM0MSw5ICsxMzQxLDEwIEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVN RU5UQVRJT05TX0JFR0lOCiAtIChOU0FycmF5KilhY2Nlc3NpYmlsaXR5QWN0aW9uTmFtZXMKIEFM TE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogewotICAgIGlmICghW3NlbGYgdXBk YXRlT2JqZWN0QmFja2luZ1N0b3JlXSkKKyAgICBhdXRvKiBiYWNraW5nT2JqZWN0ID0gc2VsZi51 cGRhdGVPYmplY3RCYWNraW5nU3RvcmU7CisgICAgaWYgKCFiYWNraW5nT2JqZWN0KQogICAgICAg ICByZXR1cm4gbmlsOwotICAgIAorCiAgICAgLy8gQWxsIGVsZW1lbnRzIHNob3VsZCBnZXQgU2hv d01lbnUgYW5kIFNjcm9sbFRvVmlzaWJsZS4KICAgICAvLyBCdXQgY2VydGFpbiBlYXJsaWVyIFZv aWNlT3ZlciB2ZXJzaW9ucyBkbyBub3Qgc3VwcG9ydCBzY3JvbGwgdG8gdmlzaWJsZSwgYW5kIGl0 IGNvbmZ1c2VzIHRoZW0gdG8gc2VlIGl0IGluIHRoZSBsaXN0LgogICAgIHN0YXRpYyBOU0FycmF5 ICpkZWZhdWx0RWxlbWVudEFjdGlvbnMgPSBbW05TQXJyYXkgYWxsb2NdIGluaXRXaXRoT2JqZWN0 czpOU0FjY2Vzc2liaWxpdHlTaG93TWVudUFjdGlvbiwgTlNBY2Nlc3NpYmlsaXR5U2Nyb2xsVG9W aXNpYmxlQWN0aW9uLCBuaWxdOwpAQCAtMTM1NywxOSArMTM1OCwxOSBAQCBBTExPV19ERVBSRUNB VEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIAogICAgIC8vIFNsaWRlciBlbGVtZW50cyBhbGxvdyBJ bmNyZW1lbnQvRGVjcmVtZW50LgogICAgIHN0YXRpYyBOU0FycmF5ICpzbGlkZXJBY3Rpb25zID0g W1tkZWZhdWx0RWxlbWVudEFjdGlvbnMgYXJyYXlCeUFkZGluZ09iamVjdHNGcm9tQXJyYXk6W05T QXJyYXkgYXJyYXlXaXRoT2JqZWN0czpOU0FjY2Vzc2liaWxpdHlJbmNyZW1lbnRBY3Rpb24sIE5T QWNjZXNzaWJpbGl0eURlY3JlbWVudEFjdGlvbiwgbmlsXV0gcmV0YWluXTsKLSAgICAKKwogICAg IE5TQXJyYXkgKmFjdGlvbnM7Ci0gICAgaWYgKHNlbGYuYXhCYWNraW5nT2JqZWN0LT5zdXBwb3J0 c1ByZXNzQWN0aW9uKCkpCisgICAgaWYgKGJhY2tpbmdPYmplY3QtPnN1cHBvcnRzUHJlc3NBY3Rp b24oKSkKICAgICAgICAgYWN0aW9ucyA9IGFjdGlvbkVsZW1lbnRBY3Rpb25zOwotICAgIGVsc2Ug aWYgKHNlbGYuYXhCYWNraW5nT2JqZWN0LT5pc01lbnVSZWxhdGVkKCkpCisgICAgZWxzZSBpZiAo YmFja2luZ09iamVjdC0+aXNNZW51UmVsYXRlZCgpKQogICAgICAgICBhY3Rpb25zID0gbWVudUVs ZW1lbnRBY3Rpb25zOwotICAgIGVsc2UgaWYgKHNlbGYuYXhCYWNraW5nT2JqZWN0LT5pc1NsaWRl cigpKQorICAgIGVsc2UgaWYgKGJhY2tpbmdPYmplY3QtPmlzU2xpZGVyKCkpCiAgICAgICAgIGFj dGlvbnMgPSBzbGlkZXJBY3Rpb25zOwotICAgIGVsc2UgaWYgKHNlbGYuYXhCYWNraW5nT2JqZWN0 LT5pc0F0dGFjaG1lbnQoKSkKKyAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5pc0F0dGFjaG1l bnQoKSkKICAgICAgICAgYWN0aW9ucyA9IFtbc2VsZiBhdHRhY2htZW50Vmlld10gYWNjZXNzaWJp bGl0eUFjdGlvbk5hbWVzXTsKICAgICBlbHNlCiAgICAgICAgIGFjdGlvbnMgPSBkZWZhdWx0RWxl bWVudEFjdGlvbnM7Ci0gICAgCisKICAgICByZXR1cm4gYWN0aW9uczsKIH0KIApAQCAtMjM3MSwx MCArMjM3Miw5IEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0JFR0lOCiAtIChp ZClhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6KE5TU3RyaW5nKilhdHRyaWJ1dGVOYW1lCiBB TExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIHsKLSAgICBpZiAoIVtzZWxmIHVw ZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byogYmFja2luZ09iamVjdCA9IHNlbGYu dXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICghYmFja2luZ09iamVjdCkKICAgICAg ICAgcmV0dXJuIG5pbDsKLSAgICAvLyBGSVhNRTogbWFrZSB1cGRhdGVPYmplY3RCYWNraW5nU3Rv cmUgYWJvdmUgcmV0dXJuIHRoZSBiYWNraW5nIG9iamVjdC4KLSAgICBhdXRvKiBiYWNraW5nT2Jq ZWN0ID0gc2VsZi5heEJhY2tpbmdPYmplY3Q7CiAKICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNE ZXRhY2hlZEZyb21QYXJlbnQoKSkKICAgICAgICAgcmV0dXJuIG5pbDsKQEAgLTMxOTcsMjMgKzMx OTcsMjIgQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAKIC0gKGlkKWFj Y2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50CiB7Ci0gICAgaWYgKCFbc2VsZiB1cGRhdGVPYmpl Y3RCYWNraW5nU3RvcmVdKQotICAgICAgICByZXR1cm4gbmlsOwotICAgIAotICAgIGF1dG8gZm9j dXNlZE9iamVjdCA9IHNlbGYuYXhCYWNraW5nT2JqZWN0LT5mb2N1c2VkVUlFbGVtZW50KCk7Ci0g ICAgaWYgKCFmb2N1c2VkT2JqZWN0KQorICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBzZWxmLnVw ZGF0ZU9iamVjdEJhY2tpbmdTdG9yZTsKKyAgICBpZiAoIWJhY2tpbmdPYmplY3QpCiAgICAgICAg IHJldHVybiBuaWw7Ci0gICAgCi0gICAgcmV0dXJuIGZvY3VzZWRPYmplY3QtPndyYXBwZXIoKTsK KworICAgIGF1dG8gZm9jdXNlZE9iamVjdCA9IGJhY2tpbmdPYmplY3QtPmZvY3VzZWRVSUVsZW1l bnQoKTsKKyAgICByZXR1cm4gZm9jdXNlZE9iamVjdCA/IGZvY3VzZWRPYmplY3QtPndyYXBwZXIo KSA6IG5pbDsKIH0KIAogLSAoaWQpYWNjZXNzaWJpbGl0eUhpdFRlc3Q6KE5TUG9pbnQpcG9pbnQK IHsKLSAgICBpZiAoIVtzZWxmIHVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byog YmFja2luZ09iamVjdCA9IHNlbGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICgh YmFja2luZ09iamVjdCkKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAKLSAgICBzZWxmLmF4QmFj a2luZ09iamVjdC0+dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOwotICAgIEFYQ29yZU9iamVj dCogYXhPYmplY3QgPSBzZWxmLmF4QmFja2luZ09iamVjdC0+YWNjZXNzaWJpbGl0eUhpdFRlc3Qo SW50UG9pbnQocG9pbnQpKTsKKworICAgIGJhY2tpbmdPYmplY3QtPnVwZGF0ZUNoaWxkcmVuSWZO ZWNlc3NhcnkoKTsKKyAgICBBWENvcmVPYmplY3QqIGF4T2JqZWN0ID0gYmFja2luZ09iamVjdC0+ YWNjZXNzaWJpbGl0eUhpdFRlc3QoSW50UG9pbnQocG9pbnQpKTsKICAgICBpZiAoYXhPYmplY3Qp IHsKICAgICAgICAgaWYgKGF4T2JqZWN0LT5pc0F0dGFjaG1lbnQoKSAmJiBbYXhPYmplY3QtPndy YXBwZXIoKSBhdHRhY2htZW50Vmlld10pCiAgICAgICAgICAgICByZXR1cm4gW2F4T2JqZWN0LT53 cmFwcGVyKCkgYXR0YWNobWVudFZpZXddOwpAQCAtMzIyNiw0NSArMzIyNSw0NSBAQCBBTExPV19E RVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19CRUdJTgogLSAoQk9PTClhY2Nlc3NpYmlsaXR5SXNB dHRyaWJ1dGVTZXR0YWJsZTooTlNTdHJpbmcqKWF0dHJpYnV0ZU5hbWUKIEFMTE9XX0RFUFJFQ0FU RURfSU1QTEVNRU5UQVRJT05TX0VORAogewotICAgIGlmICghW3NlbGYgdXBkYXRlT2JqZWN0QmFj a2luZ1N0b3JlXSkKKyAgICBhdXRvKiBiYWNraW5nT2JqZWN0ID0gc2VsZi51cGRhdGVPYmplY3RC YWNraW5nU3RvcmU7CisgICAgaWYgKCFiYWNraW5nT2JqZWN0KQogICAgICAgICByZXR1cm4gTk87 Ci0gICAgCisKICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBAIkFYU2Vs ZWN0ZWRUZXh0TWFya2VyUmFuZ2UiXSkKICAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAKKwogICAg IGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6IE5TQWNjZXNzaWJpbGl0eUZvY3Vz ZWRBdHRyaWJ1dGVdKQotICAgICAgICByZXR1cm4gc2VsZi5heEJhY2tpbmdPYmplY3QtPmNhblNl dEZvY3VzQXR0cmlidXRlKCk7Ci0gICAgCisgICAgICAgIHJldHVybiBiYWNraW5nT2JqZWN0LT5j YW5TZXRGb2N1c0F0dHJpYnV0ZSgpOworCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxU b1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5VmFsdWVBdHRyaWJ1dGVdKQotICAgICAgICByZXR1cm4g c2VsZi5heEJhY2tpbmdPYmplY3QtPmNhblNldFZhbHVlQXR0cmlidXRlKCk7Ci0gICAgCisgICAg ICAgIHJldHVybiBiYWNraW5nT2JqZWN0LT5jYW5TZXRWYWx1ZUF0dHJpYnV0ZSgpOworCiAgICAg aWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5U2VsZWN0 ZWRBdHRyaWJ1dGVdKQotICAgICAgICByZXR1cm4gc2VsZi5heEJhY2tpbmdPYmplY3QtPmNhblNl dFNlbGVjdGVkQXR0cmlidXRlKCk7Ci0gICAgCisgICAgICAgIHJldHVybiBiYWNraW5nT2JqZWN0 LT5jYW5TZXRTZWxlY3RlZEF0dHJpYnV0ZSgpOworCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlz RXF1YWxUb1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5U2VsZWN0ZWRDaGlsZHJlbkF0dHJpYnV0ZV0p Ci0gICAgICAgIHJldHVybiBzZWxmLmF4QmFja2luZ09iamVjdC0+Y2FuU2V0U2VsZWN0ZWRDaGls ZHJlbkF0dHJpYnV0ZSgpOwotICAgIAorICAgICAgICByZXR1cm4gYmFja2luZ09iamVjdC0+Y2Fu U2V0U2VsZWN0ZWRDaGlsZHJlbkF0dHJpYnV0ZSgpOworCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1l IGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlEaXNjbG9zaW5nQXR0cmlidXRlXQogICAg ICAgICB8fCBbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5RXhw YW5kZWRBdHRyaWJ1dGVdKQotICAgICAgICByZXR1cm4gc2VsZi5heEJhY2tpbmdPYmplY3QtPmNh blNldEV4cGFuZGVkQXR0cmlidXRlKCk7Ci0gICAgCisgICAgICAgIHJldHVybiBiYWNraW5nT2Jq ZWN0LT5jYW5TZXRFeHBhbmRlZEF0dHJpYnV0ZSgpOworCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1l IGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlTZWxlY3RlZFJvd3NBdHRyaWJ1dGVdKQog ICAgICAgICByZXR1cm4gWUVTOwotICAgIAotICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFs VG9TdHJpbmc6IE5TQWNjZXNzaWJpbGl0eVNlbGVjdGVkVGV4dEF0dHJpYnV0ZV0gfHwKLSAgICAg ICAgW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlTZWxlY3Rl ZFRleHRSYW5nZUF0dHJpYnV0ZV0gfHwKLSAgICAgICAgW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRv U3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlWaXNpYmxlQ2hhcmFjdGVyUmFuZ2VBdHRyaWJ1dGVdKQot ICAgICAgICByZXR1cm4gc2VsZi5heEJhY2tpbmdPYmplY3QtPmNhblNldFRleHRSYW5nZUF0dHJp YnV0ZXMoKTsKLSAgICAKKworICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6 IE5TQWNjZXNzaWJpbGl0eVNlbGVjdGVkVGV4dEF0dHJpYnV0ZV0KKyAgICAgICAgfHwgW2F0dHJp YnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlTZWxlY3RlZFRleHRSYW5n ZUF0dHJpYnV0ZV0KKyAgICAgICAgfHwgW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBO U0FjY2Vzc2liaWxpdHlWaXNpYmxlQ2hhcmFjdGVyUmFuZ2VBdHRyaWJ1dGVdKQorICAgICAgICBy ZXR1cm4gYmFja2luZ09iamVjdC0+Y2FuU2V0VGV4dFJhbmdlQXR0cmlidXRlcygpOworCiAgICAg aWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlHcmFiYmVk QXR0cmlidXRlXSkKICAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAKLSAgICBpZiAoc2VsZi5heEJh Y2tpbmdPYmplY3QtPmlzV2ViQXJlYSgpICYmIFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmlu ZzpOU0FjY2Vzc2liaWxpdHlQcmV2ZW50S2V5Ym9hcmRET01FdmVudERpc3BhdGNoQXR0cmlidXRl XSkKLSAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAKLSAgICBpZiAoc2VsZi5heEJhY2tpbmdPYmpl Y3QtPmlzV2ViQXJlYSgpICYmIFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vz c2liaWxpdHlDYXJldEJyb3dzaW5nRW5hYmxlZEF0dHJpYnV0ZV0pCisKKyAgICBpZiAoYmFja2lu Z09iamVjdC0+aXNXZWJBcmVhKCkKKyAgICAgICAgJiYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxU b1N0cmluZzpOU0FjY2Vzc2liaWxpdHlQcmV2ZW50S2V5Ym9hcmRET01FdmVudERpc3BhdGNoQXR0 cmlidXRlXQorICAgICAgICAgICAgfHwgW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5T QWNjZXNzaWJpbGl0eUNhcmV0QnJvd3NpbmdFbmFibGVkQXR0cmlidXRlXSkpCiAgICAgICAgIHJl dHVybiBZRVM7Ci0gICAgCisKICAgICByZXR1cm4gTk87CiB9CiAKQEAgLTMyODEsMjIgKzMyODAs MjIgQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfQkVHSU4KIC0gKEJPT0wpYWNj ZXNzaWJpbGl0eUlzSWdub3JlZAogQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5E CiB7Ci0gICAgaWYgKCFbc2VsZiB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdKQorICAgIGF1dG8q IGJhY2tpbmdPYmplY3QgPSBzZWxmLnVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZTsKKyAgICBpZiAo IWJhY2tpbmdPYmplY3QpCiAgICAgICAgIHJldHVybiBZRVM7Ci0gICAgCi0gICAgaWYgKHNlbGYu YXhCYWNraW5nT2JqZWN0LT5pc0F0dGFjaG1lbnQoKSkKKworICAgIGlmIChiYWNraW5nT2JqZWN0 LT5pc0F0dGFjaG1lbnQoKSkKICAgICAgICAgcmV0dXJuIFtbc2VsZiBhdHRhY2htZW50Vmlld10g YWNjZXNzaWJpbGl0eUlzSWdub3JlZF07Ci0gICAgcmV0dXJuIHNlbGYuYXhCYWNraW5nT2JqZWN0 LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCk7CisgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPmFj Y2Vzc2liaWxpdHlJc0lnbm9yZWQoKTsKIH0KIAogQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRB VElPTlNfQkVHSU4KIC0gKE5TQXJyYXkqIClhY2Nlc3NpYmlsaXR5UGFyYW1ldGVyaXplZEF0dHJp YnV0ZU5hbWVzCiBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIHsKLSAgICBp ZiAoIVtzZWxmIHVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byogYmFja2luZ09i amVjdCA9IHNlbGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICghYmFja2luZ09i amVjdCkKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAvLyBGSVhNRTogbWFrZSB1cGRhdGVPYmpl Y3RCYWNraW5nU3RvcmUgYWJvdmUgcmV0dXJuIHRoZSBiYWNraW5nIG9iamVjdC4KLSAgICBhdXRv KiBiYWNraW5nT2JqZWN0ID0gc2VsZi5heEJhY2tpbmdPYmplY3Q7CiAKICAgICBpZiAoYmFja2lu Z09iamVjdC0+aXNBdHRhY2htZW50KCkpCiAgICAgICAgIHJldHVybiBuaWw7CkBAIC0zNDA4LDEz ICszNDA3LDE0IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAKIC0gKHZv aWQpX2FjY2Vzc2liaWxpdHlQZXJmb3JtUHJlc3NBY3Rpb24KIHsKLSAgICBpZiAoIVtzZWxmIHVw ZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byogYmFja2luZ09iamVjdCA9IHNlbGYu dXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICghYmFja2luZ09iamVjdCkKICAgICAg ICAgcmV0dXJuOwotICAgIAotICAgIGlmIChzZWxmLmF4QmFja2luZ09iamVjdC0+aXNBdHRhY2ht ZW50KCkpCisKKyAgICBpZiAoYmFja2luZ09iamVjdC0+aXNBdHRhY2htZW50KCkpCiAgICAgICAg IFtbc2VsZiBhdHRhY2htZW50Vmlld10gYWNjZXNzaWJpbGl0eVBlcmZvcm1BY3Rpb246TlNBY2Nl c3NpYmlsaXR5UHJlc3NBY3Rpb25dOwogICAgIGVsc2UKLSAgICAgICAgc2VsZi5heEJhY2tpbmdP YmplY3QtPnByZXNzKCk7CisgICAgICAgIGJhY2tpbmdPYmplY3QtPnByZXNzKCk7CiB9CiAKIC0g KHZvaWQpYWNjZXNzaWJpbGl0eVBlcmZvcm1JbmNyZW1lbnRBY3Rpb24KQEAgLTM0MjYsMTMgKzM0 MjYsMTQgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KIAogLSAodm9pZClf YWNjZXNzaWJpbGl0eVBlcmZvcm1JbmNyZW1lbnRBY3Rpb24KIHsKLSAgICBpZiAoIVtzZWxmIHVw ZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byogYmFja2luZ09iamVjdCA9IHNlbGYu dXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICghYmFja2luZ09iamVjdCkKICAgICAg ICAgcmV0dXJuOwotICAgIAotICAgIGlmIChzZWxmLmF4QmFja2luZ09iamVjdC0+aXNBdHRhY2ht ZW50KCkpCisKKyAgICBpZiAoYmFja2luZ09iamVjdC0+aXNBdHRhY2htZW50KCkpCiAgICAgICAg IFtbc2VsZiBhdHRhY2htZW50Vmlld10gYWNjZXNzaWJpbGl0eVBlcmZvcm1BY3Rpb246TlNBY2Nl c3NpYmlsaXR5SW5jcmVtZW50QWN0aW9uXTsKICAgICBlbHNlCi0gICAgICAgIHNlbGYuYXhCYWNr aW5nT2JqZWN0LT5pbmNyZW1lbnQoKTsKKyAgICAgICAgYmFja2luZ09iamVjdC0+aW5jcmVtZW50 KCk7CiB9CiAKIC0gKHZvaWQpYWNjZXNzaWJpbGl0eVBlcmZvcm1EZWNyZW1lbnRBY3Rpb24KQEAg LTM0NDQsMTMgKzM0NDUsMTQgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4K IAogLSAodm9pZClfYWNjZXNzaWJpbGl0eVBlcmZvcm1EZWNyZW1lbnRBY3Rpb24KIHsKLSAgICBp ZiAoIVtzZWxmIHVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byogYmFja2luZ09i amVjdCA9IHNlbGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICghYmFja2luZ09i amVjdCkKICAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGlmIChzZWxmLmF4QmFja2luZ09iamVj dC0+aXNBdHRhY2htZW50KCkpCisKKyAgICBpZiAoYmFja2luZ09iamVjdC0+aXNBdHRhY2htZW50 KCkpCiAgICAgICAgIFtbc2VsZiBhdHRhY2htZW50Vmlld10gYWNjZXNzaWJpbGl0eVBlcmZvcm1B Y3Rpb246TlNBY2Nlc3NpYmlsaXR5RGVjcmVtZW50QWN0aW9uXTsKICAgICBlbHNlCi0gICAgICAg IHNlbGYuYXhCYWNraW5nT2JqZWN0LT5kZWNyZW1lbnQoKTsKKyAgICAgICAgYmFja2luZ09iamVj dC0+ZGVjcmVtZW50KCk7CiB9CiAKIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORApA QCAtMzUyNiw0OSArMzUyOCw0NiBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19C RUdJTgogLSAodm9pZClhY2Nlc3NpYmlsaXR5UGVyZm9ybUFjdGlvbjooTlNTdHJpbmcqKWFjdGlv bgogQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiB7Ci0gICAgaWYgKCFbc2Vs ZiB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdKQorICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBz ZWxmLnVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZTsKKyAgICBpZiAoIWJhY2tpbmdPYmplY3QpCiAg ICAgICAgIHJldHVybjsKLSAgICAKKwogICAgIGlmIChbYWN0aW9uIGlzRXF1YWxUb1N0cmluZzpO U0FjY2Vzc2liaWxpdHlQcmVzc0FjdGlvbl0pCiAgICAgICAgIFtzZWxmIGFjY2Vzc2liaWxpdHlQ ZXJmb3JtUHJlc3NBY3Rpb25dOwotICAgIAotICAgIC8vIFVzZWQgaW4gbGF5b3V0IHRlc3RzLCBz byB0aGF0IHdlIGRvbid0IGhhdmUgdG8gd2FpdCBmb3IgdGhlIGFzeW5jIHByZXNzIGFjdGlvbi4K LSAgICBlbHNlIGlmIChbYWN0aW9uIGlzRXF1YWxUb1N0cmluZzpAIkFYU3luY1ByZXNzQWN0aW9u Il0pCisgICAgZWxzZSBpZiAoW2FjdGlvbiBpc0VxdWFsVG9TdHJpbmc6QCJBWFN5bmNQcmVzc0Fj dGlvbiJdKSB7CisgICAgICAgIC8vIFVzZWQgaW4gbGF5b3V0IHRlc3RzLCBzbyB0aGF0IHdlIGRv bid0IGhhdmUgdG8gd2FpdCBmb3IgdGhlIGFzeW5jIHByZXNzIGFjdGlvbi4KICAgICAgICAgW3Nl bGYgX2FjY2Vzc2liaWxpdHlQZXJmb3JtUHJlc3NBY3Rpb25dOwotICAgIAorICAgIH0KICAgICBl bHNlIGlmIChbYWN0aW9uIGlzRXF1YWxUb1N0cmluZzpAIkFYU3luY0luY3JlbWVudEFjdGlvbiJd KQogICAgICAgICBbc2VsZiBfYWNjZXNzaWJpbGl0eVBlcmZvcm1JbmNyZW1lbnRBY3Rpb25dOwot ICAgIAogICAgIGVsc2UgaWYgKFthY3Rpb24gaXNFcXVhbFRvU3RyaW5nOkAiQVhTeW5jRGVjcmVt ZW50QWN0aW9uIl0pCiAgICAgICAgIFtzZWxmIF9hY2Nlc3NpYmlsaXR5UGVyZm9ybURlY3JlbWVu dEFjdGlvbl07Ci0gICAgCiAgICAgZWxzZSBpZiAoW2FjdGlvbiBpc0VxdWFsVG9TdHJpbmc6TlNB Y2Nlc3NpYmlsaXR5U2hvd01lbnVBY3Rpb25dKQogICAgICAgICBbc2VsZiBhY2Nlc3NpYmlsaXR5 UGVyZm9ybVNob3dNZW51QWN0aW9uXTsKLSAgICAKICAgICBlbHNlIGlmIChbYWN0aW9uIGlzRXF1 YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlJbmNyZW1lbnRBY3Rpb25dKQogICAgICAgICBbc2Vs ZiBhY2Nlc3NpYmlsaXR5UGVyZm9ybUluY3JlbWVudEFjdGlvbl07Ci0gICAgCiAgICAgZWxzZSBp ZiAoW2FjdGlvbiBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5RGVjcmVtZW50QWN0aW9u XSkKICAgICAgICAgW3NlbGYgYWNjZXNzaWJpbGl0eVBlcmZvcm1EZWNyZW1lbnRBY3Rpb25dOwot ICAgIAogICAgIGVsc2UgaWYgKFthY3Rpb24gaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0 eVNjcm9sbFRvVmlzaWJsZUFjdGlvbl0pCiAgICAgICAgIFtzZWxmIGFjY2Vzc2liaWxpdHlTY3Jv bGxUb1Zpc2libGVdOwogfQogCiAtIChCT09MKWFjY2Vzc2liaWxpdHlSZXBsYWNlUmFuZ2U6KE5T UmFuZ2UpcmFuZ2Ugd2l0aFRleHQ6KE5TU3RyaW5nICopc3RyaW5nCiB7Ci0gICAgaWYgKCFbc2Vs ZiB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdKQorICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBz ZWxmLnVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZTsKKyAgICBpZiAoIWJhY2tpbmdPYmplY3QpCiAg ICAgICAgIHJldHVybiBOTzsKLSAgICAKLSAgICByZXR1cm4gc2VsZi5heEJhY2tpbmdPYmplY3Qt PnJlcGxhY2VUZXh0SW5SYW5nZShzdHJpbmcsIFBsYWluVGV4dFJhbmdlKHJhbmdlKSk7CisKKyAg ICByZXR1cm4gYmFja2luZ09iamVjdC0+cmVwbGFjZVRleHRJblJhbmdlKHN0cmluZywgUGxhaW5U ZXh0UmFuZ2UocmFuZ2UpKTsKIH0KIAogLSAoQk9PTClhY2Nlc3NpYmlsaXR5SW5zZXJ0VGV4dDoo TlNTdHJpbmcgKil0ZXh0CiB7Ci0gICAgaWYgKCFbc2VsZiB1cGRhdGVPYmplY3RCYWNraW5nU3Rv cmVdKQorICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBzZWxmLnVwZGF0ZU9iamVjdEJhY2tpbmdT dG9yZTsKKyAgICBpZiAoIWJhY2tpbmdPYmplY3QpCiAgICAgICAgIHJldHVybiBOTzsKIAotICAg IHJldHVybiBzZWxmLmF4QmFja2luZ09iamVjdC0+aW5zZXJ0VGV4dCh0ZXh0KTsKKyAgICByZXR1 cm4gYmFja2luZ09iamVjdC0+aW5zZXJ0VGV4dCh0ZXh0KTsKIH0KIAogQUxMT1dfREVQUkVDQVRF RF9JTVBMRU1FTlRBVElPTlNfQkVHSU4KQEAgLTM1ODksMTAgKzM1ODgsOSBAQCBBTExPV19ERVBS RUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIAogLSAodm9pZClfYWNjZXNzaWJpbGl0eVNldFZh bHVlOihpZCl2YWx1ZSBmb3JBdHRyaWJ1dGU6KE5TU3RyaW5nKilhdHRyaWJ1dGVOYW1lCiB7Ci0g ICAgaWYgKCFbc2VsZiB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdKQorICAgIGF1dG8qIGJhY2tp bmdPYmplY3QgPSBzZWxmLnVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZTsKKyAgICBpZiAoIWJhY2tp bmdPYmplY3QpCiAgICAgICAgIHJldHVybjsKLSAgICAvLyBGSVhNRTogbWFrZSB1cGRhdGVPYmpl Y3RCYWNraW5nU3RvcmUgYWJvdmUgcmV0dXJuIHRoZSBiYWNraW5nIG9iamVjdC4KLSAgICBhdXRv KiBiYWNraW5nT2JqZWN0ID0gc2VsZi5heEJhY2tpbmdPYmplY3Q7CiAKICAgICBpZCB0ZXh0TWFy a2VyUmFuZ2UgPSBuaWw7CiAgICAgTlNOdW1iZXIqICAgICAgICAgICAgICAgbnVtYmVyID0gbmls OwpAQCAtMzgzMywxMCArMzgzMSw5IEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05T X0JFR0lOCiAtIChpZClhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6KE5TU3RyaW5nKilhdHRy aWJ1dGUgZm9yUGFyYW1ldGVyOihpZClwYXJhbWV0ZXIKIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVN RU5UQVRJT05TX0VORAogewotICAgIGlmICghW3NlbGYgdXBkYXRlT2JqZWN0QmFja2luZ1N0b3Jl XSkKKyAgICBhdXRvKiBiYWNraW5nT2JqZWN0ID0gc2VsZi51cGRhdGVPYmplY3RCYWNraW5nU3Rv cmU7CisgICAgaWYgKCFiYWNraW5nT2JqZWN0KQogICAgICAgICByZXR1cm4gbmlsOwotICAgIC8v IEZJWE1FOiBtYWtlIHVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZSBhYm92ZSByZXR1cm4gdGhlIGJh Y2tpbmcgb2JqZWN0LgotICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBzZWxmLmF4QmFja2luZ09i amVjdDsKIAogICAgIC8vIEJhc2ljIHBhcmFtZXRlciB2YWxpZGF0aW9uLgogICAgIGlmICghYXR0 cmlidXRlIHx8ICFwYXJhbWV0ZXIpCkBAIC00NDEzLDg3ICs0NDEwLDkwIEBAIEFMTE9XX0RFUFJF Q0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogLy8gQVBJIHRoYXQgQXBwS2l0IHVzZXMgZm9yIGZh c3RlciBhY2Nlc3MKIC0gKE5TVUludGVnZXIpYWNjZXNzaWJpbGl0eUluZGV4T2ZDaGlsZDooaWQp Y2hpbGQKIHsKLSAgICBpZiAoIVtzZWxmIHVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAg YXV0byogYmFja2luZ09iamVjdCA9IHNlbGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAg IGlmICghYmFja2luZ09iamVjdCkKICAgICAgICAgcmV0dXJuIE5TTm90Rm91bmQ7Ci0gICAgCisK ICAgICAvLyBUcmVlIG9iamVjdHMgcmV0dXJuIHRoZWlyIHJvd3MgYXMgdGhlaXIgY2hpbGRyZW4u IFdlIGNhbiB1c2UgdGhlIG9yaWdpbmFsIG1ldGhvZAogICAgIC8vIGhlcmUsIGJlY2F1c2Ugd2Ug d29uJ3QgZ2FpbiBhbnkgc3BlZWQgdXAuCi0gICAgaWYgKHNlbGYuYXhCYWNraW5nT2JqZWN0LT5p c1RyZWUoKSkKKyAgICBpZiAoYmFja2luZ09iamVjdC0+aXNUcmVlKCkpCiAgICAgICAgIHJldHVy biBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4T2ZDaGlsZDpjaGlsZF07Ci0gICAgCisKICAgICBO U0FycmF5ICpjaGlsZHJlbiA9IHNlbGYuY2hpbGRyZW5WZWN0b3JBcnJheTsKICAgICBpZiAoIWNo aWxkcmVuLmNvdW50KQogICAgICAgICByZXR1cm4gW1tzZWxmIHJlbmRlcldpZGdldENoaWxkcmVu XSBpbmRleE9mT2JqZWN0OmNoaWxkXTsKLSAgICAKKwogICAgIE5TVUludGVnZXIgY291bnQgPSBb Y2hpbGRyZW4gY291bnRdOwogICAgIGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IGNvdW50OyAr K2kpIHsKICAgICAgICAgV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgKndyYXBwZXIgPSBj aGlsZHJlbltpXTsKLSAgICAgICAgYXV0byBiYWNraW5nT2JqZWN0ID0gW3dyYXBwZXIgYXhCYWNr aW5nT2JqZWN0XTsKLSAgICAgICAgaWYgKCFiYWNraW5nT2JqZWN0KQorICAgICAgICBhdXRvKiBv YmplY3QgPSB3cmFwcGVyLmF4QmFja2luZ09iamVjdDsKKyAgICAgICAgaWYgKCFvYmplY3QpCiAg ICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAod3JhcHBlciA9PSBjaGlsZCB8fCAo YmFja2luZ09iamVjdC0+aXNBdHRhY2htZW50KCkgJiYgW3dyYXBwZXIgYXR0YWNobWVudFZpZXdd ID09IGNoaWxkKSkKKyAgICAgICAgaWYgKHdyYXBwZXIgPT0gY2hpbGQgfHwgKG9iamVjdC0+aXNB dHRhY2htZW50KCkgJiYgW3dyYXBwZXIgYXR0YWNobWVudFZpZXddID09IGNoaWxkKSkKICAgICAg ICAgICAgIHJldHVybiBpOwogICAgIH0KLSAgICAKKwogICAgIHJldHVybiBOU05vdEZvdW5kOwog fQogCiBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogLSAoTlNVSW50ZWdlcilh Y2Nlc3NpYmlsaXR5QXJyYXlBdHRyaWJ1dGVDb3VudDooTlNTdHJpbmcgKilhdHRyaWJ1dGUKIHsK LSAgICBpZiAoIVtzZWxmIHVwZGF0ZU9iamVjdEJhY2tpbmdTdG9yZV0pCisgICAgYXV0byogYmFj a2luZ09iamVjdCA9IHNlbGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOworICAgIGlmICghYmFj a2luZ09iamVjdCkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgCisKICAgICBpZiAoW2F0dHJpYnV0 ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5BdHRyaWJ1dGVdKSB7CiAg ICAgICAgIC8vIFRyZWUgaXRlbXMgb2JqZWN0IHJldHVybnMgYSBkaWZmZXJlbnQgc2V0IG9mIGNo aWxkcmVuIHRoYW4gdGhvc2UgdGhhdCBhcmUgaW4gY2hpbGRyZW4oKQogICAgICAgICAvLyBiZWNh dXNlIGFuIEFYT3V0bGluZSAodGhlIG1hYyByb2xlIGlzIGJlY29tZXMpIGhhcyBzb21lIG9kZCBz dGlwdWxhdGlvbnMuCi0gICAgICAgIGlmIChzZWxmLmF4QmFja2luZ09iamVjdC0+aXNUcmVlKCkg fHwgc2VsZi5heEJhY2tpbmdPYmplY3QtPmlzVHJlZUl0ZW0oKSkKKyAgICAgICAgaWYgKGJhY2tp bmdPYmplY3QtPmlzVHJlZSgpIHx8IGJhY2tpbmdPYmplY3QtPmlzVHJlZUl0ZW0oKSkKICAgICAg ICAgICAgIHJldHVybiBbW3NlbGYgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOk5TQWNjZXNz aWJpbGl0eUNoaWxkcmVuQXR0cmlidXRlXSBjb3VudF07Ci0gICAgICAgIAorCiAgICAgICAgIGF1 dG8gY2hpbGRyZW5TaXplID0gc2VsZi5jaGlsZHJlblZlY3RvclNpemU7CiAgICAgICAgIGlmICgh Y2hpbGRyZW5TaXplKQogICAgICAgICAgICAgcmV0dXJuIFtbc2VsZiByZW5kZXJXaWRnZXRDaGls ZHJlbl0gY291bnRdOwotICAgICAgICAKKwogICAgICAgICByZXR1cm4gY2hpbGRyZW5TaXplOwog ICAgIH0KLSAgICAKKwogICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUFycmF5QXR0cmli dXRlQ291bnQ6YXR0cmlidXRlXTsKIH0KIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VO RAogCiAtIChOU0FycmF5ICopYWNjZXNzaWJpbGl0eUFycmF5QXR0cmlidXRlVmFsdWVzOihOU1N0 cmluZyAqKWF0dHJpYnV0ZSBpbmRleDooTlNVSW50ZWdlcilpbmRleCBtYXhDb3VudDooTlNVSW50 ZWdlciltYXhDb3VudAogewotICAgIGlmICghW3NlbGYgdXBkYXRlT2JqZWN0QmFja2luZ1N0b3Jl XSkKKyAgICBhdXRvKiBiYWNraW5nT2JqZWN0ID0gc2VsZi51cGRhdGVPYmplY3RCYWNraW5nU3Rv cmU7CisgICAgaWYgKCFiYWNraW5nT2JqZWN0KQogICAgICAgICByZXR1cm4gbmlsOwotICAgIAor CiAgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eUNoaWxk cmVuQXR0cmlidXRlXSkgewogICAgICAgICBpZiAoIXNlbGYuY2hpbGRyZW5WZWN0b3JTaXplKSB7 CiAgICAgICAgICAgICBOU0FycmF5ICpjaGlsZHJlbiA9IFtzZWxmIHJlbmRlcldpZGdldENoaWxk cmVuXTsKICAgICAgICAgICAgIGlmICghY2hpbGRyZW4pCiAgICAgICAgICAgICAgICAgcmV0dXJu IG5pbDsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICBOU1VJbnRlZ2VyIGNoaWxkQ291bnQg PSBbY2hpbGRyZW4gY291bnRdOwogICAgICAgICAgICAgaWYgKGluZGV4ID49IGNoaWxkQ291bnQp CiAgICAgICAgICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAg ICBOU1VJbnRlZ2VyIGFycmF5TGVuZ3RoID0gc3RkOjptaW4oY2hpbGRDb3VudCAtIGluZGV4LCBt YXhDb3VudCk7CiAgICAgICAgICAgICByZXR1cm4gW2NoaWxkcmVuIHN1YmFycmF5V2l0aFJhbmdl Ok5TTWFrZVJhbmdlKGluZGV4LCBhcnJheUxlbmd0aCldOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKHNlbGYuYXhCYWNraW5nT2JqZWN0LT5pc1RyZWUoKSB8fCBzZWxmLmF4QmFja2luZ09iamVj dC0+aXNUcmVlSXRlbSgpKSB7CisgICAgICAgIGlmIChiYWNraW5nT2JqZWN0LT5pc1RyZWUoKSB8 fCBiYWNraW5nT2JqZWN0LT5pc1RyZWVJdGVtKCkpIHsKICAgICAgICAgICAgIC8vIFRyZWUgb2Jq ZWN0cyByZXR1cm4gdGhlaXIgcm93cyBhcyB0aGVpciBjaGlsZHJlbiAmIHRyZWUgaXRlbXMgcmV0 dXJuIHRoZWlyIGNvbnRlbnRzIHNhbnMgcm93cy4KICAgICAgICAgICAgIC8vIFdlIGNhbiB1c2Ug dGhlIG9yaWdpbmFsIG1ldGhvZCBpbiB0aGlzIGNhc2UuCiAgICAgICAgICAgICByZXR1cm4gW3N1 cGVyIGFjY2Vzc2liaWxpdHlBcnJheUF0dHJpYnV0ZVZhbHVlczphdHRyaWJ1dGUgaW5kZXg6aW5k ZXggbWF4Q291bnQ6bWF4Q291bnRdOwogICAgICAgICB9Ci0gICAgICAgIAorCiAgICAgICAgIGF1 dG8gY2hpbGRyZW4gPSBzZWxmLmNoaWxkcmVuVmVjdG9yQXJyYXk7CiAgICAgICAgIHVuc2lnbmVk IGNoaWxkQ291bnQgPSBbY2hpbGRyZW4gY291bnRdOwogICAgICAgICBpZiAoaW5kZXggPj0gY2hp bGRDb3VudCkKICAgICAgICAgICAgIHJldHVybiBuaWw7Ci0gICAgICAgIAorCiAgICAgICAgIHVu c2lnbmVkIGF2YWlsYWJsZSA9IHN0ZDo6bWluKGNoaWxkQ291bnQgLSBpbmRleCwgbWF4Q291bnQp OwotICAgICAgICAKKwogICAgICAgICBOU011dGFibGVBcnJheSAqc3ViYXJyYXkgPSBbTlNNdXRh YmxlQXJyYXkgYXJyYXlXaXRoQ2FwYWNpdHk6YXZhaWxhYmxlXTsKICAgICAgICAgZm9yICh1bnNp Z25lZCBhZGRlZCA9IDA7IGFkZGVkIDwgYXZhaWxhYmxlOyArK2luZGV4LCArK2FkZGVkKSB7CiAg ICAgICAgICAgICBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciogd3JhcHBlciA9IGNoaWxk cmVuW2luZGV4XTsKQEAgLTQ1MDEsMTAgKzQ1MDEsMTAgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfRU5ECiAgICAgICAgICAgICBCT09MIGlzQXR0YWNobWVudCA9IFt3cmFwcGVyIGlz S2luZE9mQ2xhc3M6W1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGNsYXNzXV0gJiYgd3Jh cHBlci5heEJhY2tpbmdPYmplY3QtPmlzQXR0YWNobWVudCgpICYmIFt3cmFwcGVyIGF0dGFjaG1l bnRWaWV3XTsKICAgICAgICAgICAgIFtzdWJhcnJheSBhZGRPYmplY3Q6aXNBdHRhY2htZW50ID8g W3dyYXBwZXIgYXR0YWNobWVudFZpZXddIDogd3JhcHBlcl07CiAgICAgICAgIH0KLSAgICAgICAg CisKICAgICAgICAgcmV0dXJuIHN1YmFycmF5OwogICAgIH0KLSAgICAKKwogICAgIHJldHVybiBb c3VwZXIgYWNjZXNzaWJpbGl0eUFycmF5QXR0cmlidXRlVmFsdWVzOmF0dHJpYnV0ZSBpbmRleDpp bmRleCBtYXhDb3VudDptYXhDb3VudF07CiB9CiAK