|
 |
f325b2 |
From b88646fc68cfc1c3840024fe3a59727c9eb9f95d Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Dennis Francis <dennisfrancis.in@gmail.com>
|
|
|
f325b2 |
Date: Fri, 11 Dec 2015 09:19:22 +0530
|
|
|
f325b2 |
Subject: [PATCH 2/3] Fix memleak of strings allocated in
|
|
|
f325b2 |
VclGtkClipboard::makeGtkTargetEntry
|
|
|
f325b2 |
|
|
|
f325b2 |
This leak is produced when copy and paste of text/numbers
|
|
|
f325b2 |
is done in Calc/Writer.
|
|
|
f325b2 |
|
|
|
f325b2 |
Following is the trace produced by valgrind (trimmed)
|
|
|
f325b2 |
|
|
|
f325b2 |
malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
|
|
|
f325b2 |
g_malloc (in /usr/lib64/libglib-2.0.so.0.4600.2)
|
|
|
f325b2 |
g_strdup (in /usr/lib64/libglib-2.0.so.0.4600.2)
|
|
|
f325b2 |
VclGtkClipboard::makeGtkTargetEntry(...) (gtk3gtkinst.cxx:467)
|
|
|
f325b2 |
VclGtkClipboard::setContents(...) (gtk3gtkinst.cxx:557)
|
|
|
f325b2 |
TransferableHelper::CopyToSelection(vcl::Window*) const (transfer.cxx:1019)
|
|
|
f325b2 |
ScTabView::CheckSelectionTransfer() (tabview3.cxx:319)
|
|
|
f325b2 |
ScTabView::UpdateAutoFillMark() (tabview3.cxx:144)
|
|
|
f325b2 |
ScTabView::SelectionChanged() (tabview3.cxx:365)
|
|
|
f325b2 |
ScViewFunc::PostPasteFromClip(ScRangeList const&, ScMarkData const&) (viewfun3.cxx:1753)
|
|
|
f325b2 |
ScViewFunc::PasteFromClip(...) (viewfun3.cxx:1415)
|
|
|
f325b2 |
ScClipUtil::PasteFromClipboard(ScViewData*, ScTabViewShell*, bool) (cliputil.cxx:69)
|
|
|
f325b2 |
ScCellShell::ExecuteEdit(SfxRequest&) (cellsh1.cxx:1285)
|
|
|
f325b2 |
SfxStubScCellShellExecuteEdit(SfxShell*, SfxRequest&) (scslots.hxx:7135)
|
|
|
f325b2 |
SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) (shell.hxx:206)
|
|
|
f325b2 |
SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) (dispatch.cxx:258)...
|
|
|
f325b2 |
...
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I12468e746f33a64e2b5f05e9ac1c6814c702ffd7
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20646
|
|
|
f325b2 |
Reviewed-by: jan iversen <jani@documentfoundation.org>
|
|
|
f325b2 |
Tested-by: jan iversen <jani@documentfoundation.org>
|
|
|
f325b2 |
(cherry picked from commit 97df0e601a0d76664b4207d075fa6e2a5a51625c)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
vcl/unx/gtk3/gtk3gtkinst.cxx | 5 ++++-
|
|
|
f325b2 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
|
|
|
f325b2 |
index e9210d0..f1a9ddc 100644
|
|
|
f325b2 |
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
|
|
|
f325b2 |
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
|
|
|
f325b2 |
@@ -456,7 +456,7 @@ void VclGtkClipboard::OwnerChanged(GtkClipboard* clipboard, GdkEvent* /*event*/)
|
|
|
f325b2 |
void VclGtkClipboard::ClipboardClear(GtkClipboard * /*clipboard*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
for (auto &a : m_aGtkTargets)
|
|
|
f325b2 |
- free(a.target);
|
|
|
f325b2 |
+ g_free(a.target);
|
|
|
f325b2 |
m_aGtkTargets.clear();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -518,6 +518,7 @@ VclGtkClipboard::~VclGtkClipboard()
|
|
|
f325b2 |
GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
|
|
|
f325b2 |
g_signal_handler_disconnect(clipboard, m_nOwnerChangedSignalId);
|
|
|
f325b2 |
g_object_unref(m_pOwner);
|
|
|
f325b2 |
+ ClipboardClear(nullptr);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
void VclGtkClipboard::setContents(
|
|
|
f325b2 |
@@ -577,6 +578,8 @@ void VclGtkClipboard::setContents(
|
|
|
f325b2 |
//if there was a previous gtk_clipboard_set_with_data call then
|
|
|
f325b2 |
//ClipboardClearFunc will be called now
|
|
|
f325b2 |
GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
|
|
|
f325b2 |
+ if(G_OBJECT(m_pOwner) == gtk_clipboard_get_owner(clipboard))
|
|
|
f325b2 |
+ gtk_clipboard_clear(clipboard);
|
|
|
f325b2 |
//use with_owner with m_pOwner so we can distinguish in handle_owner_change
|
|
|
f325b2 |
//if we have gained or lost ownership of the clipboard
|
|
|
f325b2 |
gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), aGtkTargets.size(),
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|