commit e7fb8dc9a3c2f40823b2b0c12c7962dc408092cc
author Miklos Vajna <vmiklos@collabora.co.uk> Thu Mar 24 21:09:22 2016 +0100
committer Miklos Vajna <vmiklos@collabora.co.uk> Thu Mar 24 21:24:24 2016 +0100
tree 0dbda8d647e9b119bef8d9469e45549abd2c37ee
parent 80e3a7a671858f31133cf1fabfb5a3ca0b9a4680

cid#1357166 null pointer dereference

Change-Id: Id1db85f7f52c2b35e069a0252457959b16a2fd02

sw/source/uibase/dbui/dbmgr.cxx

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f69fcc2..703e3c6 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 &&