Added check if fieldMapping node's table attribute is set

1 files changed, 5 insertions, 0 deletions

diff --git a/database/eurephiadb_mapping.c b/database/eurephiadb_mapping.c
index 406fece..e1b7432 100644
--- a/database/eurephiadb_mapping.c
+++ b/database/eurephiadb_mapping.c
@@ -151,7 +151,12 @@ eDBfieldMap *eDBxmlMapping(eurephiaCTX *ctx, eDBfieldMap *dbmap, const char *tbl
         }
 
         // Make sure the fmapnode is suitable for the given dbmap
+        assert( TABLE_NAME[dbmap->tableid] != NULL );
         fmap_table = xmlGetAttrValue(fmapnode->properties, "table");
+        if( fmap_table == NULL ) {
+                eurephia_log(ctx, LOG_ERROR, 0, "Invalid fieldMapping XML document");
+                return NULL;
+        }
         if( strcmp(fmap_table, TABLE_NAME[dbmap->tableid]) != 0 ) {
                 eurephia_log(ctx, LOG_ERROR, 0, "Mismatch between XML fieldMapping and eDBfieldMap");
                 return NULL;