Merge branch 'master' into ms-maxvollmer/importer_fixes

2021-04-28 20:26:38 +02:00
parent 9a0b703db1 7dd870f88c
commit 41e5acf060
1 changed files with 4 additions and 2 deletions
--- a/code/Common/DefaultIOStream.cpp
+++ b/code/Common/DefaultIOStream.cpp
@@ -90,10 +90,12 @@ DefaultIOStream::~DefaultIOStream() {
 size_t DefaultIOStream::Read(void *pvBuffer,
        size_t pSize,
        size_t pCount) {
+    if (0 == pCount) {
+        return 0;
+    }
    ai_assert(nullptr != pvBuffer);
    ai_assert(0 != pSize);
-    ai_assert(0 != pCount);
-
+    
    return (mFile ? ::fread(pvBuffer, pSize, pCount, mFile) : 0);
 }