summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authormst <mst@openoffice.org>2011-09-17 22:37:36 +0000
committerThorsten Behrens <tbehrens@suse.com>2011-11-29 17:57:29 +0100
commitc9e1a120fff37a9d87c4e193cec804d2ac909f90 (patch)
tree9ce590aae14adee1576343ca546b0c58603bf007 /shell
parent36d950fb16d214b7163223fc2b51f0990f96e494 (diff)
tkr41: #117828# office crash fixed . (null pointer) + add unit test
* found as LGPLv3-only fix at svn rev 1172105 (http://svn.apache.org/viewvc?view=revision&revision=1172105)
Diffstat (limited to 'shell')
-rw-r--r--shell/source/win32/zipfile/zipfile.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx
index a7c03d49c657..30c46b05df2b 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -189,8 +189,9 @@ ZipFile::DirectoryPtr_t ZipFile::GetDirectory() const
while (UNZ_OK == rc && UNZ_END_OF_LIST_OF_FILE != rc)
{
+ unz_file_info finfo;
unzGetCurrentFileInfo(
- m_uzFile, 0, szFileName, lmax, 0, 0, 0, 0);
+ m_uzFile, &finfo, szFileName, lmax, 0, 0, 0, 0);
dir->push_back(szFileName);