Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak in wxGTK RunScriptSync()

Browse Source 
We must call g_object_unref() on an object that we called g_object_ref()
before.
This commit is contained in:
Vadim Zeitlin
2017-10-21 23:17:14 +02:00
parent 55beb9f7e8
commit 0e2f6e5c52
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/webview_webkit2.cpp
View File

@@ -1103,7 +1103,10 @@ static void wxgtk_run_javascript_cb(WebKitWebView *,
GAsyncResult *res, GAsyncResult *res,
GAsyncResult **res_out) GAsyncResult **res_out)
{ {
// Ensure that it doesn't get freed by the time we use it in
// RunScriptSync() itself.
g_object_ref(res); g_object_ref(res);
*res_out = res; *res_out = res;
} }
@@ -1126,6 +1129,9 @@ bool wxWebViewWebKit::RunScriptSync(const wxString& javascript, wxString* output
wxWebKitJavascriptResult js_result(webkit_web_view_run_javascript_finish(m_web_view, wxWebKitJavascriptResult js_result(webkit_web_view_run_javascript_finish(m_web_view,
result, error.Out())); result, error.Out()));
// Match g_object_ref() in wxgtk_run_javascript_cb()
g_object_unref(result);
if ( !js_result ) if ( !js_result )
{ {
wxLogWarning(_("Error running Javascript: %s"), error.GetMessage()); wxLogWarning(_("Error running Javascript: %s"), error.GetMessage());