aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Bhole <[email protected]>2012-05-23 12:13:03 -0400
committerDeepak Bhole <[email protected]>2012-05-23 12:13:03 -0400
commitd63a184ec8eced0e7509dd140a9528fc411709f9 (patch)
tree41a11a236a0bdb7b110a9ad972d8e920e22a785a
parent8a3062dcdeba64c6b61c2c5562b08f4e65bb1327 (diff)
Use g_mutex_free instead of g_free to free appletviewer_mutex (fixes
crash). Patch from Martin Olsson.
-rw-r--r--ChangeLog6
-rw-r--r--plugin/icedteanp/IcedTeaNPPlugin.cc4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 68c7273..b0e7b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-23 Martin Olsson <[email protected]>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc:
+ Use g_mutex_free instead of g_free to free appletviewer_mutex (fixes
+ crash).
+
2012-05-23 Deepak Bhole <[email protected]>
* ChangeLog: Converted spaces to tabs in an older entry
diff --git a/plugin/icedteanp/IcedTeaNPPlugin.cc b/plugin/icedteanp/IcedTeaNPPlugin.cc
index 657cf07..a60d2e6 100644
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc
@@ -427,7 +427,7 @@ ITNP_New (NPMIMEType pluginType, NPP instance, uint16_t mode,
goto cleanup_done;
cleanup_appletviewer_mutex:
- g_free (data->appletviewer_mutex);
+ g_mutex_free (data->appletviewer_mutex);
data->appletviewer_mutex = NULL;
// cleanup_instance_string:
@@ -2000,7 +2000,7 @@ plugin_data_destroy (NPP instance)
tofree->window_width = 0;
// cleanup_appletviewer_mutex:
- g_free (tofree->appletviewer_mutex);
+ g_mutex_free (tofree->appletviewer_mutex);
tofree->appletviewer_mutex = NULL;
// cleanup_instance_string: