[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/source

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e390b5f4f1267071245e452baa8dd63cdb556f1d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 16 20:04:01 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 139b5be..3d01a62 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);