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

Don't hang in ReadLine when there's no input left

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-18 12:26:30 +00:00
parent 1aaadf2089
commit 319f678c18
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/txtstrm.cpp
View File

@@ -73,6 +73,9 @@ wxChar wxTextInputStream::NextChar()
memset((void*)m_lastBytes, 0, 10); memset((void*)m_lastBytes, 0, 10);
for(size_t inlen = 0; inlen < 9; inlen++) for(size_t inlen = 0; inlen < 9; inlen++)
{ {
if (!m_input.CanRead())
return wxEOT;
// actually read the next character // actually read the next character
m_lastBytes[inlen] = m_input.GetC(); 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... // there should be no encoding which requires more than nine bytes for one character...
return wxEOT; return wxEOT;
#else #else
if (!m_input.CanRead())
return wxEOT;
m_lastBytes[0] = m_input.GetC(); m_lastBytes[0] = m_input.GetC();
if(m_input.LastRead() <= 0) if(m_input.LastRead() <= 0)