Commit c436f453 authored by Martin Janitschke's avatar Martin Janitschke Committed by Wayne Stambaugh
Browse files

Fix 3D viewer crash bug. (fixes lp:673603 and lp:804778)

parent df8b7c53

3d-viewer/vrmlmodelparser.cpp

+7 −2
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ void VRML_MODEL_PARSER::Load( const wxString aFilename ) 
    while( GetLine( file, line, &LineNum, 512 ) )

    {

        text = strtok( line, sep_chars );

        if ( text == NULL )

            continue;



        if( stricmp( text, "DEF" ) == 0 || stricmp( text, "Group" ) == 0 )

        {
@@ -371,6 +373,9 @@ int VRML_MODEL_PARSER::readGeometry( FILE* file, int* LineNum ) 
        strcpy( buffer, line );

        text = strtok( buffer, sep_chars );



        if( text == NULL )

            continue;



        if( *text == '}' )

        {

            err = 0;
@@ -381,7 +386,7 @@ int VRML_MODEL_PARSER::readGeometry( FILE* file, int* LineNum ) 
        {

            text = strtok( NULL, " ,\t\n\r" );



            if( stricmp( text, "true" ) == 0 )

            if( text && stricmp( text, "true" ) == 0 )

            {

            }

            else
@@ -395,7 +400,7 @@ int VRML_MODEL_PARSER::readGeometry( FILE* file, int* LineNum ) 
        {

            text = strtok( NULL, " ,\t\n\r" );



            if( stricmp( text, "true" ) == 0 )

            if( text && stricmp( text, "true" ) == 0 )

            {

            }

            else