[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/qa vcl/unx
Michael Stahl
mstahl at redhat.com
Wed Feb 10 13:02:49 UTC 2016
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 4 ++++
vcl/unx/gtk3/gtk3gtkinst.cxx | 4 ++++
2 files changed, 8 insertions(+)
New commits:
commit 7a555784b23fbeccea10feaebfc66cdbbf8a4584
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 9 14:13:48 2016 +0100
vcl, libreofficekit: gtk_clipboard_wait_for_contents() may return null
Don't crash then.
Change-Id: I4980fe4ea56e023cbf303fa43d1e6b383d983d2e
(cherry picked from commit 678e0ea1472478d248d1a45c1e0ade5ed84f9d46)
Reviewed-on: https://gerrit.libreoffice.org/22235
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index fb97af1..595e677 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -601,6 +601,10 @@ static void doPaste(GtkWidget* pButton, gpointer /*pItem*/)
if (oTarget)
{
GtkSelectionData* pSelectionData = gtk_clipboard_wait_for_contents(pClipboard, *oTarget);
+ if (!pSelectionData)
+ {
+ return;
+ }
gint nLength;
const guchar* pData = gtk_selection_data_get_data_with_length(pSelectionData, &nLength);
bool bSuccess = lok_doc_view_paste(pLOKDocView, "text/html", reinterpret_cast<const char*>(pData), nLength);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f914e45..32e1a57 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -206,6 +206,10 @@ public:
css::uno::Any aRet;
GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
it->second);
+ if (!data)
+ {
+ return css::uno::Any();
+ }
gint length;
const guchar *rawdata = gtk_selection_data_get_data_with_length(data,
&length);
More information about the Libreoffice-commits
mailing list