Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add check data valid in getStringFromFile 

so far no check would be crashed when getData faild.
maybe return an empty string is better.
This commit is contained in:
hbb 2014-01-15 12:39:56 +08:00
parent e5aaed49cf
commit 8fac676a82
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/platform/CCFileUtils.cpp
View File

@ -547,6 +547,8 @@ static Data getData(const std::string& filename, bool forString)
std::string FileUtils::getStringFromFile(const std::string& filename) std::string FileUtils::getStringFromFile(const std::string& filename)
{ {
Data data = getData(filename, true); Data data = getData(filename, true);
if (! data.getBytes())
return "";
std::string ret((const char*)data.getBytes()); std::string ret((const char*)data.getBytes());
return ret; return ret;
} }