From e7fb8dc9a3c2f40823b2b0c12c7962dc408092cc Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 24 Mar 2016 21:09:22 +0100
Subject: cid#1357166 null pointer dereference

Change-Id: Id1db85f7f52c2b35e069a0252457959b16a2fd02
---
 sw/source/uibase/dbui/dbmgr.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sw')

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f69fcc230dfa..703e3c622a2a 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1265,7 +1265,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                 // sub-document, to get the correct PageDesc.
                 if(!bFreezedLayouts && bCreateSingleFile)
                 {
-                    FreezeLayouts(pTargetShell, true);
+                    if (pTargetShell)
+                        FreezeLayouts(pTargetShell, true);
                     bFreezedLayouts = true;
                 }
             } while( !bCancel && bNoError &&
-- 
cgit