package/source/zipapi/ZipFile.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
New commits: commit 53115bf80b17f3bcf4aad919ff111b9c99b2654c Author: Caolán McNamara <[email protected]> AuthorDate: Thu Mar 9 14:32:06 2023 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sun Mar 12 18:01:45 2023 +0000 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 <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148682 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> 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,
