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

[Caolán McNamara]

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

New commits:
commit a61f45499856aad9910d82af1312a163504c15c2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 21 16:19:42 2017 +0000

    rhbz#1527945 segv on failed open of password protected doc in gnome-documents
    
    Change-Id: I1bec502ae20d03214c673d8911792c89669c0fe9
    Reviewed-on: https://gerrit.libreoffice.org/46923
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 81ec84227a2c..08e40736e6f8 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2229,7 +2229,6 @@ openDocumentInThread (gpointer data)
 
     priv->m_pOffice->pClass->registerCallback(priv->m_pOffice, globalCallbackWorker, pDocView);
     priv->m_pDocument = priv->m_pOffice->pClass->documentLoad( priv->m_pOffice, priv->m_aDocPath );
-    priv->m_eDocumentType = static_cast<LibreOfficeKitDocumentType>(priv->m_pDocument->pClass->getDocumentType(priv->m_pDocument));
     if ( !priv->m_pDocument )
     {
         char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice );
@@ -2237,6 +2236,7 @@ openDocumentInThread (gpointer data)
     }
     else
     {
+        priv->m_eDocumentType = static_cast<LibreOfficeKitDocumentType>(priv->m_pDocument->pClass->getDocumentType(priv->m_pDocument));
         gdk_threads_add_idle(postDocumentLoad, pDocView);
         g_task_return_boolean (task, true);
     }