209980 2020-04-03 12:10:44 -0700 REGRESSION (r8412): Use RetainPtr<> for NSMutableAttributedString in -[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:] 2020-04-03 12:50:49 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209129 https://bugs.webkit.org/show_bug.cgi?id=209932 InRadar P2 Normal --- 1 ddkilzer ddkilzer aboxhall apinheiro cfleizach darin dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1637477 0 ddkilzer 2020-04-03 12:10:44 -0700 Way back in 2005 in commit r8412, David Harrison added this line of code to WebCore/kwq/KWQAccObject.mm that was never changed to use RetainPtr<>: NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] init]; This lack of RetainPtr<> caused a leak when Darin landed a fix for Bug 209129. I fixed the leak in Bug 209932 by moving an early return, but Darin was curious about why this variable had never been converted: <https://bugs.webkit.org/show_bug.cgi?id=209932#c3> 1637478 1 webkit-bug-importer 2020-04-03 12:11:05 -0700 <rdar://problem/61269572> 1637479 2 395400 ddkilzer 2020-04-03 12:12:30 -0700 Created attachment 395400 Patch v1 1637480 3 ddkilzer 2020-04-03 12:13:18 -0700 LOL! Commit r8412 is so old that Bugzilla refuses to link it! <https://trac.webkit.org/r8412> 1637483 4 395400 darin 2020-04-03 12:18:34 -0700 Comment on attachment 395400 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=395400&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:1258 > + RetainPtr<NSMutableAttributedString> attrString = adoptNS([[NSMutableAttributedString alloc] init]); Could just write: auto attrString = ... 1637486 5 395401 ddkilzer 2020-04-03 12:24:05 -0700 Created attachment 395401 Patch for landing 1637498 6 ews-feeder 2020-04-03 12:50:48 -0700 Committed r259483: <https://trac.webkit.org/changeset/259483> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395401. 395400 2020-04-03 12:12:30 -0700 2020-04-03 12:24:03 -0700 Patch v1 bug-209980-20200403121401.patch text/plain 3479 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTE1ZTJjZjBiMDliNDU1 MmViOGYzM2ZmMzA3MjE3Mjg3N2Q0NDcwZC4uYmY0OGJhMjA3ZjZiZTQ2OWYyZjY5ZDNmOTA0ZjNj YTE1NTllYTc1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA0LTAzICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjg0 MTIpOiBVc2UgUmV0YWluUHRyPD4gZm9yIE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcgaW4gLVtX ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBkb0FYQXR0cmlidXRlZFN0cmluZ0ZvclRleHRN YXJrZXJSYW5nZTpzcGVsbENoZWNrOl0KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIw OTk4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgor ICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBkb0FYQXR0cmlidXRlZFN0 cmluZ0ZvclRleHRNYXJrZXJSYW5nZTpzcGVsbENoZWNrOl0pOgorICAgICAgICBNYWtlIHVzZSBv ZiBSZXRhaW5QdHI8Pi4KKwogMjAyMC0wNC0wMyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t PgogCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgcGFyYW1ldGVyIGZyb20gbG9hZFdpdGhOYXZpZ2F0 aW9uQWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCmluZGV4IGZj OTUzYjEwOTZhOWM4YTcyYmIwYzQwNGIzMmVhYWI1MmZmODc3ZjEuLmQ1YjQwNzI1MTk5MTgwOTgx NjkzMWQ2NTU4OTdhYjk3MGQ3ZjViYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyTWFjLm1tCkBAIC0xMjU1LDcgKzEyNTUsNyBAQCAtIChOU0F0dHJpYnV0ZWRTdHJpbmcqKWRv QVhBdHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlOihpZCl0ZXh0TWFya2VyUmFuZwog ICAgICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gW3Byb3RlY3RlZFNlbGYgcmFuZ2VGb3JUZXh0 TWFya2VyUmFuZ2U6dGV4dE1hcmtlclJhbmdlXTsKICAgICAgICAgaWYgKCFyYW5nZSkKICAgICAg ICAgICAgIHJldHVybiBuaWw7Ci0gICAgICAgIE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcqIGF0 dHJTdHJpbmcgPSBbW05TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcgYWxsb2NdIGluaXRdOworICAg ICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZz4gYXR0clN0cmluZyA9IGFk b3B0TlMoW1tOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0XSk7CiAgICAgICAg IFRleHRJdGVyYXRvciBpdCgqcmFuZ2UpOwogICAgICAgICB3aGlsZSAoIWl0LmF0RW5kKCkpIHsK ICAgICAgICAgICAgIE5vZGUmIG5vZGUgPSBpdC5yYW5nZSgpLnN0YXJ0LmNvbnRhaW5lcjsKQEAg LTEyNjUsOCArMTI2NSw4IEBAIC0gKE5TQXR0cmlidXRlZFN0cmluZyopZG9BWEF0dHJpYnV0ZWRT dHJpbmdGb3JUZXh0TWFya2VyUmFuZ2U6KGlkKXRleHRNYXJrZXJSYW5nCiAgICAgICAgICAgICAg ICAgLy8gQWRkIHRoZSB0ZXh0IG9mIHRoZSBsaXN0IG1hcmtlciBpdGVtIGlmIG5lY2Vzc2FyeS4K ICAgICAgICAgICAgICAgICBTdHJpbmcgbGlzdE1hcmtlclRleHQgPSBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjpsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3NpdGlvbigmbm9kZSwgVmlzaWJsZVBvc2l0 aW9uKGNyZWF0ZUxlZ2FjeUVkaXRpbmdQb3NpdGlvbihpdC5yYW5nZSgpLnN0YXJ0KSkpOwogICAg ICAgICAgICAgICAgIGlmICghbGlzdE1hcmtlclRleHQuaXNFbXB0eSgpKQotICAgICAgICAgICAg ICAgICAgICBBWEF0dHJpYnV0ZWRTdHJpbmdBcHBlbmRUZXh0KGF0dHJTdHJpbmcsICZub2RlLCBs aXN0TWFya2VyVGV4dCwgc3BlbGxDaGVjayk7Ci0gICAgICAgICAgICAgICAgQVhBdHRyaWJ1dGVk U3RyaW5nQXBwZW5kVGV4dChhdHRyU3RyaW5nLCAmbm9kZSwgaXQudGV4dCgpLCBzcGVsbENoZWNr KTsKKyAgICAgICAgICAgICAgICAgICAgQVhBdHRyaWJ1dGVkU3RyaW5nQXBwZW5kVGV4dChhdHRy U3RyaW5nLmdldCgpLCAmbm9kZSwgbGlzdE1hcmtlclRleHQsIHNwZWxsQ2hlY2spOworICAgICAg ICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZy5nZXQoKSwg Jm5vZGUsIGl0LnRleHQoKSwgc3BlbGxDaGVjayk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgICAgIE5vZGUqIHJlcGxhY2VkTm9kZSA9IGl0Lm5vZGUoKTsKICAgICAgICAgICAg ICAgICBOU1N0cmluZyAqYXR0YWNobWVudFN0cmluZyA9IG5zU3RyaW5nRm9yUmVwbGFjZWROb2Rl KHJlcGxhY2VkTm9kZSk7CkBAIC0xMjgxLDEzICsxMjgxLDEzIEBAIC0gKE5TQXR0cmlidXRlZFN0 cmluZyopZG9BWEF0dHJpYnV0ZWRTdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2U6KGlkKXRleHRNYXJr ZXJSYW5nCiAKICAgICAgICAgICAgICAgICAgICAgLy8gYWRkIHRoZSBhdHRhY2htZW50IGF0dHJp YnV0ZQogICAgICAgICAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmogPSByZXBs YWNlZE5vZGUtPnJlbmRlcmVyKCktPmRvY3VtZW50KCkuYXhPYmplY3RDYWNoZSgpLT5nZXRPckNy ZWF0ZShyZXBsYWNlZE5vZGUtPnJlbmRlcmVyKCkpOwotICAgICAgICAgICAgICAgICAgICBBWEF0 dHJpYnV0ZVN0cmluZ1NldEVsZW1lbnQoYXR0clN0cmluZywgTlNBY2Nlc3NpYmlsaXR5QXR0YWNo bWVudFRleHRBdHRyaWJ1dGUsIG9iaiwgYXR0clN0cmluZ1JhbmdlKTsKKyAgICAgICAgICAgICAg ICAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXRFbGVtZW50KGF0dHJTdHJpbmcuZ2V0KCksIE5TQWNj ZXNzaWJpbGl0eUF0dGFjaG1lbnRUZXh0QXR0cmlidXRlLCBvYmosIGF0dHJTdHJpbmdSYW5nZSk7 CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgaXQuYWR2YW5j ZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgcmV0dXJuIFthdHRyU3RyaW5nIGF1dG9yZWxlYXNl XTsKKyAgICAgICAgcmV0dXJuIGF0dHJTdHJpbmcuYXV0b3JlbGVhc2UoKTsKICAgICB9KTsKIH0K IAo= 395401 2020-04-03 12:24:05 -0700 2020-04-03 12:50:48 -0700 Patch for landing bug-209980-20200403122535.patch text/plain 3444 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTE1ZTJjZjBiMDliNDU1 MmViOGYzM2ZmMzA3MjE3Mjg3N2Q0NDcwZC4uYzk0OGFkOTI4OThiYzI1N2ViNTMyZGMyZjMzNmYx Y2Q0ODk1MGRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA0LTAzICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjg0 MTIpOiBVc2UgUmV0YWluUHRyPD4gZm9yIE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcgaW4gLVtX ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBkb0FYQXR0cmlidXRlZFN0cmluZ0ZvclRleHRN YXJrZXJSYW5nZTpzcGVsbENoZWNrOl0KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIw OTk4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgorICAg ICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBkb0FYQXR0cmlidXRlZFN0cmlu Z0ZvclRleHRNYXJrZXJSYW5nZTpzcGVsbENoZWNrOl0pOgorICAgICAgICBNYWtlIHVzZSBvZiBS ZXRhaW5QdHI8Pi4KKwogMjAyMC0wNC0wMyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFJlbW92ZSB1bnVzZWQgcGFyYW1ldGVyIGZyb20gbG9hZFdpdGhOYXZpZ2F0aW9u QWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCmluZGV4IGZjOTUz YjEwOTZhOWM4YTcyYmIwYzQwNGIzMmVhYWI1MmZmODc3ZjEuLjM2NDA0MzM4ZDY1NzMzNjBkZTJl YTBlNzI5YWFiNjhkOWU1OWJkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy TWFjLm1tCkBAIC0xMjU1LDcgKzEyNTUsNyBAQCAtIChOU0F0dHJpYnV0ZWRTdHJpbmcqKWRvQVhB dHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlOihpZCl0ZXh0TWFya2VyUmFuZwogICAg ICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gW3Byb3RlY3RlZFNlbGYgcmFuZ2VGb3JUZXh0TWFy a2VyUmFuZ2U6dGV4dE1hcmtlclJhbmdlXTsKICAgICAgICAgaWYgKCFyYW5nZSkKICAgICAgICAg ICAgIHJldHVybiBuaWw7Ci0gICAgICAgIE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcqIGF0dHJT dHJpbmcgPSBbW05TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcgYWxsb2NdIGluaXRdOworICAgICAg ICBhdXRvIGF0dHJTdHJpbmcgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyBh bGxvY10gaW5pdF0pOwogICAgICAgICBUZXh0SXRlcmF0b3IgaXQoKnJhbmdlKTsKICAgICAgICAg d2hpbGUgKCFpdC5hdEVuZCgpKSB7CiAgICAgICAgICAgICBOb2RlJiBub2RlID0gaXQucmFuZ2Uo KS5zdGFydC5jb250YWluZXI7CkBAIC0xMjY1LDggKzEyNjUsOCBAQCAtIChOU0F0dHJpYnV0ZWRT dHJpbmcqKWRvQVhBdHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlOihpZCl0ZXh0TWFy a2VyUmFuZwogICAgICAgICAgICAgICAgIC8vIEFkZCB0aGUgdGV4dCBvZiB0aGUgbGlzdCBtYXJr ZXIgaXRlbSBpZiBuZWNlc3NhcnkuCiAgICAgICAgICAgICAgICAgU3RyaW5nIGxpc3RNYXJrZXJU ZXh0ID0gQWNjZXNzaWJpbGl0eU9iamVjdDo6bGlzdE1hcmtlclRleHRGb3JOb2RlQW5kUG9zaXRp b24oJm5vZGUsIFZpc2libGVQb3NpdGlvbihjcmVhdGVMZWdhY3lFZGl0aW5nUG9zaXRpb24oaXQu cmFuZ2UoKS5zdGFydCkpKTsKICAgICAgICAgICAgICAgICBpZiAoIWxpc3RNYXJrZXJUZXh0Lmlz RW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgQVhBdHRyaWJ1dGVkU3RyaW5nQXBwZW5kVGV4 dChhdHRyU3RyaW5nLCAmbm9kZSwgbGlzdE1hcmtlclRleHQsIHNwZWxsQ2hlY2spOwotICAgICAg ICAgICAgICAgIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZywgJm5vZGUs IGl0LnRleHQoKSwgc3BlbGxDaGVjayk7CisgICAgICAgICAgICAgICAgICAgIEFYQXR0cmlidXRl ZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZy5nZXQoKSwgJm5vZGUsIGxpc3RNYXJrZXJUZXh0 LCBzcGVsbENoZWNrKTsKKyAgICAgICAgICAgICAgICBBWEF0dHJpYnV0ZWRTdHJpbmdBcHBlbmRU ZXh0KGF0dHJTdHJpbmcuZ2V0KCksICZub2RlLCBpdC50ZXh0KCksIHNwZWxsQ2hlY2spOwogICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBOb2RlKiByZXBsYWNlZE5vZGUgPSBp dC5ub2RlKCk7CiAgICAgICAgICAgICAgICAgTlNTdHJpbmcgKmF0dGFjaG1lbnRTdHJpbmcgPSBu c1N0cmluZ0ZvclJlcGxhY2VkTm9kZShyZXBsYWNlZE5vZGUpOwpAQCAtMTI4MSwxMyArMTI4MSwx MyBAQCAtIChOU0F0dHJpYnV0ZWRTdHJpbmcqKWRvQVhBdHRyaWJ1dGVkU3RyaW5nRm9yVGV4dE1h cmtlclJhbmdlOihpZCl0ZXh0TWFya2VyUmFuZwogCiAgICAgICAgICAgICAgICAgICAgIC8vIGFk ZCB0aGUgYXR0YWNobWVudCBhdHRyaWJ1dGUKICAgICAgICAgICAgICAgICAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogb2JqID0gcmVwbGFjZWROb2RlLT5yZW5kZXJlcigpLT5kb2N1bWVudCgpLmF4 T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocmVwbGFjZWROb2RlLT5yZW5kZXJlcigpKTsKLSAg ICAgICAgICAgICAgICAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXRFbGVtZW50KGF0dHJTdHJpbmcs IE5TQWNjZXNzaWJpbGl0eUF0dGFjaG1lbnRUZXh0QXR0cmlidXRlLCBvYmosIGF0dHJTdHJpbmdS YW5nZSk7CisgICAgICAgICAgICAgICAgICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0RWxlbWVudChh dHRyU3RyaW5nLmdldCgpLCBOU0FjY2Vzc2liaWxpdHlBdHRhY2htZW50VGV4dEF0dHJpYnV0ZSwg b2JqLCBhdHRyU3RyaW5nUmFuZ2UpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIGl0LmFkdmFuY2UoKTsKICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiBb YXR0clN0cmluZyBhdXRvcmVsZWFzZV07CisgICAgICAgIHJldHVybiBhdHRyU3RyaW5nLmF1dG9y ZWxlYXNlKCk7CiAgICAgfSk7CiB9CiAK