Merge pull request #523 from turol/afl-fixes

More crash fixes
2015-06-22 16:56:51 +02:00
parent 71cc64238a 681c32d5ec
commit 85e2f47dc8
6 changed files with 24 additions and 7 deletions
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -265,7 +265,7 @@ void ObjFileParser::getVector( std::vector<aiVector3D> &point3d_array ) {
        copyNextWord( m_buffer, BUFFERSIZE );
        z = ( float ) fast_atof( m_buffer );
    } else {
-        ai_assert( !"Invalid number of components" );
+        throw DeadlyImportError( "OBJ: Invalid number of components" );
    }
    point3d_array.push_back( aiVector3D( x, y, z ) );
    m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );