Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed couple of bugs in wxZlibInputStream -- mainly incorrect handling of underlaying stream errors and absolutely wrong bytes counting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-03-04 20:37:23 +00:00
parent 39a16cb41d
commit 777fd647dc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/zstream.cpp
View File

@@ -89,15 +89,19 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
m_inflate->next_in = m_z_buffer; m_inflate->next_in = m_z_buffer;
m_inflate->avail_in = m_parent_i_stream->LastRead(); m_inflate->avail_in = m_parent_i_stream->LastRead();
if (m_parent_i_stream->LastError() != wxStream_NOERROR) if (m_parent_i_stream->LastError() != wxStream_NOERROR &&
return (size - m_inflate->avail_in); m_parent_i_stream->LastError() != wxStream_EOF)
{
m_lasterror = m_parent_i_stream->LastError();
return 0; // failed to read anything
}
} }
err = inflate(m_inflate, Z_FINISH); err = inflate(m_inflate, Z_FINISH);
if (err == Z_STREAM_END) if (err == Z_STREAM_END)
return (size - m_inflate->avail_in); return (size - m_inflate->avail_out);
} }
return size-m_inflate->avail_in; return size-m_inflate->avail_out;
} }
////////////////////// //////////////////////