vcl/unx/generic/printer/cpdmgr.cxx | 5 +++-- vcl/unx/gtk3/salnativewidgets-gtk.cxx | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 877014b0b7050ba3fce1c0126279125640117313 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Mon Jan 15 19:42:05 2024 +0100 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Mon Jan 15 22:07:52 2024 +0100 Add missing g_free in salnativewidgets-gtk + reorder ones in cpdmgr (vcl) Change-Id: I2608a2fe238d124f3a158438e8219fbc63f750d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162126 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> Tested-by: Jenkins diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx index 834c1383efba..03cf85a7b75b 100644 --- a/vcl/unx/generic/printer/cpdmgr.cxx +++ b/vcl/unx/generic/printer/cpdmgr.cxx @@ -81,9 +81,9 @@ void CPDManager::onNameAcquired (GDBusConnection *connection, G_DBUS_CALL_FLAGS_NONE, -1, nullptr, nullptr, nullptr); - g_free(contents); g_object_unref(proxy); g_dbus_node_info_unref(introspection_data); + g_free(contents); } g_free(backend.second); } @@ -122,10 +122,10 @@ void CPDManager::printerAdded (GDBusConnection *connection, nullptr, nullptr); - g_free(contents); g_dbus_node_info_unref(introspection_data); std::pair<std::string, GDBusProxy *> new_backend (sender_name, proxy); current->addBackend(std::move(new_backend)); + g_free(contents); } } CPDPrinter *pDest = static_cast<CPDPrinter *>(malloc(sizeof(CPDPrinter))); @@ -262,6 +262,7 @@ CPDManager* CPDManager::tryLoadCPD() { std::pair<std::string, gchar*> new_tbackend (filename, contents); pManager->addTempBackend(new_tbackend); + g_free(contents); } } g_dir_close(dir); diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx index a3a82edaa1ac..bfdeed423846 100644 --- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx @@ -2332,6 +2332,7 @@ bool GtkSalGraphics::updateSettings(AllSettings& rSettings) gchar* pFontname = nullptr; g_object_get(pSettings, "gtk-font-name", &pFontname, nullptr); PangoFontDescription* pFontDesc = pango_font_description_from_string(pFontname); + g_free(pFontname); vcl::Font aFont(pango_to_vcl(pFontDesc, rSettings.GetUILanguageTag().getLocale())); pango_font_description_free(pFontDesc); #else