Merge pull request #8 from alan-wu/master

Fixed a bug causing FieldML to crash when binding invalid value type and...

Author: rchristie

core/src/FieldmlDOM.cpp

@@ -156,6 +156,8 @@ static int validate( FieldmlErrorHandler *errorHandler, xmlParserInputBufferPtr
         errorHandler->logError( errorMessage );
     }
 
+    xmlResetLastError();
+
     return result;
 }
 
@@ -198,6 +200,7 @@ static int parseObjectNode( xmlNodePtr objectNode, ParseState &state );
 FmlObjectHandle getObjectAttribute( xmlNodePtr node, const xmlChar *attribute, ParseState &state )
 {
     const char *objectName = getStringAttribute( node, attribute );
+
     if( objectName == NULL )
     {
         return FML_INVALID_HANDLE;
@@ -216,6 +219,9 @@ FmlObjectHandle getObjectAttribute( xmlNodePtr node, const xmlChar *attribute, P
     }
 
     FmlObjectHandle objectHandle = Fieldml_GetObjectByName( state.session, objectName );
+    if (objectHandle == FML_INVALID_HANDLE)
+    	state.errorHandler->logError( "FieldML Object attribute not found", objectName );
+
     xmlFree(const_cast<char *>(objectName));
 
     return objectHandle;
@@ -573,10 +579,24 @@ class BindParser :
         FmlObjectHandle argument = getObjectAttribute( objectNode, ARGUMENT_ATTRIB, state );
         FmlObjectHandle source = getObjectAttribute( objectNode, SOURCE_ATTRIB, state );
 
-        if( Fieldml_SetBind( state.session, object, argument, source ) != FML_ERR_NO_ERROR )
+        if (FML_INVALID_HANDLE == argument)
         {
-						const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB );
-						const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB );
+        	const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB );
+        	state.errorHandler->logError( "Incompatible bind", argsAttrib);
+        	xmlFree(const_cast<char *>(argsAttrib));
+        	return 1;
+        }
+        else if (FML_INVALID_HANDLE == source)
+        {
+        	const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB );
+        	state.errorHandler->logError( "Incompatible bind", sourceAttrib);
+        	xmlFree(const_cast<char *>(sourceAttrib));
+        	return 1;
+        }
+        else if( Fieldml_SetBind( state.session, object, argument, source ) != FML_ERR_NO_ERROR )
+        {
+			const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB );
+			const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB );
             state.errorHandler->logError( "Incompatible bind", argsAttrib, sourceAttrib );
             xmlFree(const_cast<char *>(argsAttrib));
             xmlFree(const_cast<char *>(sourceAttrib));

core/src/FieldmlSession.cpp

@@ -246,7 +246,6 @@ void FieldmlSession::pushErrorContext( const char *file, const int line, const c
     contextStack.push_back( pair<string, int>( string( function ) + string( ":" ) + string( file ), line ) );
 }
 
-
 void FieldmlSession::popErrorContext()
 {
     contextStack.pop_back();

core/src/fieldml_write.cpp

@@ -617,8 +617,8 @@ static void writeDOKArrayData( xmlTextWriterPtr writer, FmlSessionHandle handle,
     xmlTextWriterWriteAttribute( writer,KEY_DATA_ATTRIB, (const xmlChar*)Fieldml_GetObjectName( handle, keyDataObject ) );
     xmlTextWriterWriteAttribute( writer, VALUE_DATA_ATTRIB, (const xmlChar*)Fieldml_GetObjectName( handle, dataObject ) );
 
-    writeParameterIndexes( writer, handle, object, 1 );
     writeParameterIndexes( writer, handle, object, 0 );
+    writeParameterIndexes( writer, handle, object, 1 );
 
     xmlTextWriterEndElement( writer );
 }

io/src/Hdf5ArrayDataReader.h

@@ -77,10 +77,10 @@ class Hdf5ArrayDataReader :
 
     virtual FmlIoErrorNumber readBooleanSlab( const int *offsets, const int *sizes, FmlBoolean *valueBuffer );
 
-    virtual FmlIoErrorNumber setStreamRequestCallback( Fieldml_StreamRequestCallbackFunction function, void *user_data_in )
-    {
-   	 return 0;
-    }
+   // virtual FmlIoErrorNumber setStreamRequestCallback( Fieldml_StreamRequestCallbackFunction function, void *user_data_in )
+   // {
+   //	 return 0;
+    //}
 
     virtual FmlIoErrorNumber close();