From 319f678c18cb5cdf42de8de6212c84fe2ccd1e39 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 18 Aug 2007 12:26:30 +0000 Subject: [PATCH] Don't hang in ReadLine when there's no input left git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/txtstrm.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index d2e08f5c8f..cc3c7fd77f 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -73,6 +73,9 @@ wxChar wxTextInputStream::NextChar() memset((void*)m_lastBytes, 0, 10); for(size_t inlen = 0; inlen < 9; inlen++) { + if (!m_input.CanRead()) + return wxEOT; + // actually read the next character m_lastBytes[inlen] = m_input.GetC(); @@ -86,6 +89,9 @@ wxChar wxTextInputStream::NextChar() // there should be no encoding which requires more than nine bytes for one character... return wxEOT; #else + if (!m_input.CanRead()) + return wxEOT; + m_lastBytes[0] = m_input.GetC(); if(m_input.LastRead() <= 0)