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

Remove asserts from wxZipHeader::ReadNN() methods

Browse Source 
They prevent fuzzing from working properly as the program aborts instead
of continuing and crashing if it mishandles incorrect input, so just
remove them -- they didn't add any safety anyhow, as asserts are dormant
by default in release builds.
This commit is contained in:
Vadim Zeitlin
2019-10-29 19:05:15 +01:00
parent c836b94cc4
commit c700f3bdf7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/zipstrm.cpp
View File

@@ -251,13 +251,11 @@ wxZipHeader::wxZipHeader(const char* data, size_t size)
inline wxUint8 wxZipHeader::Read8() inline wxUint8 wxZipHeader::Read8()
{ {
wxASSERT(m_pos < m_size);
return m_data[m_pos++]; return m_data[m_pos++];
} }
inline wxUint16 wxZipHeader::Read16() inline wxUint16 wxZipHeader::Read16()
{ {
wxASSERT(m_pos + 2 <= m_size);
wxUint16 n = CrackUint16(m_data + m_pos); wxUint16 n = CrackUint16(m_data + m_pos);
m_pos += 2; m_pos += 2;
return n; return n;
@@ -265,7 +263,6 @@ inline wxUint16 wxZipHeader::Read16()
inline wxUint32 wxZipHeader::Read32() inline wxUint32 wxZipHeader::Read32()
{ {
wxASSERT(m_pos + 4 <= m_size);
wxUint32 n = CrackUint32(m_data + m_pos); wxUint32 n = CrackUint32(m_data + m_pos);
m_pos += 4; m_pos += 4;
return n; return n;
@@ -273,7 +270,6 @@ inline wxUint32 wxZipHeader::Read32()
inline wxUint64 wxZipHeader::Read64() inline wxUint64 wxZipHeader::Read64()
{ {
wxASSERT(m_pos + 8 <= m_size);
wxUint64 n = CrackUint64(m_data + m_pos); wxUint64 n = CrackUint64(m_data + m_pos);
m_pos += 8; m_pos += 8;
return n; return n;