diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-23 16:28:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-25 21:53:42 +0100 |
| commit | 28d9059ceef54532ef6790c43759364637f0e391 (patch) | |
| tree | cde7abcad7325b7499ae7e354d7e22265f627ad5 | |
| parent | 9c057c48318804c99f1f19071ff856db252cc476 (diff) | |
ofz#4734 Null-deref
Change-Id: I9b0a5c1e14e95a686986975921f3adb769caad29
Reviewed-on: https://gerrit.libreoffice.org/47020
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index c2ec7800d96e..3ea75dc409d4 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -783,7 +783,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) sal_Int32 nDirIndex = aName.lastIndexOf ( '/', nStreamIndex ); sTemp = aName.copy ( nDirIndex == -1 ? 0 : nDirIndex+1, nStreamIndex-nDirIndex-1 ); - if (sTemp == pFolder->getName()) + if (pFolder && sTemp == pFolder->getName()) return makeAny(uno::Reference<XUnoTunnel>(pFolder)); } else @@ -791,7 +791,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) // Determine the file name. sTemp = aName.copy ( nStreamIndex + 1 ); - if (pFolder->hasByName(sTemp)) + if (pFolder && pFolder->hasByName(sTemp)) return pFolder->getByName(sTemp); } |