Browse Source

coverity finding: get latest openddlparser to get fix against possible nullptr access.

Kim Kulling 9 years ago
parent
commit
3d2140afee
1 changed files with 2 additions and 2 deletions
  1. 2 2
      contrib/openddlparser/code/OpenDDLParser.cpp

+ 2 - 2
contrib/openddlparser/code/OpenDDLParser.cpp

@@ -299,13 +299,13 @@ char *OpenDDLParser::parseHeader( char *in, char *end ) {
         }
         }
 
 
         // set the properties
         // set the properties
-        if( ddl_nullptr != first ) {
+        if( ddl_nullptr != first && ddl_nullptr != node ) {
             node->setProperties( first );
             node->setProperties( first );
         }
         }
 
 
         Name *name( ddl_nullptr );
         Name *name( ddl_nullptr );
         in = OpenDDLParser::parseName( in, end, &name );
         in = OpenDDLParser::parseName( in, end, &name );
-        if( ddl_nullptr != name ) {
+        if( ddl_nullptr != name && ddl_nullptr != node ) {
             const std::string nodeName( name->m_id->m_text.m_buffer );
             const std::string nodeName( name->m_id->m_text.m_buffer );
             node->setName( nodeName );
             node->setName( nodeName );
         }
         }