Merge branch '3.8' into 4.0-beta

This commit is contained in:
badlogic 2020-08-26 16:16:49 +02:00
commit 9f1ce2853b

View File

@ -167,7 +167,7 @@ Cocos2dExtension::Cocos2dExtension() : DefaultSpineExtension() { }
Cocos2dExtension::~Cocos2dExtension() { }
char *Cocos2dExtension::_readFile(const spine::String &path, int *length) {
Data data = FileUtils::getInstance()->getDataFromFile(FileUtils::getInstance()->fullPathForFilename(path.buffer()));
Data data = FileUtils::getInstance()->getDataFromFile(path.buffer());
if (data.isNull()) return nullptr;
// avoid buffer overflow (int is shorter than ssize_t in certain platforms)