summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-08-16 16:46:57 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-08-22 09:22:47 +0200
commit22dbd5904f4f69d98530fecdd9e4383dd088f76f (patch)
tree42bd9e01aa068115fd207a1d22b13e245666ee77
parent7ce8689eaa9cab85193d031b911331c9675b77bc (diff)
tdf#117797 guard access to mpSwapFile as it may not be set
Change-Id: If45257293e997bc4540b97fbbe5f1f4b77a48b69 Reviewed-on: https://gerrit.libreoffice.org/59202 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 3cd264bb09c6c14bf9eb769d508d7015c4bdc83b) Reviewed-on: https://gerrit.libreoffice.org/59235 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/gdi/impgraph.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index c718f9673610..5fd1bd9ae7f1 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1576,7 +1576,8 @@ bool ImpGraphic::ImplSwapIn()
bRet = ImplSwapIn( xIStm.get() );
xIStm.reset();
- setOriginURL(mpSwapFile->maOriginURL);
+ if (mpSwapFile)
+ setOriginURL(mpSwapFile->maOriginURL);
mpSwapFile.reset();
}
}