v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MemoryIOWrapper.h

kimkulling/close_memleak-issue-3416
Kim Kulling 2023-02-02 21:04:50 +01:00 committed by GitHub
parent 1eb2c124a0
commit 8030a3264a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/assimp/MemoryIOWrapper.h
View File

@ -175,18 +175,22 @@ public:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Returns the directory separator. */ /** Returns the directory separator. */
char getOsSeparator() const override { char getOsSeparator() const override {
return existing_io ? existing_io->getOsSeparator() return existing_io ? existing_io->getOsSeparator() : '/';
: '/'; // why not? it doesn't care
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Open a new file with a given path. */ /// Open a new file with a given path.
IOStream* Open(const char* pFile, const char* pMode = "rb") override { IOStream* Open(const char* pFile, const char* pMode = "rb") override {
if (pFile == nullptr) {
return nullptr;
}
if ( 0 == strncmp( pFile, AI_MEMORYIO_MAGIC_FILENAME, AI_MEMORYIO_MAGIC_FILENAME_LENGTH ) ) { if ( 0 == strncmp( pFile, AI_MEMORYIO_MAGIC_FILENAME, AI_MEMORYIO_MAGIC_FILENAME_LENGTH ) ) {
created_streams.emplace_back(new MemoryIOStream(buffer, length)); created_streams.emplace_back(new MemoryIOStream(buffer, length));
return created_streams.back(); return created_streams.back();
} }
return existing_io ? existing_io->Open(pFile, pMode) : NULL;
return existing_io ? existing_io->Open(pFile, pMode) : nullptr;
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------