239022 2022-04-08 17:09:32 -0700 Update listMarkerTextForNodeAndPosition() to return a StringView instead of a String 2022-04-10 19:30:20 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez aboxhall achristensen andresg_22 apinheiro cfleizach darin dmazzoni ews-watchlist ggaren jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1859945 0 cdumez 2022-04-08 17:09:32 -0700 Update listMarkerTextForNodeAndPosition() to return a StringView instead of a String. listMarkerTextForNodeAndPosition() has a StringView internally and none it its call sites actually need a String. The call sites either use StringBuilder or want a NSString*. This avoids unnecessary String allocations. 1859946 1 webkit-bug-importer 2022-04-08 17:09:44 -0700 <rdar://problem/91509602> 1859947 2 457129 cdumez 2022-04-08 17:12:13 -0700 Created attachment 457129 Patch 1860158 3 457129 darin 2022-04-10 15:54:12 -0700 Comment on attachment 457129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457129&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:684 > + [[attrString mutableString] appendString:text.createNSString().get()]; This could almost certainly be createNSStringWIthoutCopying() since mutable string functions take characters out of NSString objects, they don’t keep the NSString around. 1860162 4 cdumez 2022-04-10 16:04:52 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 457129 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457129&action=review > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:684 > > + [[attrString mutableString] appendString:text.createNSString().get()]; > > This could almost certainly be createNSStringWIthoutCopying() since mutable > string functions take characters out of NSString objects, they don’t keep > the NSString around. Ok. The previous code was actually using a createNSStringWithoutCopying() but looking at the doc for appendString:, I couldn't convince myself that it was safe. I'll go back to a createNSStringWithoutCopying() then. 1860166 5 457217 cdumez 2022-04-10 16:28:48 -0700 Created attachment 457217 Patch 1860177 6 ews-feeder 2022-04-10 18:33:33 -0700 Committed r292693 (249485@main): <https://commits.webkit.org/249485@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457217. 457129 2022-04-08 17:12:13 -0700 2022-04-10 16:28:46 -0700 Patch bug-239022-20220408171212.patch text/plain 8524 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE5ODQ5ZGNmMTFkN2I4 MmU1YmE4ODE3M2UzNjgzYTk5ZWI1MzVkNy4uNTQ2NjNkZGE3NTI1NDNlYzI3ZDE4NWYyNTQyY2M4 ZDczOWJiYzJhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTA0LTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGxpc3RNYXJrZXJU ZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKCkgdG8gcmV0dXJuIGEgU3RyaW5nVmlldyBpbnN0ZWFkIG9m IGEgU3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzkwMjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkxNTA5NjAyPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBsaXN0TWFya2VyVGV4 dEZvck5vZGVBbmRQb3NpdGlvbigpIHRvIHJldHVybiBhIFN0cmluZ1ZpZXcgaW5zdGVhZCBvZiBh IFN0cmluZy4gbGlzdE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oKQorICAgICAgICBoYXMg YSBTdHJpbmdWaWV3IGludGVybmFsbHkgYW5kIG5vbmUgaXQgaXRzIGNhbGwgc2l0ZXMgYWN0dWFs bHkgbmVlZCBhIFN0cmluZy4gVGhlIGNhbGwgc2l0ZXMgZWl0aGVyIHVzZSBTdHJpbmdCdWlsZGVy CisgICAgICAgIG9yIHdhbnQgYSBOU1N0cmluZyouIFRoaXMgYXZvaWRzIHVubmVjZXNzYXJ5IFN0 cmluZyBhbGxvY2F0aW9ucy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaXN0TWFya2VyVGV4dEZvck5vZGUpOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6bGlzdE1hcmtlclRleHRGb3JO b2RlQW5kUG9zaXRpb24pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9i amVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyQmFzZS5tbToKKyAgICAgICAgKEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQp OgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UgY29udGVudEZv clNpbXBsZVJhbmdlOmF0dHJpYnV0ZWQ6XSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGRvQVhBdHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJh bmdlOnNwZWxsQ2hlY2s6XSk6CisKIDIwMjItMDQtMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KIAogICAgICAgICBGaW5pc2ggcG9ydGluZyBjb2RlIGJhc2UgdG8gU3RyaW5nOjpm cm9tTGF0aW4xKCkgYW5kIG1ha2UgU3RyaW5nKGNvbnN0IGNoYXIqKSBwcml2YXRlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcApp bmRleCAzY2ZmYmRhODAwNjA1ZjNlYzM2OTA5MjI5ZWFjMGM2NjNiZTY5NmE3Li44OWUxOTJkM2M4 YTJkYmU2ZjhjZGJiNGJhZWNjZDQzZGU5MzE3NjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKQEAgLTE0NDAsMjAgKzE0 NDAsMjAgQEAgc3RhdGljIFJlbmRlckxpc3RJdGVtKiByZW5kZXJMaXN0SXRlbUNvbnRhaW5lckZv ck5vZGUoTm9kZSogbm9kZSkKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotc3RhdGljIFN0cmlu ZyBsaXN0TWFya2VyVGV4dEZvck5vZGUoTm9kZSogbm9kZSkKK3N0YXRpYyBTdHJpbmdWaWV3IGxp c3RNYXJrZXJUZXh0Rm9yTm9kZShOb2RlKiBub2RlKQogewogICAgIFJlbmRlckxpc3RJdGVtKiBs aXN0SXRlbSA9IHJlbmRlckxpc3RJdGVtQ29udGFpbmVyRm9yTm9kZShub2RlKTsKICAgICBpZiAo IWxpc3RJdGVtKQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgICAgIHJldHVybiB7IH07 CiAgICAgCiAgICAgLy8gSWYgdGhpcyBpcyBpbiBhIGxpc3QgaXRlbSwgd2UgbmVlZCB0byBtYW51 YWxseSBhZGQgdGhlIHRleHQgZm9yIHRoZSBsaXN0IG1hcmtlcgogICAgIC8vIGJlY2F1c2UgYSBS ZW5kZXJMaXN0TWFya2VyIGRvZXMgbm90IGhhdmUgYSBOb2RlIGVxdWl2YWxlbnQgYW5kIHRodXMg ZG9lcyBub3QgYXBwZWFyCiAgICAgLy8gd2hlbiBpdGVyYXRpbmcgdGV4dC4KLSAgICByZXR1cm4g bGlzdEl0ZW0tPm1hcmtlclRleHRXaXRoU3VmZml4KCkudG9TdHJpbmcoKTsKKyAgICByZXR1cm4g bGlzdEl0ZW0tPm1hcmtlclRleHRXaXRoU3VmZml4KCk7CiB9CiAKIC8vIFJldHVybnMgdGhlIHRl eHQgYXNzb2NpYXRlZCB3aXRoIGEgbGlzdCBtYXJrZXIgaWYgdGhpcyBub2RlIGlzIGNvbnRhaW5l ZCB3aXRoaW4gYSBsaXN0IGl0ZW0uCi1TdHJpbmcgQWNjZXNzaWJpbGl0eU9iamVjdDo6bGlzdE1h cmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oTm9kZSogbm9kZSwgY29uc3QgVmlzaWJsZVBvc2l0 aW9uJiB2aXNpYmxlUG9zaXRpb25TdGFydCkKK1N0cmluZ1ZpZXcgQWNjZXNzaWJpbGl0eU9iamVj dDo6bGlzdE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oTm9kZSogbm9kZSwgY29uc3QgVmlz aWJsZVBvc2l0aW9uJiB2aXNpYmxlUG9zaXRpb25TdGFydCkKIHsKICAgICBhdXRvKiBsaXN0SXRl bSA9IHJlbmRlckxpc3RJdGVtQ29udGFpbmVyRm9yTm9kZShub2RlKTsKICAgICBpZiAoIWxpc3RJ dGVtKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaAppbmRleCA1NjIxZDk3ZjYwY2ZjZjI2ZWQyYTkwY2ZlY2I0MDk1ZmEwNmNlZGQ1Li40 M2U2ZTBiZjc5YTFlNzY1ZDQzMTgxMDg5YTgyZGIwZTQwMTcyZTI5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtNjA3LDcg KzYwNyw3IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgZG9BWFN0cmluZ0ZvclJhbmdlKGNvbnN0IFBs YWluVGV4dFJhbmdlJikgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICBJ bnRSZWN0IGRvQVhCb3VuZHNGb3JSYW5nZShjb25zdCBQbGFpblRleHRSYW5nZSYpIGNvbnN0IG92 ZXJyaWRlIHsgcmV0dXJuIEludFJlY3QoKTsgfQogICAgIEludFJlY3QgZG9BWEJvdW5kc0ZvclJh bmdlVXNpbmdDaGFyYWN0ZXJPZmZzZXQoY29uc3QgUGxhaW5UZXh0UmFuZ2UmKSBjb25zdCBvdmVy cmlkZSB7IHJldHVybiBJbnRSZWN0KCk7IH0KLSAgICBzdGF0aWMgU3RyaW5nIGxpc3RNYXJrZXJU ZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKE5vZGUqLCBjb25zdCBWaXNpYmxlUG9zaXRpb24mKTsKKyAg ICBzdGF0aWMgU3RyaW5nVmlldyBsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3NpdGlvbihOb2Rl KiwgY29uc3QgVmlzaWJsZVBvc2l0aW9uJik7CiAKICAgICB1bnNpZ25lZCBkb0FYTGluZUZvcklu ZGV4KHVuc2lnbmVkKSBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJCYXNlLm1tCmluZGV4IGIzMmRiNTM1MDAxMjVmNzI4NGVlOTkzYjM5MzM5NmNhNjA1ODU2OWUu LjdmYmI3ZGY1YjI4NWYwODgwYjI0MGQ1ZTMzMWVhZGNmZGI2ZTMyZDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQmFzZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KQEAgLTY3MSwxNyArNjcxLDE3IEBAIHN0YXRp YyB2b2lkIEFYQXR0cmlidXRlU3RyaW5nU2V0U3R5bGUoTlNNdXRhYmxlQXR0cmlidXRlZFN0cmlu ZyogYXR0clN0cmluZywgUmVuCiAgICAgICAgIFthdHRyU3RyaW5nIGFkZEF0dHJpYnV0ZTpVSUFj Y2Vzc2liaWxpdHlUZXh0QXR0cmlidXRlQ29udGV4dCB2YWx1ZTpVSUFjY2Vzc2liaWxpdHlUZXh0 dWFsQ29udGV4dFNvdXJjZUNvZGUgcmFuZ2U6cmFuZ2VdOwogfQogCi1zdGF0aWMgdm9pZCBBWEF0 dHJpYnV0ZWRTdHJpbmdBcHBlbmRUZXh0KE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcqIGF0dHJT dHJpbmcsIE5vZGUqIG5vZGUsIE5TU3RyaW5nICp0ZXh0KQorc3RhdGljIHZvaWQgQVhBdHRyaWJ1 dGVkU3RyaW5nQXBwZW5kVGV4dChOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRyU3RyaW5n LCBOb2RlKiBub2RlLCBTdHJpbmdWaWV3IHRleHQpCiB7CiAgICAgLy8gc2tpcCBpbnZpc2libGUg dGV4dAogICAgIGlmICghbm9kZS0+cmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg Ly8gZWFzaWVyIHRvIGNhbGN1bGF0ZSB0aGUgcmFuZ2UgYmVmb3JlIGFwcGVuZGluZyB0aGUgc3Ry aW5nCi0gICAgTlNSYW5nZSBhdHRyU3RyaW5nUmFuZ2UgPSBOU01ha2VSYW5nZShbYXR0clN0cmlu ZyBsZW5ndGhdLCBbdGV4dCBsZW5ndGhdKTsKKyAgICBOU1JhbmdlIGF0dHJTdHJpbmdSYW5nZSA9 IE5TTWFrZVJhbmdlKFthdHRyU3RyaW5nIGxlbmd0aF0sIHRleHQubGVuZ3RoKCkpOwogCiAgICAg Ly8gYXBwZW5kIHRoZSBzdHJpbmcgZnJvbSB0aGlzIG5vZGUKLSAgICBbW2F0dHJTdHJpbmcgbXV0 YWJsZVN0cmluZ10gYXBwZW5kU3RyaW5nOnRleHRdOworICAgIFtbYXR0clN0cmluZyBtdXRhYmxl U3RyaW5nXSBhcHBlbmRTdHJpbmc6dGV4dC5jcmVhdGVOU1N0cmluZygpLmdldCgpXTsKIAogICAg IC8vIHNldCBuZXcgYXR0cmlidXRlcwogICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0U3R5bGUoYXR0 clN0cmluZywgbm9kZS0+cmVuZGVyZXIoKSwgYXR0clN0cmluZ1JhbmdlKTsKQEAgLTc1NywxMyAr NzU3LDEzIEBAIC0gKE5TQXJyYXkgKiljb250ZW50Rm9yU2ltcGxlUmFuZ2U6KGNvbnN0IFNpbXBs ZVJhbmdlJilyYW5nZSBhdHRyaWJ1dGVkOihCT09MKWF0CiAgICAgICAgICAgICAgICAgaWYgKGFk ZE9iamVjdFdyYXBwZXJUb0FycmF5KGhlYWRpbmdPYmplY3QsIGFycmF5LmdldCgpKSkKICAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgICAgICBTdHJpbmcgbGlzdE1h cmtlclRleHQgPSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQ b3NpdGlvbigmbm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0LnJhbmdlKCkuc3Rh cnQpKTsKKyAgICAgICAgICAgICAgICBTdHJpbmdWaWV3IGxpc3RNYXJrZXJUZXh0ID0gQWNjZXNz aWJpbGl0eU9iamVjdDo6bGlzdE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oJm5vZGUsIG1h a2VDb250YWluZXJPZmZzZXRQb3NpdGlvbihpdC5yYW5nZSgpLnN0YXJ0KSk7CiAgICAgICAgICAg ICAgICAgaWYgKCFsaXN0TWFya2VyVGV4dC5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAg IFthcnJheSBhZGRPYmplY3Q6bGlzdE1hcmtlclRleHRdOworICAgICAgICAgICAgICAgICAgICBb YXJyYXkgYWRkT2JqZWN0Omxpc3RNYXJrZXJUZXh0LmNyZWF0ZU5TU3RyaW5nKCkuZ2V0KCldOwog ICAgICAgICAgICAgICAgIC8vIFRoZXJlIHdhcyBub3QgYW4gZWxlbWVudCByZXByZXNlbnRhdGlv biwgc28ganVzdCByZXR1cm4gdGhlIHRleHQuCiAgICAgICAgICAgICAgICAgW2FycmF5IGFkZE9i amVjdDppdC50ZXh0KCkuY3JlYXRlTlNTdHJpbmcoKS5nZXQoKV07CiAgICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgIFN0cmluZyBsaXN0TWFya2VyVGV4dCA9IEFjY2Vzc2liaWxp dHlPYmplY3Q6Omxpc3RNYXJrZXJUZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKCZub2RlLCBtYWtlQ29u dGFpbmVyT2Zmc2V0UG9zaXRpb24oaXQucmFuZ2UoKS5zdGFydCkpOworICAgICAgICAgICAgICAg IFN0cmluZ1ZpZXcgbGlzdE1hcmtlclRleHQgPSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFy a2VyVGV4dEZvck5vZGVBbmRQb3NpdGlvbigmbm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0 aW9uKGl0LnJhbmdlKCkuc3RhcnQpKTsKICAgICAgICAgICAgICAgICBpZiAoIWxpc3RNYXJrZXJU ZXh0LmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvIGF0dHJTdHJpbmcgPSBh ZG9wdE5TKFtbTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdF0pOwogICAgICAg ICAgICAgICAgICAgICBBWEF0dHJpYnV0ZWRTdHJpbmdBcHBlbmRUZXh0KGF0dHJTdHJpbmcuZ2V0 KCksICZub2RlLCBsaXN0TWFya2VyVGV4dCk7CkBAIC03NzEsNyArNzcxLDcgQEAgLSAoTlNBcnJh eSAqKWNvbnRlbnRGb3JTaW1wbGVSYW5nZTooY29uc3QgU2ltcGxlUmFuZ2UmKXJhbmdlIGF0dHJp YnV0ZWQ6KEJPT0wpYXQKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBhdXRv IGF0dHJTdHJpbmcgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyBhbGxvY10g aW5pdF0pOwotICAgICAgICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0 clN0cmluZy5nZXQoKSwgJm5vZGUsIGl0LnRleHQoKS5jcmVhdGVOU1N0cmluZ1dpdGhvdXRDb3B5 aW5nKCkuZ2V0KCkpOworICAgICAgICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRl eHQoYXR0clN0cmluZy5nZXQoKSwgJm5vZGUsIGl0LnRleHQoKSk7CiAgICAgICAgICAgICAgICAg W2FycmF5IGFkZE9iamVjdDphdHRyU3RyaW5nLmdldCgpXTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFj L1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXgg NzIyMmEzNTY1MzBlYzI4NDVmMTg1NWZjOWNmNzFmYTM2Y2FhNmRiMy4uNmIxZmUyZDIyNjk4ZjFi NjU1NDYwY2ZlMjZjMDM0ZDk4M2FlNTEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXJNYWMubW0KQEAgLTEwNTUsNyArMTA1NSw3IEBAIC0gKE5TQXR0cmlidXRlZFN0cmluZyAq KWRvQVhBdHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlOihBWFRleHRNYXJrZXJSYW5n CiAgICAgICAgICAgICAvLyBub24temVybyBsZW5ndGggbWVhbnMgdGV4dHVhbCBub2RlLCB6ZXJv IGxlbmd0aCBtZWFucyByZXBsYWNlZCBub2RlIChBS0EgImF0dGFjaG1lbnRzIiBpbiBBWCkKICAg ICAgICAgICAgIGlmIChpdC50ZXh0KCkubGVuZ3RoKCkpIHsKICAgICAgICAgICAgICAgICAvLyBB ZGQgdGhlIHRleHQgb2YgdGhlIGxpc3QgbWFya2VyIGl0ZW0gaWYgbmVjZXNzYXJ5LgotICAgICAg ICAgICAgICAgIFN0cmluZyBsaXN0TWFya2VyVGV4dCA9IEFjY2Vzc2liaWxpdHlPYmplY3Q6Omxp c3RNYXJrZXJUZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKCZub2RlLCBtYWtlQ29udGFpbmVyT2Zmc2V0 UG9zaXRpb24oaXQucmFuZ2UoKS5zdGFydCkpOworICAgICAgICAgICAgICAgIFN0cmluZ1ZpZXcg bGlzdE1hcmtlclRleHQgPSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFya2VyVGV4dEZvck5v ZGVBbmRQb3NpdGlvbigmbm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0LnJhbmdl KCkuc3RhcnQpKTsKICAgICAgICAgICAgICAgICBpZiAoIWxpc3RNYXJrZXJUZXh0LmlzRW1wdHko KSkKICAgICAgICAgICAgICAgICAgICAgQVhBdHRyaWJ1dGVkU3RyaW5nQXBwZW5kVGV4dChhdHRy U3RyaW5nLmdldCgpLCAmbm9kZSwgbGlzdE1hcmtlclRleHQsIHNwZWxsQ2hlY2spOwogICAgICAg ICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZy5nZXQoKSwg Jm5vZGUsIGl0LnRleHQoKSwgc3BlbGxDaGVjayk7Cg== 457217 2022-04-10 16:28:48 -0700 2022-04-10 19:30:20 -0700 Patch bug-239022-20220410162847.patch text/plain 8515 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjk3YjRkNmI0ZDg4ZTll MDlhYzM5Njc0MzZkNmNmYTBjZTAyNDc4OS4uMzZlYmI1NDM5MmJlZDQ0ZWRkOGQ2ZWVjNmIzNmJh ZDNmMjc1MWVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTA0LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGxpc3RNYXJrZXJU ZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKCkgdG8gcmV0dXJuIGEgU3RyaW5nVmlldyBpbnN0ZWFkIG9m IGEgU3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzkwMjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkxNTA5NjAyPgorCisgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFVwZGF0ZSBsaXN0TWFya2VyVGV4dEZv ck5vZGVBbmRQb3NpdGlvbigpIHRvIHJldHVybiBhIFN0cmluZ1ZpZXcgaW5zdGVhZCBvZiBhIFN0 cmluZy4gbGlzdE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oKQorICAgICAgICBoYXMgYSBT dHJpbmdWaWV3IGludGVybmFsbHkgYW5kIG5vbmUgaXQgaXRzIGNhbGwgc2l0ZXMgYWN0dWFsbHkg bmVlZCBhIFN0cmluZy4gVGhlIGNhbGwgc2l0ZXMgZWl0aGVyIHVzZSBTdHJpbmdCdWlsZGVyCisg ICAgICAgIG9yIHdhbnQgYSBOU1N0cmluZyouIFRoaXMgYXZvaWRzIHVubmVjZXNzYXJ5IFN0cmlu ZyBhbGxvY2F0aW9ucy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaXN0TWFya2VyVGV4dEZvck5vZGUpOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6bGlzdE1hcmtlclRleHRGb3JOb2Rl QW5kUG9zaXRpb24pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyQmFzZS5tbToKKyAgICAgICAgKEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQpOgor ICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UgY29udGVudEZvclNp bXBsZVJhbmdlOmF0dHJpYnV0ZWQ6XSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyIGRvQVhBdHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdl OnNwZWxsQ2hlY2s6XSk6CisKIDIwMjItMDQtMTAgIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1t ZXJtYW5uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0xCU0VdIEFjdGl2YXRlIFNWRyB0cmFuc2Zv cm0gc3VwcG9ydCB0aHJvdWdoIGxheWVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggM2NmZmJkYTgwMDYwNWYzZWMz NjkwOTIyOWVhYzBjNjYzYmU2OTZhNy4uODllMTkyZDNjOGEyZGJlNmY4Y2RiYjRiYWVjY2Q0M2Rl OTMxNzY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuY3BwCkBAIC0xNDQwLDIwICsxNDQwLDIwIEBAIHN0YXRpYyBSZW5kZXJM aXN0SXRlbSogcmVuZGVyTGlzdEl0ZW1Db250YWluZXJGb3JOb2RlKE5vZGUqIG5vZGUpCiAgICAg cmV0dXJuIG51bGxwdHI7CiB9CiAKLXN0YXRpYyBTdHJpbmcgbGlzdE1hcmtlclRleHRGb3JOb2Rl KE5vZGUqIG5vZGUpCitzdGF0aWMgU3RyaW5nVmlldyBsaXN0TWFya2VyVGV4dEZvck5vZGUoTm9k ZSogbm9kZSkKIHsKICAgICBSZW5kZXJMaXN0SXRlbSogbGlzdEl0ZW0gPSByZW5kZXJMaXN0SXRl bUNvbnRhaW5lckZvck5vZGUobm9kZSk7CiAgICAgaWYgKCFsaXN0SXRlbSkKLSAgICAgICAgcmV0 dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4geyB9OwogICAgIAogICAgIC8vIElmIHRoaXMg aXMgaW4gYSBsaXN0IGl0ZW0sIHdlIG5lZWQgdG8gbWFudWFsbHkgYWRkIHRoZSB0ZXh0IGZvciB0 aGUgbGlzdCBtYXJrZXIKICAgICAvLyBiZWNhdXNlIGEgUmVuZGVyTGlzdE1hcmtlciBkb2VzIG5v dCBoYXZlIGEgTm9kZSBlcXVpdmFsZW50IGFuZCB0aHVzIGRvZXMgbm90IGFwcGVhcgogICAgIC8v IHdoZW4gaXRlcmF0aW5nIHRleHQuCi0gICAgcmV0dXJuIGxpc3RJdGVtLT5tYXJrZXJUZXh0V2l0 aFN1ZmZpeCgpLnRvU3RyaW5nKCk7CisgICAgcmV0dXJuIGxpc3RJdGVtLT5tYXJrZXJUZXh0V2l0 aFN1ZmZpeCgpOwogfQogCiAvLyBSZXR1cm5zIHRoZSB0ZXh0IGFzc29jaWF0ZWQgd2l0aCBhIGxp c3QgbWFya2VyIGlmIHRoaXMgbm9kZSBpcyBjb250YWluZWQgd2l0aGluIGEgbGlzdCBpdGVtLgot U3RyaW5nIEFjY2Vzc2liaWxpdHlPYmplY3Q6Omxpc3RNYXJrZXJUZXh0Rm9yTm9kZUFuZFBvc2l0 aW9uKE5vZGUqIG5vZGUsIGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlzaWJsZVBvc2l0aW9uU3Rh cnQpCitTdHJpbmdWaWV3IEFjY2Vzc2liaWxpdHlPYmplY3Q6Omxpc3RNYXJrZXJUZXh0Rm9yTm9k ZUFuZFBvc2l0aW9uKE5vZGUqIG5vZGUsIGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlzaWJsZVBv c2l0aW9uU3RhcnQpCiB7CiAgICAgYXV0byogbGlzdEl0ZW0gPSByZW5kZXJMaXN0SXRlbUNvbnRh aW5lckZvck5vZGUobm9kZSk7CiAgICAgaWYgKCFsaXN0SXRlbSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggNTYyMWQ5N2Y2 MGNmY2YyNmVkMmE5MGNmZWNiNDA5NWZhMDZjZWRkNS4uNDNlNmUwYmY3OWExZTc2NWQ0MzE4MTA4 OWE4MmRiMGU0MDE3MmUyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAgLTYwNyw3ICs2MDcsNyBAQCBwdWJsaWM6CiAgICAg U3RyaW5nIGRvQVhTdHJpbmdGb3JSYW5nZShjb25zdCBQbGFpblRleHRSYW5nZSYpIGNvbnN0IG92 ZXJyaWRlIHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgSW50UmVjdCBkb0FYQm91bmRzRm9yUmFu Z2UoY29uc3QgUGxhaW5UZXh0UmFuZ2UmKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBJbnRSZWN0 KCk7IH0KICAgICBJbnRSZWN0IGRvQVhCb3VuZHNGb3JSYW5nZVVzaW5nQ2hhcmFjdGVyT2Zmc2V0 KGNvbnN0IFBsYWluVGV4dFJhbmdlJikgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gSW50UmVjdCgp OyB9Ci0gICAgc3RhdGljIFN0cmluZyBsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3NpdGlvbihO b2RlKiwgY29uc3QgVmlzaWJsZVBvc2l0aW9uJik7CisgICAgc3RhdGljIFN0cmluZ1ZpZXcgbGlz dE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oTm9kZSosIGNvbnN0IFZpc2libGVQb3NpdGlv biYpOwogCiAgICAgdW5zaWduZWQgZG9BWExpbmVGb3JJbmRleCh1bnNpZ25lZCkgb3ZlcnJpZGU7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQppbmRleCBiMzJkYjUz NTAwMTI1ZjcyODRlZTk5M2IzOTMzOTZjYTYwNTg1NjllLi4yYTBkOGFjZWYyYTkyNTIzMGY4MTY1 OTIyMTgyN2Q0MzBkNDkyZGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJC YXNlLm1tCkBAIC02NzEsMTcgKzY3MSwxNyBAQCBzdGF0aWMgdm9pZCBBWEF0dHJpYnV0ZVN0cmlu Z1NldFN0eWxlKE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcqIGF0dHJTdHJpbmcsIFJlbgogICAg ICAgICBbYXR0clN0cmluZyBhZGRBdHRyaWJ1dGU6VUlBY2Nlc3NpYmlsaXR5VGV4dEF0dHJpYnV0 ZUNvbnRleHQgdmFsdWU6VUlBY2Nlc3NpYmlsaXR5VGV4dHVhbENvbnRleHRTb3VyY2VDb2RlIHJh bmdlOnJhbmdlXTsKIH0KIAotc3RhdGljIHZvaWQgQVhBdHRyaWJ1dGVkU3RyaW5nQXBwZW5kVGV4 dChOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRyU3RyaW5nLCBOb2RlKiBub2RlLCBOU1N0 cmluZyAqdGV4dCkKK3N0YXRpYyB2b2lkIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoTlNN dXRhYmxlQXR0cmlidXRlZFN0cmluZyogYXR0clN0cmluZywgTm9kZSogbm9kZSwgU3RyaW5nVmll dyB0ZXh0KQogewogICAgIC8vIHNraXAgaW52aXNpYmxlIHRleHQKICAgICBpZiAoIW5vZGUtPnJl bmRlcmVyKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIGVhc2llciB0byBjYWxjdWxhdGUg dGhlIHJhbmdlIGJlZm9yZSBhcHBlbmRpbmcgdGhlIHN0cmluZwotICAgIE5TUmFuZ2UgYXR0clN0 cmluZ1JhbmdlID0gTlNNYWtlUmFuZ2UoW2F0dHJTdHJpbmcgbGVuZ3RoXSwgW3RleHQgbGVuZ3Ro XSk7CisgICAgTlNSYW5nZSBhdHRyU3RyaW5nUmFuZ2UgPSBOU01ha2VSYW5nZShbYXR0clN0cmlu ZyBsZW5ndGhdLCB0ZXh0Lmxlbmd0aCgpKTsKIAogICAgIC8vIGFwcGVuZCB0aGUgc3RyaW5nIGZy b20gdGhpcyBub2RlCi0gICAgW1thdHRyU3RyaW5nIG11dGFibGVTdHJpbmddIGFwcGVuZFN0cmlu Zzp0ZXh0XTsKKyAgICBbW2F0dHJTdHJpbmcgbXV0YWJsZVN0cmluZ10gYXBwZW5kU3RyaW5nOnRl eHQuY3JlYXRlTlNTdHJpbmdXaXRob3V0Q29weWluZygpLmdldCgpXTsKIAogICAgIC8vIHNldCBu ZXcgYXR0cmlidXRlcwogICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0U3R5bGUoYXR0clN0cmluZywg bm9kZS0+cmVuZGVyZXIoKSwgYXR0clN0cmluZ1JhbmdlKTsKQEAgLTc1NywxMyArNzU3LDEzIEBA IC0gKE5TQXJyYXkgKiljb250ZW50Rm9yU2ltcGxlUmFuZ2U6KGNvbnN0IFNpbXBsZVJhbmdlJily YW5nZSBhdHRyaWJ1dGVkOihCT09MKWF0CiAgICAgICAgICAgICAgICAgaWYgKGFkZE9iamVjdFdy YXBwZXJUb0FycmF5KGhlYWRpbmdPYmplY3QsIGFycmF5LmdldCgpKSkKICAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgICAgICBTdHJpbmcgbGlzdE1hcmtlclRleHQg PSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3NpdGlvbigm bm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0LnJhbmdlKCkuc3RhcnQpKTsKKyAg ICAgICAgICAgICAgICBTdHJpbmdWaWV3IGxpc3RNYXJrZXJUZXh0ID0gQWNjZXNzaWJpbGl0eU9i amVjdDo6bGlzdE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRpb24oJm5vZGUsIG1ha2VDb250YWlu ZXJPZmZzZXRQb3NpdGlvbihpdC5yYW5nZSgpLnN0YXJ0KSk7CiAgICAgICAgICAgICAgICAgaWYg KCFsaXN0TWFya2VyVGV4dC5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAgIFthcnJheSBh ZGRPYmplY3Q6bGlzdE1hcmtlclRleHRdOworICAgICAgICAgICAgICAgICAgICBbYXJyYXkgYWRk T2JqZWN0Omxpc3RNYXJrZXJUZXh0LmNyZWF0ZU5TU3RyaW5nKCkuZ2V0KCldOwogICAgICAgICAg ICAgICAgIC8vIFRoZXJlIHdhcyBub3QgYW4gZWxlbWVudCByZXByZXNlbnRhdGlvbiwgc28ganVz dCByZXR1cm4gdGhlIHRleHQuCiAgICAgICAgICAgICAgICAgW2FycmF5IGFkZE9iamVjdDppdC50 ZXh0KCkuY3JlYXRlTlNTdHJpbmcoKS5nZXQoKV07CiAgICAgICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgICAgIFN0cmluZyBsaXN0TWFya2VyVGV4dCA9IEFjY2Vzc2liaWxpdHlPYmplY3Q6 Omxpc3RNYXJrZXJUZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKCZub2RlLCBtYWtlQ29udGFpbmVyT2Zm c2V0UG9zaXRpb24oaXQucmFuZ2UoKS5zdGFydCkpOworICAgICAgICAgICAgICAgIFN0cmluZ1Zp ZXcgbGlzdE1hcmtlclRleHQgPSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFya2VyVGV4dEZv ck5vZGVBbmRQb3NpdGlvbigmbm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0LnJh bmdlKCkuc3RhcnQpKTsKICAgICAgICAgICAgICAgICBpZiAoIWxpc3RNYXJrZXJUZXh0LmlzRW1w dHkoKSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvIGF0dHJTdHJpbmcgPSBhZG9wdE5TKFtb TlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdF0pOwogICAgICAgICAgICAgICAg ICAgICBBWEF0dHJpYnV0ZWRTdHJpbmdBcHBlbmRUZXh0KGF0dHJTdHJpbmcuZ2V0KCksICZub2Rl LCBsaXN0TWFya2VyVGV4dCk7CkBAIC03NzEsNyArNzcxLDcgQEAgLSAoTlNBcnJheSAqKWNvbnRl bnRGb3JTaW1wbGVSYW5nZTooY29uc3QgU2ltcGxlUmFuZ2UmKXJhbmdlIGF0dHJpYnV0ZWQ6KEJP T0wpYXQKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBhdXRvIGF0dHJTdHJp bmcgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdF0pOwot ICAgICAgICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZy5n ZXQoKSwgJm5vZGUsIGl0LnRleHQoKS5jcmVhdGVOU1N0cmluZ1dpdGhvdXRDb3B5aW5nKCkuZ2V0 KCkpOworICAgICAgICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0 cmluZy5nZXQoKSwgJm5vZGUsIGl0LnRleHQoKSk7CiAgICAgICAgICAgICAgICAgW2FycmF5IGFk ZE9iamVjdDphdHRyU3RyaW5nLmdldCgpXTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNl IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggNzIyMmEzNTY1 MzBlYzI4NDVmMTg1NWZjOWNmNzFmYTM2Y2FhNmRiMy4uNmIxZmUyZDIyNjk4ZjFiNjU1NDYwY2Zl MjZjMDM0ZDk4M2FlNTEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMu bW0KQEAgLTEwNTUsNyArMTA1NSw3IEBAIC0gKE5TQXR0cmlidXRlZFN0cmluZyAqKWRvQVhBdHRy aWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlOihBWFRleHRNYXJrZXJSYW5nCiAgICAgICAg ICAgICAvLyBub24temVybyBsZW5ndGggbWVhbnMgdGV4dHVhbCBub2RlLCB6ZXJvIGxlbmd0aCBt ZWFucyByZXBsYWNlZCBub2RlIChBS0EgImF0dGFjaG1lbnRzIiBpbiBBWCkKICAgICAgICAgICAg IGlmIChpdC50ZXh0KCkubGVuZ3RoKCkpIHsKICAgICAgICAgICAgICAgICAvLyBBZGQgdGhlIHRl eHQgb2YgdGhlIGxpc3QgbWFya2VyIGl0ZW0gaWYgbmVjZXNzYXJ5LgotICAgICAgICAgICAgICAg IFN0cmluZyBsaXN0TWFya2VyVGV4dCA9IEFjY2Vzc2liaWxpdHlPYmplY3Q6Omxpc3RNYXJrZXJU ZXh0Rm9yTm9kZUFuZFBvc2l0aW9uKCZub2RlLCBtYWtlQ29udGFpbmVyT2Zmc2V0UG9zaXRpb24o aXQucmFuZ2UoKS5zdGFydCkpOworICAgICAgICAgICAgICAgIFN0cmluZ1ZpZXcgbGlzdE1hcmtl clRleHQgPSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3Np dGlvbigmbm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0LnJhbmdlKCkuc3RhcnQp KTsKICAgICAgICAgICAgICAgICBpZiAoIWxpc3RNYXJrZXJUZXh0LmlzRW1wdHkoKSkKICAgICAg ICAgICAgICAgICAgICAgQVhBdHRyaWJ1dGVkU3RyaW5nQXBwZW5kVGV4dChhdHRyU3RyaW5nLmdl dCgpLCAmbm9kZSwgbGlzdE1hcmtlclRleHQsIHNwZWxsQ2hlY2spOwogICAgICAgICAgICAgICAg IEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZy5nZXQoKSwgJm5vZGUsIGl0 LnRleHQoKSwgc3BlbGxDaGVjayk7Cg==