package/source/zippackage/ZipPackage.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 28d9059ceef54532ef6790c43759364637f0e391 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Dec 23 16:28:47 2017 +0000 ofz#4734 Null-deref Change-Id: I9b0a5c1e14e95a686986975921f3adb769caad29 Reviewed-on: https://gerrit.libreoffice.org/47020 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> 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); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits