Title: [220281] trunk/Source/WebCore
Revision
220281
Author
[email protected]
Date
2017-08-04 11:57:03 -0700 (Fri, 04 Aug 2017)

Log Message

Web Inspector: REGRESSION (r220233): Check for null pointer passed to WebGLRenderingContextBase::deleteProgram
https://bugs.webkit.org/show_bug.cgi?id=175196
<rdar://problem/33727603>

Reviewed by Devin Rousso.

* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::deleteProgram):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (220280 => 220281)


--- trunk/Source/WebCore/ChangeLog	2017-08-04 18:32:09 UTC (rev 220280)
+++ trunk/Source/WebCore/ChangeLog	2017-08-04 18:57:03 UTC (rev 220281)
@@ -1,3 +1,14 @@
+2017-08-04  Matt Baker  <[email protected]>
+
+        Web Inspector: REGRESSION (r220233): Check for null pointer passed to WebGLRenderingContextBase::deleteProgram
+        https://bugs.webkit.org/show_bug.cgi?id=175196
+        <rdar://problem/33727603>
+
+        Reviewed by Devin Rousso.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::deleteProgram):
+
 2017-08-04  Matt Lewis  <[email protected]>
 
         Unreviewed, rolling out r220271.

Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (220280 => 220281)


--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp	2017-08-04 18:32:09 UTC (rev 220280)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp	2017-08-04 18:57:03 UTC (rev 220281)
@@ -1575,8 +1575,8 @@
 
 void WebGLRenderingContextBase::deleteProgram(WebGLProgram* program)
 {
-    ASSERT(program);
-    InspectorInstrumentation::willDeleteProgram(*this, *program);
+    if (program)
+        InspectorInstrumentation::willDeleteProgram(*this, *program);
 
     deleteObject(program);
     // We don't reset m_currentProgram to 0 here because the deletion of the
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to