X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4004775e5a0c2da5453668201a4a984b6543d061..f4bb632cde9cc60fa89f173f0d33c5881794cc68:/src/common/mstream.cpp

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 5c4302a640..21cc9ee95c 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -60,8 +60,15 @@ wxMemoryInputStream::~wxMemoryInputStream()
 char wxMemoryInputStream::Peek()
 {
     char *buf = (char *)m_i_streambuf->GetBufferStart();
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+
+        return 0;
+    }
 
-    return buf[m_i_streambuf->GetIntPosition()];
+    return buf[pos];
 }
 
 bool wxMemoryInputStream::Eof() const