Title: [163904] trunk/Source/WebCore
Revision
163904
Author
aes...@apple.com
Date
2014-02-11 13:28:51 -0800 (Tue, 11 Feb 2014)

Log Message

[Content Filter] Check for NULL before calling dispatch_release()
https://bugs.webkit.org/show_bug.cgi?id=128576

Reviewed by Darin Adler.

m_neFilterSourceQueue will be NULL if NEFilterSource isn't enabled, and
passing NULL to dispatch_release() is undefined.

* platform/mac/ContentFilterMac.mm:
(WebCore::ContentFilter::~ContentFilter):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (163903 => 163904)


--- trunk/Source/WebCore/ChangeLog	2014-02-11 21:23:26 UTC (rev 163903)
+++ trunk/Source/WebCore/ChangeLog	2014-02-11 21:28:51 UTC (rev 163904)
@@ -1,3 +1,16 @@
+2014-02-11  Andy Estes  <aes...@apple.com>
+
+        [Content Filter] Check for NULL before calling dispatch_release()
+        https://bugs.webkit.org/show_bug.cgi?id=128576
+
+        Reviewed by Darin Adler.
+
+        m_neFilterSourceQueue will be NULL if NEFilterSource isn't enabled, and
+        passing NULL to dispatch_release() is undefined.
+
+        * platform/mac/ContentFilterMac.mm:
+        (WebCore::ContentFilter::~ContentFilter):
+
 2014-01-24  Jer Noble  <jer.no...@apple.com>
 
         [MediaControls] Allow the media controls script to be debuggable by giving it a generated sourceURL

Modified: trunk/Source/WebCore/platform/mac/ContentFilterMac.mm (163903 => 163904)


--- trunk/Source/WebCore/platform/mac/ContentFilterMac.mm	2014-02-11 21:23:26 UTC (rev 163903)
+++ trunk/Source/WebCore/platform/mac/ContentFilterMac.mm	2014-02-11 21:28:51 UTC (rev 163904)
@@ -115,7 +115,8 @@
 ContentFilter::~ContentFilter()
 {
 #if HAVE(NE_FILTER_SOURCE)
-    dispatch_release(m_neFilterSourceQueue);
+    if (m_neFilterSourceQueue)
+        dispatch_release(m_neFilterSourceQueue);
 #endif
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to