diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-24 21:09:22 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-24 21:24:24 +0100 |
| commit | e7fb8dc9a3c2f40823b2b0c12c7962dc408092cc (patch) | |
| tree | 0dbda8d647e9b119bef8d9469e45549abd2c37ee /sw | |
| parent | 80e3a7a671858f31133cf1fabfb5a3ca0b9a4680 (diff) | |
cid#1357166 null pointer dereference
Change-Id: Id1db85f7f52c2b35e069a0252457959b16a2fd02
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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 && |