summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-12-16 20:04:01 +0100
committerDavid Tardon <dtardon@redhat.com>2015-12-17 16:03:43 +0000
commite390b5f4f1267071245e452baa8dd63cdb556f1d (patch)
tree1c7351c9763f868216bc8ed3ceea756450411336
parentb2087af1fff0b2d8a49aa9fd4341ffa7129819dd (diff)
tdf#96250 LOK: guard against 0 pRenderingArguments
(cherry picked from commit 032e34d0014d2154feaf97105d2dbe69b290b8c5) Change-Id: Ifa39777795ce966662c31c891ffc1b9b1a297b00 Reviewed-on: https://gerrit.libreoffice.org/20743 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--libreofficekit/source/gtk/lokdocview.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 139b5bebe151..3d01a62a92c6 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2453,7 +2453,8 @@ lok_doc_view_open_document (LOKDocView* pDocView,
pLOEvent->m_pPath = pPath;
priv->m_aDocPath = pPath;
- priv->m_aRenderingArguments = pRenderingArguments;
+ if (pRenderingArguments)
+ priv->m_aRenderingArguments = pRenderingArguments;
g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);