summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-03-09 14:32:06 +0000
committerAndras Timar <andras.timar@collabora.com>2023-03-12 18:01:45 +0000
commit53115bf80b17f3bcf4aad919ff111b9c99b2654c (patch)
treed837726441c9910f8be5c0726c0e672430dc98b0 /package
parentbb7e7b1df18f2e55cd1f562980556b3c3b122065 (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> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148682 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.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 06e55485b9bf..862ac7a78250 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -1130,22 +1130,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,