summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-03-09 14:32:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2023-03-09 20:17:15 +0000
commitb6d1cb887438733da2465f107da5088f9826435e (patch)
treef8b4aeed4c1cd8ce27055630efd3b02f1861c790 /package
parentd898620cb47e0d794d4033fdfa13b049f972a9ff (diff)
cid#1521901 Pointer to local outside scope
Change-Id: I38e76440606afb65a8c1ce419c446e234a513659 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148550 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'package')
-rw-r--r--package/source/zipapi/ZipFile.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 78d746ac1b70..27a366c54f95 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -1108,22 +1108,19 @@ void ZipFile::recover()
// read 64bit header
if (aEntry.nExtraLen > 0)
{
- Sequence<sal_Int8>* aExtraBuffer;
+ Sequence<sal_Int8> aExtraBuffer;
if (nPos + 30 + aEntry.nPathLen + aEntry.nExtraLen <= nBufSize)
{
- Sequence<sal_Int8> aTmpBuffer2(
+ aExtraBuffer = Sequence<sal_Int8>(
&(pBuffer[nPos + 30 + aEntry.nPathLen]),
aEntry.nExtraLen);
- aExtraBuffer = &aTmpBuffer2;
}
else
{
- Sequence<sal_Int8> aExtraFields;
aGrabber.seek(nGenPos + nPos + 30 + aEntry.nExtraLen);
- aGrabber.readBytes(aExtraFields, aEntry.nExtraLen);
- aExtraBuffer = &aExtraFields;
+ aGrabber.readBytes(aExtraBuffer, aEntry.nExtraLen);
}
- MemoryByteGrabber aMemGrabberExtra(*aExtraBuffer);
+ MemoryByteGrabber aMemGrabberExtra(aExtraBuffer);
if (aEntry.nExtraLen > 0)
{
readExtraFields(aMemGrabberExtra, aEntry.nExtraLen, nSize,