Title: [152442] trunk/Source/WebKit2
Revision
152442
Author
[email protected]
Date
2013-07-08 01:19:22 -0700 (Mon, 08 Jul 2013)

Log Message

[GTK] Runtime critical warning when unloading a module that failed to load
https://bugs.webkit.org/show_bug.cgi?id=118425

Reviewed by Martin Robinson.

* Platform/gtk/ModuleGtk.cpp:
(WebKit::Module::load): Show an error message when the module
fails to load.
(WebKit::Module::unload): Check module pointer before calling
unload method.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (152441 => 152442)


--- trunk/Source/WebKit2/ChangeLog	2013-07-08 07:39:23 UTC (rev 152441)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-08 08:19:22 UTC (rev 152442)
@@ -1,3 +1,16 @@
+2013-07-07  Carlos Garcia Campos  <[email protected]>
+
+        [GTK] Runtime critical warning when unloading a module that failed to load
+        https://bugs.webkit.org/show_bug.cgi?id=118425
+
+        Reviewed by Martin Robinson.
+
+        * Platform/gtk/ModuleGtk.cpp:
+        (WebKit::Module::load): Show an error message when the module
+        fails to load.
+        (WebKit::Module::unload): Check module pointer before calling
+        unload method.
+
 2013-07-05  Tim Horton  <[email protected]>
 
         [wk2] Add API to lock the scroll position at the top or bottom of the page

Modified: trunk/Source/WebKit2/Platform/gtk/ModuleGtk.cpp (152441 => 152442)


--- trunk/Source/WebKit2/Platform/gtk/ModuleGtk.cpp	2013-07-08 07:39:23 UTC (rev 152441)
+++ trunk/Source/WebKit2/Platform/gtk/ModuleGtk.cpp	2013-07-08 08:19:22 UTC (rev 152442)
@@ -36,12 +36,15 @@
 bool Module::load()
 {
     m_handle = g_module_open(m_path.utf8().data(), G_MODULE_BIND_LAZY);
+    if (!m_handle)
+        WTFLogAlways("Error loading module '%s': %s", m_path.utf8().data(), g_module_error());
     return m_handle;
 }
 
 void Module::unload()
 {
-    g_module_close(m_handle);
+    if (m_handle)
+        g_module_close(m_handle);
 }
 
 void* Module::platformFunctionPointer(const char* functionName) const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to