|
 |
f325b2 |
From 630f041ac5f60195fa4a75f22ad348fba1c14382 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Wed, 16 Dec 2015 20:04:01 +0100
|
|
|
f325b2 |
Subject: [PATCH 372/398] tdf#96250 LOK: guard against 0 pRenderingArguments
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 032e34d0014d2154feaf97105d2dbe69b290b8c5)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ifa39777795ce966662c31c891ffc1b9b1a297b00
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20743
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
(cherry picked from commit e390b5f4f1267071245e452baa8dd63cdb556f1d)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 3 ++-
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 012c75f29e1b..927f4b509bb8 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -2451,7 +2451,8 @@ lok_doc_view_open_document (LOKDocView* pDocView,
|
|
|
f325b2 |
pLOEvent->m_pPath = pPath;
|
|
|
f325b2 |
|
|
|
f325b2 |
priv->m_aDocPath = pPath;
|
|
|
f325b2 |
- priv->m_aRenderingArguments = pRenderingArguments;
|
|
|
f325b2 |
+ if (pRenderingArguments)
|
|
|
f325b2 |
+ priv->m_aRenderingArguments = pRenderingArguments;
|
|
|
f325b2 |
g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
|
|
|
f325b2 |
|
|
|
f325b2 |
g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|