219360 2020-11-30 10:50:20 -0800 [WebAccessibilityObjectWrapper doAXAttributedStringForRange] needs to run on the main thread. 2020-11-30 18:48:48 -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 1710673 0 andresg_22 2020-11-30 10:50:20 -0800 [WebAccessibilityObjectWrapper doAXAttributedStringForRange] needs to run on the main thread. 1710677 1 415034 andresg_22 2020-11-30 11:04:04 -0800 Created attachment 415034 Patch 1710899 2 ews-feeder 2020-11-30 18:38:00 -0800 Committed r270281: <https://trac.webkit.org/changeset/270281> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415034. 1710900 3 webkit-bug-importer 2020-11-30 18:38:19 -0800 <rdar://problem/71833027> 415034 2020-11-30 11:04:04 -0800 2020-11-30 18:48:48 -0800 Patch bug-219360-20201130140403.patch text/plain 11023 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODY3NWI1ZTM1MDJiMTc4 ZjRiZmI0NzEzZjU2OWRiMDkyMTE2ZTBhMC4uNWZhNzkwNDAyM2IzNWJjYmMxZTI3Y2VlMzcyZWU5 ZDNlMjRiYTUyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTExLTMwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIgZG9BWEF0dHJpYnV0ZWRTdHJpbmdGb3JSYW5nZV0gbmVlZHMg dG8gcnVuIG9uIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxOTM2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERpc3BhdGNoIHRoaXMgY2FsbCB0byB0aGUgbWFpbiB0aHJlYWQg aW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAgICAgICBJbiBhZGRpdGlvbiwgbW92ZWQgc2V2ZXJh bCBUZXh0TWFya2VyIHN0YXRpYyBmdW5jdGlvbnMgYW5kIE9iamVjdGl2ZUMKKyAgICAgICAgd3Jh cHBlcnMgb3V0IG9mIHRoZSBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBpbXBsZW1lbnRh dGlvbiBpbiBhbgorICAgICAgICBvbmdvaW5nIGVmZm9ydCB0byBtb3ZlIGNvcmUgY29kZSBvdXQg b2YgdGhlIGFjY2Vzc2liaWxpdHkgcGxhdGZvcm0KKyAgICAgICAgd3JhcHBlci4KKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW06CisgICAgICAgIChXZWJD b3JlOjp0ZXh0TWFya2VyUmFuZ2VGcm9tTWFya2Vycyk6CisgICAgICAgIChXZWJDb3JlOjpzdGFy dE9yRW5kVGV4dE1hcmtlckZvclJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OnRleHRNYXJrZXJS YW5nZUZyb21SYW5nZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJNYWMuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIgZG9BWEF0dHJpYnV0ZWRTdHJpbmdGb3JSYW5nZTpdKToKKyAgICAg ICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0 ZVZhbHVlOmZvclBhcmFtZXRlcjpdKToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIgdGV4dE1hcmtlclJhbmdlRnJvbVJhbmdlOl0pOiBEZWxldGVkLAorICAgICAgICBu b3QgbmVlZGVkLCBpbnN0ZWFkIGNhbGwgdGhlIEMgZnVuY3Rpb24gZGlyZWN0bHkuCisgICAgICAg ICh0ZXh0TWFya2VyUmFuZ2VGcm9tUmFuZ2UpOiBEZWxldGVkLCBtb3ZlZCB0byBBWE9iamVjdENh Y2hlTWFjLm1tLgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBzdGFy dE9yRW5kVGV4dE1hcmtlckZvclJhbmdlOmlzU3RhcnQ6XSk6CisgICAgICAgIERlbGV0ZWQsIG5v dCBuZWVkZWQsIGluc3RlYWQgY2FsbCB0aGUgQyBmdW5jdGlvbiBkaXJlY3RseS4KKyAgICAgICAg KHN0YXJ0T3JFbmRUZXh0bWFya2VyRm9yUmFuZ2UpOiBEZWxldGVkLCBNb3ZlZCB0byBBWE9iamVj dENhY2hlTWFjLm1tLgorCiAyMDIwLTExLTMwICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIy QGFwcGxlLmNvbT4KIAogICAgICAgICBBWElzb2xhdGVkVHJlZTo6bV9heE9iamVjdENhY2hlIHNo b3VsZCBub3QgYmUgYWNjZXNzZWQgb24gdGhlIHNlY29uZGFyeSBBWCB0aHJlYWQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1t IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQpp bmRleCA4MTAxMzZhZjJhZTU3NDhjYWI4YjJiODRjNDY5N2ZmMzZjMmEyODc2Li42YWRlMDMzM2U0 ZTJiN2M5OTdhZTZjNDBmNDJlNjIzMDhjM2UyODgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KQEAgLTYwMSw3ICs2MDEs NyBAQCBzdGF0aWMgaWQgQVhUZXh0TWFya2VyUmFuZ2UoaWQgc3RhcnRNYXJrZXIsIGlkIGVuZE1h cmtlcikKICAgICByZXR1cm4gQ0ZCcmlkZ2luZ1JlbGVhc2UoQVhUZXh0TWFya2VyUmFuZ2VDcmVh dGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgKEFYVGV4dE1hcmtlclJlZilzdGFydE1hcmtlciwgKEFY VGV4dE1hcmtlclJlZillbmRNYXJrZXIpKTsKIH0KIAotaWQgdGV4dE1hcmtlclJhbmdlRnJvbU1h cmtlcnMoaWQgdGV4dE1hcmtlcjEsIGlkIHRleHRNYXJrZXIyKQorc3RhdGljIGlkIHRleHRNYXJr ZXJSYW5nZUZyb21NYXJrZXJzKGlkIHRleHRNYXJrZXIxLCBpZCB0ZXh0TWFya2VyMikKIHsKICAg ICBpZiAoIXRleHRNYXJrZXIxIHx8ICF0ZXh0TWFya2VyMikKICAgICAgICAgcmV0dXJuIG5pbDsK QEAgLTYzNCw2ICs2MzQsMzEgQEAgaWQgdGV4dE1hcmtlclJhbmdlRnJvbVZpc2libGVQb3NpdGlv bnMoQVhPYmplY3RDYWNoZSogY2FjaGUsIGNvbnN0IFZpc2libGVQb3NpdGkKICAgICByZXR1cm4g dGV4dE1hcmtlclJhbmdlRnJvbU1hcmtlcnMoc3RhcnRUZXh0TWFya2VyLCBlbmRUZXh0TWFya2Vy KTsKIH0KIAoraWQgc3RhcnRPckVuZFRleHRNYXJrZXJGb3JSYW5nZShBWE9iamVjdENhY2hlKiBj YWNoZSwgY29uc3QgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+JiByYW5nZSwgYm9vbCBpc1N0YXJ0KQor eworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgaWYgKCFjYWNoZSB8fCAhcmFuZ2Up CisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBUZXh0TWFya2VyRGF0YSB0ZXh0TWFya2VyRGF0 YTsKKyAgICBjYWNoZS0+c3RhcnRPckVuZFRleHRNYXJrZXJEYXRhRm9yUmFuZ2UodGV4dE1hcmtl ckRhdGEsICpyYW5nZSwgaXNTdGFydCk7CisgICAgaWYgKCF0ZXh0TWFya2VyRGF0YS5heElEKQor ICAgICAgICByZXR1cm4gbmlsOworCisgICAgcmV0dXJuIENGQnJpZGdpbmdSZWxlYXNlKEFYVGV4 dE1hcmtlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAoY29uc3QgVUludDgqKSZ0ZXh0TWFy a2VyRGF0YSwgc2l6ZW9mKHRleHRNYXJrZXJEYXRhKSkpOworfQorCitpZCB0ZXh0TWFya2VyUmFu Z2VGcm9tUmFuZ2UoQVhPYmplY3RDYWNoZSogY2FjaGUsIGNvbnN0IE9wdGlvbmFsPFNpbXBsZVJh bmdlPiYgcmFuZ2UpCit7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBpZiAoIWNh Y2hlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgaWQgc3RhcnRUZXh0TWFya2VyID0gc3Rh cnRPckVuZFRleHRNYXJrZXJGb3JSYW5nZShjYWNoZSwgcmFuZ2UsIHRydWUpOworICAgIGlkIGVu ZFRleHRNYXJrZXIgPSBzdGFydE9yRW5kVGV4dE1hcmtlckZvclJhbmdlKGNhY2hlLCByYW5nZSwg ZmFsc2UpOworICAgIHJldHVybiB0ZXh0TWFya2VyUmFuZ2VGcm9tTWFya2VycyhzdGFydFRleHRN YXJrZXIsIGVuZFRleHRNYXJrZXIpOworfQorCiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoQUNDRVNT SUJJTElUWSkgJiYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMuaCBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy TWFjLmgKaW5kZXggOGI1OGM1NzZmYTFiYjc1Mjg5ZTI5NDUzNzIzZTJlOTU0YTU1NGM3YS4uODk2 NjI2YWQ4OWRiNDliNDFkYzlmZmEwOTdmMTRlOGYzODY3YzNkZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJN YWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5oCkBAIC00OSw4ICs0OSw5IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotaWQgdGV4dE1hcmtlclJhbmdlRnJvbU1hcmtlcnMoaWQgdGV4dE1hcmtlcjEsIGlk IHRleHRNYXJrZXIyKTsKIGlkIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9zaXRpb24oQVhPYmplY3RD YWNoZSosIGNvbnN0IFZpc2libGVQb3NpdGlvbiYpOwogaWQgdGV4dE1hcmtlclJhbmdlRnJvbVZp c2libGVQb3NpdGlvbnMoQVhPYmplY3RDYWNoZSosIGNvbnN0IFZpc2libGVQb3NpdGlvbiYsIGNv bnN0IFZpc2libGVQb3NpdGlvbiYpOworaWQgc3RhcnRPckVuZFRleHRNYXJrZXJGb3JSYW5nZShB WE9iamVjdENhY2hlKiwgY29uc3QgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+JiwgYm9vbCBpc1N0YXJ0 KTsKK2lkIHRleHRNYXJrZXJSYW5nZUZyb21SYW5nZShBWE9iamVjdENhY2hlKiwgY29uc3QgT3B0 aW9uYWw8U2ltcGxlUmFuZ2U+Jik7CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW0KaW5kZXggYjNmOTRiMGE1Y2MwZWI0ZjgyNTYxOTExYmNjMTM0YWU3NTA0MjMxOC4u NmQzYjFmZTQ3NmVhMDVhMDU2Y2VmNTM2YzY5MGQ5M2IyNDk2YWYwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTc3OCw0MSArNzc4LDYgQEAgc3RhdGljIEFj Y2Vzc2liaWxpdHlPYmplY3QqIGFjY2Vzc2liaWxpdHlPYmplY3RGb3JUZXh0TWFya2VyKEFYT2Jq ZWN0Q2FjaGUqIGNhY2gKICAgICByZXR1cm4gY2FjaGUtPmFjY2Vzc2liaWxpdHlPYmplY3RGb3JU ZXh0TWFya2VyRGF0YSh0ZXh0TWFya2VyRGF0YSk7CiB9CiAKLS0gKGlkKXRleHRNYXJrZXJSYW5n ZUZyb21SYW5nZTooY29uc3QgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+JilyYW5nZQotewotICAgIGlm IChhdXRvKiBiYWNraW5nT2JqZWN0ID0gc2VsZi5heEJhY2tpbmdPYmplY3QpCi0gICAgICAgIHJl dHVybiB0ZXh0TWFya2VyUmFuZ2VGcm9tUmFuZ2UoYmFja2luZ09iamVjdC0+YXhPYmplY3RDYWNo ZSgpLCByYW5nZSk7Ci0gICAgcmV0dXJuIG5pbDsKLX0KLQotc3RhdGljIGlkIHRleHRNYXJrZXJS YW5nZUZyb21SYW5nZShBWE9iamVjdENhY2hlKiBjYWNoZSwgY29uc3QgT3B0aW9uYWw8U2ltcGxl UmFuZ2U+JiByYW5nZSkKLXsKLSAgICBpZCBzdGFydFRleHRNYXJrZXIgPSBzdGFydE9yRW5kVGV4 dG1hcmtlckZvclJhbmdlKGNhY2hlLCByYW5nZSwgdHJ1ZSk7Ci0gICAgaWQgZW5kVGV4dE1hcmtl ciA9IHN0YXJ0T3JFbmRUZXh0bWFya2VyRm9yUmFuZ2UoY2FjaGUsIHJhbmdlLCBmYWxzZSk7Ci0g ICAgcmV0dXJuIHRleHRNYXJrZXJSYW5nZUZyb21NYXJrZXJzKHN0YXJ0VGV4dE1hcmtlciwgZW5k VGV4dE1hcmtlcik7Ci19Ci0KLS0gKGlkKXN0YXJ0T3JFbmRUZXh0TWFya2VyRm9yUmFuZ2U6KGNv bnN0IE9wdGlvbmFsPFNpbXBsZVJhbmdlPiYpcmFuZ2UgaXNTdGFydDooQk9PTClpc1N0YXJ0Ci17 Ci0gICAgcmV0dXJuIHN0YXJ0T3JFbmRUZXh0bWFya2VyRm9yUmFuZ2Uoc2VsZi5heEJhY2tpbmdP YmplY3QtPmF4T2JqZWN0Q2FjaGUoKSwgcmFuZ2UsIGlzU3RhcnQpOwotfQotCi1zdGF0aWMgaWQg c3RhcnRPckVuZFRleHRtYXJrZXJGb3JSYW5nZShBWE9iamVjdENhY2hlKiBjYWNoZSwgY29uc3Qg T3B0aW9uYWw8U2ltcGxlUmFuZ2U+JiByYW5nZSwgYm9vbCBpc1N0YXJ0KQotewotICAgIGlmICgh Y2FjaGUpCi0gICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICBpZiAoIXJhbmdlKQotICAgICAgICBy ZXR1cm4gbmlsOwotCi0gICAgVGV4dE1hcmtlckRhdGEgdGV4dE1hcmtlckRhdGE7Ci0gICAgY2Fj aGUtPnN0YXJ0T3JFbmRUZXh0TWFya2VyRGF0YUZvclJhbmdlKHRleHRNYXJrZXJEYXRhLCAqcmFu Z2UsIGlzU3RhcnQpOwotICAgIGlmICghdGV4dE1hcmtlckRhdGEuYXhJRCkKLSAgICAgICAgcmV0 dXJuIG5pbDsKLQotICAgIHJldHVybiBDRkJyaWRnaW5nUmVsZWFzZShBWFRleHRNYXJrZXJDcmVh dGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgKGNvbnN0IFVJbnQ4KikmdGV4dE1hcmtlckRhdGEsIHNp emVvZih0ZXh0TWFya2VyRGF0YSkpKTsKLX0KLQogc3RhdGljIGlkIG5leHRUZXh0TWFya2VyRm9y Q2hhcmFjdGVyT2Zmc2V0KEFYT2JqZWN0Q2FjaGUqIGNhY2hlLCBDaGFyYWN0ZXJPZmZzZXQmIGNo YXJhY3Rlck9mZnNldCkKIHsKICAgICBpZiAoIWNhY2hlKQpAQCAtMzYyMyw4ICszNTg4LDE0IEBA IEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogLy8gb2JqZWN0IHRoYXQgaXMg c3BlY2lmaWVkIGJ5IHRoZSBnaXZlbiByYW5nZS4KIC0gKE5TQXR0cmlidXRlZFN0cmluZyAqKWRv QVhBdHRyaWJ1dGVkU3RyaW5nRm9yUmFuZ2U6KE5TUmFuZ2UpcmFuZ2UKIHsKLSAgICBhdXRvIHdl YlJhbmdlID0gc2VsZi5heEJhY2tpbmdPYmplY3QtPnJhbmdlRm9yUGxhaW5UZXh0UmFuZ2UocmFu Z2UpOwotICAgIHJldHVybiBbc2VsZiBkb0FYQXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJS YW5nZTpbc2VsZiB0ZXh0TWFya2VyUmFuZ2VGcm9tUmFuZ2U6d2ViUmFuZ2VdIHNwZWxsQ2hlY2s6 WUVTXTsKKyAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVBdXRvcmVsZWFzZWRWYWx1 ZUZyb21NYWluVGhyZWFkPE5TQXR0cmlidXRlZFN0cmluZyAqPihbJnJhbmdlLCBwcm90ZWN0ZWRT ZWxmID0gcmV0YWluUHRyKHNlbGYpXSAoKSAtPiBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3RyaW5n PiB7CisgICAgICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBwcm90ZWN0ZWRTZWxmLmdldCgpLmF4 QmFja2luZ09iamVjdDsKKyAgICAgICAgaWYgKCFiYWNraW5nT2JqZWN0KQorICAgICAgICAgICAg cmV0dXJuIG5pbDsKKworICAgICAgICBhdXRvIHdlYlJhbmdlID0gYmFja2luZ09iamVjdC0+cmFu Z2VGb3JQbGFpblRleHRSYW5nZShyYW5nZSk7CisgICAgICAgIHJldHVybiBbcHJvdGVjdGVkU2Vs ZiBkb0FYQXR0cmlidXRlZFN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZTp0ZXh0TWFya2VyUmFuZ2VG cm9tUmFuZ2UoYmFja2luZ09iamVjdC0+YXhPYmplY3RDYWNoZSgpLCB3ZWJSYW5nZSkgc3BlbGxD aGVjazpZRVNdOworICAgIH0pOwogfQogCiAvLyBGSVhNRTogTm8gcmVhc29uIGZvciB0aGlzIHRv IGJlIGEgbWV0aG9kIGluc3RlYWQgb2YgYSBmdW5jdGlvbjsgY2FuIGdldCBkb2N1bWVudCBmcm9t IHJhbmdlLgpAQCAtMzk1Myw3ICszOTI0LDcgQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRB VElPTlNfRU5ECiAgICAgICAgICAgICBpZiAocmFuZ2VzLmlzRW1wdHkoKSkKICAgICAgICAgICAg ICAgICByZXR1cm4gbmlsOwogICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZU5TQXJyYXkocmFuZ2Vz LCBbJl0gKGF1dG8mIHJhbmdlKSB7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFtwcm90ZWN0ZWRT ZWxmIHRleHRNYXJrZXJSYW5nZUZyb21SYW5nZTpyYW5nZV07CisgICAgICAgICAgICAgICAgcmV0 dXJuIHRleHRNYXJrZXJSYW5nZUZyb21SYW5nZShiYWNraW5nT2JqZWN0LT5heE9iamVjdENhY2hl KCksIHJhbmdlKTsKICAgICAgICAgICAgIH0pLmF1dG9yZWxlYXNlKCk7CiAgICAgICAgIH0pOwog ICAgIH0KQEAgLTQwMjksNyArNDAwMCw3IEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJ T05TX0VORAogICAgICAgICAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICAgICAgICAgIGlmIChh dXRvIG1pc3NwZWxsaW5nUmFuZ2UgPSBiYWNraW5nT2JqZWN0LT5taXNzcGVsbGluZ1JhbmdlKCpj cml0ZXJpYS5maXJzdCwgY3JpdGVyaWEuc2Vjb25kKSkKLSAgICAgICAgICAgICAgICByZXR1cm4g W3Byb3RlY3RlZFNlbGYgdGV4dE1hcmtlclJhbmdlRnJvbVJhbmdlOiptaXNzcGVsbGluZ1Jhbmdl XTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGV4dE1hcmtlclJhbmdlRnJvbVJhbmdlKGJhY2tp bmdPYmplY3QtPmF4T2JqZWN0Q2FjaGUoKSwgKm1pc3NwZWxsaW5nUmFuZ2UpOwogICAgICAgICAg ICAgcmV0dXJuIG5pbDsKICAgICAgICAgfSk7CiAgICAgfQpAQCAtNDA2OCw4ICs0MDM5LDggQEAg QUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAgICAgfQogCiAgICAgaWYgKFth dHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOkAiQVhUZXh0TWFya2VyUmFuZ2VGb3JVSUVsZW1lbnQi XSkgewotICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVBdXRvcmVsZWFzZWRW YWx1ZUZyb21NYWluVGhyZWFkPGlkPihbJnVpRWxlbWVudCwgcHJvdGVjdGVkU2VsZiA9IHJldGFp blB0cihzZWxmKV0gKCkgLT4gUmV0YWluUHRyPGlkPiB7Ci0gICAgICAgICAgICByZXR1cm4gW3By b3RlY3RlZFNlbGYgdGV4dE1hcmtlclJhbmdlRnJvbVJhbmdlOnVpRWxlbWVudC5nZXQoKS0+ZWxl bWVudFJhbmdlKCldOworICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVBdXRv cmVsZWFzZWRWYWx1ZUZyb21NYWluVGhyZWFkPGlkPihbJnVpRWxlbWVudF0gKCkgLT4gUmV0YWlu UHRyPGlkPiB7CisgICAgICAgICAgICByZXR1cm4gdGV4dE1hcmtlclJhbmdlRnJvbVJhbmdlKHVp RWxlbWVudC5nZXQoKS0+YXhPYmplY3RDYWNoZSgpLCB1aUVsZW1lbnQuZ2V0KCktPmVsZW1lbnRS YW5nZSgpKTsKICAgICAgICAgfSk7CiAgICAgfQogCkBAIC00MjIxLDcgKzQxOTIsNyBAQCBBTExP V19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgICAgIENoYXJhY3Rlck9m ZnNldCBjaGFyYWN0ZXJPZmZzZXQxID0gW3Byb3RlY3RlZFNlbGYgY2hhcmFjdGVyT2Zmc2V0Rm9y VGV4dE1hcmtlcjp0ZXh0TWFya2VyMV07CiAgICAgICAgICAgICBDaGFyYWN0ZXJPZmZzZXQgY2hh cmFjdGVyT2Zmc2V0MiA9IFtwcm90ZWN0ZWRTZWxmIGNoYXJhY3Rlck9mZnNldEZvclRleHRNYXJr ZXI6dGV4dE1hcmtlcjJdOwogICAgICAgICAgICAgYXV0byByYW5nZSA9IGNhY2hlLT5yYW5nZUZv clVub3JkZXJlZENoYXJhY3Rlck9mZnNldHMoY2hhcmFjdGVyT2Zmc2V0MSwgY2hhcmFjdGVyT2Zm c2V0Mik7Ci0gICAgICAgICAgICByZXR1cm4gW3Byb3RlY3RlZFNlbGYgdGV4dE1hcmtlclJhbmdl RnJvbVJhbmdlOnJhbmdlXTsKKyAgICAgICAgICAgIHJldHVybiB0ZXh0TWFya2VyUmFuZ2VGcm9t UmFuZ2UoY2FjaGUsIHJhbmdlKTsKICAgICAgICAgfSk7CiAgICAgfQogCkBAIC00MzE1LDE2ICs0 Mjg2LDE2IEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogCiAgICAgLy8g VXNlZCBvbmx5IGJ5IER1bXBSZW5kZXJUcmVlIChzbyBmYXIpLgogICAgIGlmIChbYXR0cmlidXRl IGlzRXF1YWxUb1N0cmluZzpAIkFYU3RhcnRUZXh0TWFya2VyRm9yVGV4dE1hcmtlclJhbmdlIl0p IHsKLSAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHk6OnJldHJpZXZlQXV0b3JlbGVhc2VkVmFs dWVGcm9tTWFpblRocmVhZDxpZD4oWyZ0ZXh0TWFya2VyUmFuZ2UsIHByb3RlY3RlZFNlbGYgPSBy ZXRhaW5QdHIoc2VsZildICgpIC0+IFJldGFpblB0cjxpZD4geworICAgICAgICByZXR1cm4gQWNj ZXNzaWJpbGl0eTo6cmV0cmlldmVBdXRvcmVsZWFzZWRWYWx1ZUZyb21NYWluVGhyZWFkPGlkPihb JnRleHRNYXJrZXJSYW5nZSwgJmJhY2tpbmdPYmplY3QsIHByb3RlY3RlZFNlbGYgPSByZXRhaW5Q dHIoc2VsZildICgpIC0+IFJldGFpblB0cjxpZD4gewogICAgICAgICAgICAgYXV0byByYW5nZSA9 IFtwcm90ZWN0ZWRTZWxmIHJhbmdlRm9yVGV4dE1hcmtlclJhbmdlOnRleHRNYXJrZXJSYW5nZV07 Ci0gICAgICAgICAgICByZXR1cm4gW3Byb3RlY3RlZFNlbGYgc3RhcnRPckVuZFRleHRNYXJrZXJG b3JSYW5nZTpyYW5nZSBpc1N0YXJ0OllFU107CisgICAgICAgICAgICByZXR1cm4gc3RhcnRPckVu ZFRleHRNYXJrZXJGb3JSYW5nZShiYWNraW5nT2JqZWN0LT5heE9iamVjdENhY2hlKCksIHJhbmdl LCB0cnVlKTsKICAgICAgICAgfSk7CiAgICAgfQogCiAgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVh bFRvU3RyaW5nOkAiQVhFbmRUZXh0TWFya2VyRm9yVGV4dE1hcmtlclJhbmdlIl0pIHsKLSAgICAg ICAgcmV0dXJuIEFjY2Vzc2liaWxpdHk6OnJldHJpZXZlQXV0b3JlbGVhc2VkVmFsdWVGcm9tTWFp blRocmVhZDxpZD4oWyZ0ZXh0TWFya2VyUmFuZ2UsIHByb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIo c2VsZildICgpIC0+IFJldGFpblB0cjxpZD4geworICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0 eTo6cmV0cmlldmVBdXRvcmVsZWFzZWRWYWx1ZUZyb21NYWluVGhyZWFkPGlkPihbJnRleHRNYXJr ZXJSYW5nZSwgJmJhY2tpbmdPYmplY3QsIHByb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIoc2VsZild ICgpIC0+IFJldGFpblB0cjxpZD4gewogICAgICAgICAgICAgYXV0byByYW5nZSA9IFtwcm90ZWN0 ZWRTZWxmIHJhbmdlRm9yVGV4dE1hcmtlclJhbmdlOnRleHRNYXJrZXJSYW5nZV07Ci0gICAgICAg ICAgICByZXR1cm4gW3Byb3RlY3RlZFNlbGYgc3RhcnRPckVuZFRleHRNYXJrZXJGb3JSYW5nZTpy YW5nZSBpc1N0YXJ0Ok5PXTsKKyAgICAgICAgICAgIHJldHVybiBzdGFydE9yRW5kVGV4dE1hcmtl ckZvclJhbmdlKGJhY2tpbmdPYmplY3QtPmF4T2JqZWN0Q2FjaGUoKSwgcmFuZ2UsIGZhbHNlKTsK ICAgICAgICAgfSk7CiAgICAgfQogCg==