vcl/source/gdi/impgraph.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 22dbd5904f4f69d98530fecdd9e4383dd088f76f Author: Tomaž Vajngerl <[email protected]> AuthorDate: Thu Aug 16 16:46:57 2018 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Aug 22 09:22:47 2018 +0200 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 <[email protected]> (cherry picked from commit 3cd264bb09c6c14bf9eb769d508d7015c4bdc83b) Reviewed-on: https://gerrit.libreoffice.org/59235 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> 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(); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
