Title: [87968] trunk/Source/WebKit2
Revision
87968
Author
ander...@apple.com
Date
2011-06-02 17:28:10 -0700 (Thu, 02 Jun 2011)

Log Message

2011-06-02  Anders Carlsson  <ander...@apple.com>

        Reviewed by Mark Rowe.

        Assert when trying to unload a module that failed to load
        https://bugs.webkit.org/show_bug.cgi?id=61980

        Remove an invalid ASSERT; it's OK for m_bundle to be null if the bundle failed to load.

        * Platform/mac/ModuleMac.mm:
        (WebKit::Module::unload):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (87967 => 87968)


--- trunk/Source/WebKit2/ChangeLog	2011-06-03 00:21:04 UTC (rev 87967)
+++ trunk/Source/WebKit2/ChangeLog	2011-06-03 00:28:10 UTC (rev 87968)
@@ -1,5 +1,17 @@
 2011-06-02  Anders Carlsson  <ander...@apple.com>
 
+        Reviewed by Mark Rowe.
+
+        Assert when trying to unload a module that failed to load
+        https://bugs.webkit.org/show_bug.cgi?id=61980
+
+        Remove an invalid ASSERT; it's OK for m_bundle to be null if the bundle failed to load.
+
+        * Platform/mac/ModuleMac.mm:
+        (WebKit::Module::unload):
+
+2011-06-02  Anders Carlsson  <ander...@apple.com>
+
         Reviewed by Simon Fraser.
 
         Add quirk for plug-ins that return a retained CALayer

Modified: trunk/Source/WebKit2/Platform/mac/ModuleMac.mm (87967 => 87968)


--- trunk/Source/WebKit2/Platform/mac/ModuleMac.mm	2011-06-03 00:21:04 UTC (rev 87967)
+++ trunk/Source/WebKit2/Platform/mac/ModuleMac.mm	2011-06-03 00:28:10 UTC (rev 87968)
@@ -48,7 +48,8 @@
 
 void Module::unload()
 {
-    ASSERT(m_bundle);
+    if (!m_bundle)
+        return;
 
 #if !defined(__LP64__)
     if (m_bundleResourceMap != -1)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to