Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 00:47:34 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'WebKitwxGtkObject' of github.com:Blake-Madden/wxWidgets

Browse Source 
Fix string leaks in GTK WebKit2.

See #26830.
This commit is contained in:
Vadim Zeitlin
2026-08-14 21:35:26 +02:00
parent 49b2ce20ea e2f8353a17
commit c943390fde
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gtk/webview_webkit2.cpp
+7 -7
View File
@@ -786,21 +786,21 @@ private:
#ifdef wxHAVE_WEBKIT_WEBSITE_DATA_MANAGER
if (wx_check_webkit_version(2, 10, 0))
{
gchar* cachePath = nullptr;
gchar* dataPath = nullptr;
wxGtkString cachePath(nullptr);
wxGtkString dataPath(nullptr);
if (!m_dataPath.empty())
{
wxFileName configCachePath = wxFileName::DirName(m_dataPath);
configCachePath.AppendDir("cache");
cachePath = g_strdup(configCachePath.GetPath().utf8_str());
cachePath = wxGtkString(g_strdup(configCachePath.GetPath().utf8_str()));
wxFileName configDataPath = wxFileName::DirName(m_dataPath);
configDataPath.AppendDir("data");
dataPath = g_strdup(configDataPath.GetPath().utf8_str());
dataPath = wxGtkString(g_strdup(configDataPath.GetPath().utf8_str()));
}
m_websiteDataManager = webkit_website_data_manager_new(
"base-cache-directory", cachePath,
"base-data-directory", dataPath,
"base-cache-directory", cachePath.c_str(),
"base-data-directory", dataPath.c_str(),
nullptr);
m_webContext = webkit_web_context_new_with_website_data_manager(m_websiteDataManager);
}
@@ -1370,7 +1370,7 @@ wxString wxWebViewWebKit::GetPageSource() const
if (source)
{
const wxString& wxs = wxString::FromUTF8((const char*)source, length);
free(source);
g_free(source);
return wxs;
}
return wxString();