tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wrong detection of zlib inflate error, which could result in infinite looping in readfile

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-01-22 09:05:26 +01:00
parent df14984f70
commit f85bd24078
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/readfile.cpp
View File

@ -229,7 +229,10 @@ public:
while (m_stream.avail_in != 0) { while (m_stream.avail_in != 0) {
m_stream.next_out = (Bytef*)m_obuf; m_stream.next_out = (Bytef*)m_obuf;
m_stream.avail_out = m_obs; m_stream.avail_out = m_obs;
if ((error = inflate(&m_stream, Z_SYNC_FLUSH)) < Z_OK) { if ((error = inflate(&m_stream, Z_SYNC_FLUSH)) != Z_OK) {
// Note that Z_STREAM_END is also an error here,
// because we still have data: something is wrong with
// the file.
LOGERR("inflate error: " << error << endl); LOGERR("inflate error: " << error << endl);
if (reason) { if (reason) {
*reason += " Zlib inflate failed"; *reason += " Zlib inflate failed";