Title: [264842] trunk/Source/WebKit
Revision
264842
Author
[email protected]
Date
2020-07-24 10:40:24 -0700 (Fri, 24 Jul 2020)

Log Message

[IPC hardening] Add nullptr checks for WebPage::m_activeColorChooser
<https://webkit.org/b/214699>
<rdar://problem/65850975>

Reviewed by Darin Adler.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didEndColorPicker):
(WebKit::WebPage::didChooseColor):
- Add nullptr check before dereferencing m_activeColorChooser.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (264841 => 264842)


--- trunk/Source/WebKit/ChangeLog	2020-07-24 17:29:37 UTC (rev 264841)
+++ trunk/Source/WebKit/ChangeLog	2020-07-24 17:40:24 UTC (rev 264842)
@@ -1,5 +1,18 @@
 2020-07-24  David Kilzer  <[email protected]>
 
+        [IPC hardening] Add nullptr checks for WebPage::m_activeColorChooser
+        <https://webkit.org/b/214699>
+        <rdar://problem/65850975>
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didEndColorPicker):
+        (WebKit::WebPage::didChooseColor):
+        - Add nullptr check before dereferencing m_activeColorChooser.
+
+2020-07-24  David Kilzer  <[email protected]>
+
         Add/Update CRASH_WITH_INFO() for invalid IPC message logging
         <https://webkit.org/b/214713>
 

Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (264841 => 264842)


--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2020-07-24 17:29:37 UTC (rev 264841)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2020-07-24 17:40:24 UTC (rev 264842)
@@ -4164,12 +4164,14 @@
 
 void WebPage::didEndColorPicker()
 {
-    m_activeColorChooser->didEndChooser();
+    if (m_activeColorChooser)
+        m_activeColorChooser->didEndChooser();
 }
 
 void WebPage::didChooseColor(const WebCore::Color& color)
 {
-    m_activeColorChooser->didChooseColor(color);
+    if (m_activeColorChooser)
+        m_activeColorChooser->didChooseColor(color);
 }
 
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to