package/source/zipapi/ZipFile.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit 9a6ec69ac28f36e6c637267bd71a7527162318eb Author: Mike Kaganski <[email protected]> AuthorDate: Fri Feb 2 12:55:34 2024 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Feb 2 14:33:05 2024 +0100 Avoid infinite loop (24-2-specific) The 'continue' didn't increment nPos. In master, this is fixed by commit a53f0dc811a115cd68a5c297a68eeb5a9d3bb5ef (Extract Local file header and Data descriptor handling into own functions, 2024-02-02) Change-Id: Id20a1a543250efe0d359ec6d0f05fc23cff1c5ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162902 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 71fd66f08196..3d382bd3a305 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -1314,7 +1314,10 @@ void ZipFile::recover() [path = OUString(aEntry.sPath + "/")](const auto& r) { return r.first.startsWith(path); }) != aEntries.end()) + { + nPos += 4; continue; + } aEntries.emplace( aEntry.sPath, aEntry );
