Merge branch 'master' of git://github.com/assimp/assimp

2015-11-29 21:17:05 +01:00
parent f2c49a69ba 714630cc11
commit c5cb7f7b73
16 changed files with 6 additions and 2042 deletions
@@ -491,7 +491,7 @@ const aiScene* Importer::ReadFileFromMemory( const void* pBuffer,
        pHint = "";
    }

-    if (!pBuffer || !pLength || strlen(pHint) > 100) {
+    if (!pBuffer || !pLength || strlen(pHint) > MaxLenHint ) {
        pimpl->mErrorString = "Invalid parameters passed to ReadFileFromMemory()";
        return NULL;
    }