From ae4c836b49a8ac41312f855e24f20b0b050fcbd4 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 18 Sep 2014 00:46:16 +0200 Subject: [PATCH] bnc#887307 ODF files not showing up on Windows search Under Windows 7, ODF and OpenOffice.org 1.1 files were not found, when the folder containing them was not indexed, and full text search was switched on. The problem did not occur under Windows 8. Apparently there is a bug in Windows 7, reading beyond the end of a BufferStream resulted in 0 bytes read. So we take care not to read beyond the end of stream. Change-Id: Id01b08922121dabbb7b49c54f8ef11cb0e4ac413 --- shell/source/win32/zipfile/zipfile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index ceccb7a3b2a7..ca4381241231 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -289,7 +289,7 @@ static bool findCentralDirectoryEnd(StreamInterface *stream) try { - for (long nOffset = nLength - BLOCK_SIZE; + for (long nOffset = nLength - BLOCK_SIZE - 4; nOffset > 0; nOffset -= BLOCK_SIZE) { if (findSignatureAtOffset(stream, nOffset))