Changeset 255132 in webkit

Timestamp:

Jan 26, 2020 2:15:17 PM (4 years ago)

Author:

Darin Adler

Message:

Protect against crashes during WKWebView init function when methods are called before the view is fully initialized
​https://bugs.webkit.org/show_bug.cgi?id=206799
rdar://problem/58871371

Reviewed by Sam Weinig.

Part way through creating WKWebView, some methods can be called and they need to be careful
not to use anything that may not be initialized yet.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView dealloc]): Check _page for null, since this might happen if the superclass's
init method returned nil.

• UIProcess/API/ios/WKWebViewIOS.mm:

(-[WKWebView _frameOrBoundsChanged]): Check _page for null, since this might be called
before object initialization is complete.
(-[WKWebView setSemanticContentAttribute:]): Ditto.

• UIProcess/API/mac/WKWebViewMac.mm:

(-[WKWebView setFrameSize:]): Check _impl for null since this might be called before
oject initialization is complete.
(-[WKWebView setUserInterfaceLayoutDirection:]): Ditto.
(-[WKWebView renewGState]): Ditto.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (3 diffs)
• UIProcess/API/ios/WKWebViewIOS.mm (modified) (3 diffs)
• UIProcess/API/mac/WKWebViewMac.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-26  Darin Adler  <darin@apple.com>
+
+        Protect against crashes during WKWebView init function when methods are called before the view is fully initialized
+        https://bugs.webkit.org/show_bug.cgi?id=206799
+        rdar://problem/58871371
+
+        Reviewed by Sam Weinig.
+
+        Part way through creating WKWebView, some methods can be called and they need to be careful
+        not to use anything that may not be initialized yet.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView dealloc]): Check _page for null, since this might happen if the superclass's
+        init method returned nil.
+
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView _frameOrBoundsChanged]): Check _page for null, since this might be called
+        before object initialization is complete.
+        (-[WKWebView setSemanticContentAttribute:]): Ditto.
+
+        * UIProcess/API/mac/WKWebViewMac.mm:
+        (-[WKWebView setFrameSize:]): Check _impl for null since this might be called before
+        oject initialization is complete.
+        (-[WKWebView setUserInterfaceLayoutDirection:]): Ditto.
+        (-[WKWebView renewGState]): Ditto.
+
 2020-01-26  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -592 +592 @@
     [_contentView _webViewDestroyed];
 
-    if (_remoteObjectRegistry)
+    if (_page && _remoteObjectRegistry)
         _page->process().processPool().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->identifier());
 #endif
 
-    _page->close();
+    if (_page)
+        _page->close();
 
 #if PLATFORM(IOS_FAMILY)
@@ -607 +608 @@
 #endif
 
-    pageToViewMap().remove(_page.get());
+    if (_page)
+        pageToViewMap().remove(_page.get());
 
     [super dealloc];

trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1760 +1760 @@
 
         BOOL sizeChanged = NO;
-        if (auto drawingArea = _page->drawingArea())
-            sizeChanged = drawingArea->setSize(WebCore::IntSize(bounds.size));
+        if (_page) {
+            if (auto drawingArea = _page->drawingArea())
+                sizeChanged = drawingArea->setSize(WebCore::IntSize(bounds.size));
+        }
 
         if (sizeChanged & [self usesStandardContentView])
@@ -2379 +2381 @@
     [super setSemanticContentAttribute:contentAttribute];
 
-    _page->setUserInterfaceLayoutDirection(toUserInterfaceLayoutDirection(contentAttribute));
+    if (_page)
+        _page->setUserInterfaceLayoutDirection(toUserInterfaceLayoutDirection(contentAttribute));
 }
 

trunk/Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -136 +136 @@
     [super setFrameSize:size];
     [_safeBrowsingWarning setFrame:self.bounds];
-    _impl->setFrameSize(NSSizeToCGSize(size));
+    if (_impl)
+        _impl->setFrameSize(NSSizeToCGSize(size));
 }
 
@@ -142 +143 @@
 {
     [super setUserInterfaceLayoutDirection:userInterfaceLayoutDirection];
-
-    _impl->setUserInterfaceLayoutDirection(userInterfaceLayoutDirection);
+    if (_impl)
+        _impl->setUserInterfaceLayoutDirection(userInterfaceLayoutDirection);
 }
 
@@ -150 +151 @@
 ALLOW_DEPRECATED_IMPLEMENTATIONS_END
 {
-    _impl->renewGState();
+    if (_impl)
+        _impl->renewGState();
     [super renewGState];
 }