github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-23 06:13:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: LoadStream error handling refactored #660

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6814 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-01-27 08:49:08 +00:00
parent 44f0710987
commit decbc87410
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/Core/Stream.cpp
View file

@ -1531,12 +1531,13 @@ String ReadStdIn()
String LoadStream(Stream& in) {
if(in.IsOpen()) {
in.ClearError();
int size = (int)in.GetLeft();
StringBuffer s(size);
if((dword)size != 0xffffffff)
int64 size = in.GetLeft();
if(size >= 0 && size < INT_MAX / 2) {
StringBuffer s((int)size);
in.Get(s, size);
if(!in.IsError())
return s;
if(!in.IsError())
return s;
}
}
return String::GetVoid();
}