diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-09 14:13:48 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-10 13:02:27 +0000 |
| commit | 7a555784b23fbeccea10feaebfc66cdbbf8a4584 (patch) | |
| tree | b4662b73b6422aca38ab8e3ab37d91a10431e650 /vcl | |
| parent | 30e32035adfb053637ca68127bedd68a938e7332 (diff) | |
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@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index f914e4546f6a..32e1a5722fac 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); |