[webkit-changes] [WebKit/WebKit] 698367: WebCoreObjCScheduleDeallocateOnMainRunLoop crashes...

Timothy Hatcher noreply at github.com
Tue Dec 5 12:26:34 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 69836763a22f493a3a2504e76c6423923bd24ce0
      https://github.com/WebKit/WebKit/commit/69836763a22f493a3a2504e76c6423923bd24ce0
  Author: Timothy Hatcher <timothy at apple.com>
  Date:   2023-12-05 (Tue, 05 Dec 2023)

  Changed paths:
    M Source/WebCore/platform/mac/WebCoreObjCExtras.h
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtension.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionAction.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionCommand.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContext.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionController.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionControllerConfiguration.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionMatchPattern.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionMessagePort.mm

  Log Message:
  -----------
  WebCoreObjCScheduleDeallocateOnMainRunLoop crashes in Web Extension ARC code.
https://webkit.org/b/265888
rdar://118477863

Reviewed by Brian Weinstein.

Resolved a crash in the `_WKWebExtension` ARC code caused by an early return in
`dealloc`, leading to `dealloc` being incorrectly scheduled on the main thread.
This scenario resulted in access of deallocated objects and subsequent crashes.

Introduced an error in the header for `WebCoreObjCScheduleDeallocate` functions
to prevent their use in ARC-enabled code. Additionally, to catch internal misuse
of these objects, `ASSERT(isMainRunLoop())` has been added in `dealloc`.

* Source/WebCore/platform/mac/WebCoreObjCExtras.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtension.mm:
(-[_WKWebExtension dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionAction.mm:
(-[_WKWebExtensionAction dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionCommand.mm:
(-[_WKWebExtensionCommand dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContext.mm:
(-[_WKWebExtensionContext dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionController.mm:
(-[_WKWebExtensionController dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionControllerConfiguration.mm:
(-[_WKWebExtensionControllerConfiguration dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionMatchPattern.mm:
(-[_WKWebExtensionMatchPattern dealloc]):
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionMessagePort.mm:
(-[_WKWebExtensionMessagePort dealloc]):

Canonical link: https://commits.webkit.org/271564@main




More information about the webkit-changes mailing list