Memory issue (#50)

*Improve import logs
*Fix memory leaks causing the process to be killed by the OS
*Fix configuration bug
*Fix bug losing the node end record for specific cases

Author: mscasso-scanoss

src/collate.c

@@ -742,26 +742,57 @@ bool ldb_collate_init(struct ldb_collate_data * collate, struct ldb_table table,
 
 	/* Reserve space for collate data */
 	collate->data = (char *)calloc(LDB_MAX_RECORDS * (collate->rec_width+10), 1);
-	
+
 	if (!collate->data)
 		return false;
 
 	collate->tmp_data = (char *)calloc(LDB_MAX_RECORDS * (collate->rec_width+10), 1);
 
 	if (!collate->tmp_data)
+	{
+		free(collate->data);
 		return false;
+	}
 
 	/* Set global cmp width (for qsort) */
 	ldb_cmp_width = max_rec_ln;
 
 	/* Open (out) sector */
 	collate->out_sector = ldb_open(out_table, &sector, "w+");
 	if (!collate->out_sector)
+	{
+		free(collate->data);
+		free(collate->tmp_data);
 		return false;
-	
+	}
+
 	return true;
 }
 
+/**
+ * @brief Cleanup collate data structures (frees allocated memory)
+ *
+ * @param collate Collate data structure
+ */
+void ldb_collate_cleanup(struct ldb_collate_data *collate)
+{
+	if (collate->data)
+	{
+		free(collate->data);
+		collate->data = NULL;
+	}
+	if (collate->tmp_data)
+	{
+		free(collate->tmp_data);
+		collate->tmp_data = NULL;
+	}
+	if (collate->out_sector)
+	{
+		fclose(collate->out_sector);
+		collate->out_sector = NULL;
+	}
+}
+
 void ldb_collate_sector(struct ldb_collate_data *collate, ldb_sector_t * sector)
 {
 	log_info("Collating %s/%s - sector %02x - %s\n", collate->in_table.db, collate->in_table.table, sector->id, sector->data == NULL ? "On disk" : "On RAM");
@@ -787,9 +818,6 @@ void ldb_collate_sector(struct ldb_collate_data *collate, ldb_sector_t * sector)
 		ldb_import_list(collate);
 	}
 
-	/* Close .out sector */
-	fclose(collate->out_sector);
-
 	/* Move or erase sector */
 	if (collate->merge)
 		ldb_sector_erase(collate->in_table, k);
@@ -798,10 +826,12 @@ void ldb_collate_sector(struct ldb_collate_data *collate, ldb_sector_t * sector)
 
 	if (collate->del_count)
 		log_info("%s - sector %02X: %'ld records deleted\n", collate->in_table.table, sector->id, collate->del_count);
-	
+
 	log_info("Table %s - sector %2x: collate completed with %'ld records\n", collate->in_table.table , sector->id, collate->rec_count);
 
-	free(collate->data);
+	/* Cleanup collate data structures */
+	ldb_collate_cleanup(collate);
+
 	free(sector->data);
 	sector->data = NULL;
 }
@@ -841,11 +871,16 @@ void ldb_collate(struct ldb_table table, struct ldb_table out_table, int max_rec
 			ldb_sector_t sector  = ldb_load_sector_v2(table, &k0);
 			//skip unexistent sector.
 			if (!sector.size)
+			{
+				ldb_collate_cleanup(&collate);
+				if (p_sector >= 0)
+					break;
 				continue;
+			}
 
 			ldb_collate_sector(&collate, &sector);
 		}
-		
+
 		if (p_sector >=0)
 			break;