X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6292dad031833dfc67c9cf0e6e6be455badc2537..30a72e62977e4c532ae2f265db72535a5cccbbab:/src/common/stream.cpp

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 0a6991a42f..9763842c4a 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -81,22 +81,24 @@ void wxStreamBuffer::Init()
 
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
 {
+    Init();
+
     m_stream = &stream;
     m_mode = mode;
 
     m_flushable = TRUE;
     m_destroystream = FALSE;
-    m_destroybuf = FALSE;
 }
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
 {
+    Init();
+
     m_stream = new wxStreamBase;
     m_mode = mode;
 
     m_flushable = FALSE;
     m_destroystream = TRUE;
-    m_destroybuf = FALSE;
 }
 
 wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
@@ -163,7 +165,7 @@ void wxStreamBuffer::SetBufferIO(void *start,
     m_buffer_size = len;
 
     // if we own it, we free it
-    m_destroybuf = !takeOwnership;
+    m_destroybuf = takeOwnership;
 
     ResetBuffer();
 }
@@ -667,7 +669,12 @@ bool wxInputStream::Eof() const
 
     char c;
     self->Read(&c, 1);
-    if ( GetLastError() == wxSTREAM_EOF )
+
+    // some streams can know that they're at EOF before actually trying to
+    // read beyond the end of stream (e.g. files) while others have no way of
+    // knowing it, so to provide the same behaviour in all cases we only
+    // return TRUE from here if the character really couldn't be read
+    if ( !self->LastRead() && GetLastError() == wxSTREAM_EOF )
     {
         return TRUE;
     }
@@ -1022,7 +1029,8 @@ wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s,
 
 wxBufferedInputStream::~wxBufferedInputStream()
 {
-    m_parent_i_stream->SeekI(-m_i_streambuf->GetBytesLeft(), wxFromCurrent);
+    m_parent_i_stream->SeekI(-(off_t)m_i_streambuf->GetBytesLeft(),
+                             wxFromCurrent);
 
     delete m_i_streambuf;
 }