Merge branch 'aaa' of github.com:Safe-BCY/dlt-daemon into aaa

COVESA · May 10, 2022 · f34afea · f34afea
2 parents 44c814c + 4fcd76b
commit f34afea
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/shared/dlt_config_file_parser.c b/src/shared/dlt_config_file_parser.c
@@ -148,7 +148,11 @@ static int dlt_config_file_set_section(DltConfigFile *file, char *name)
 
     if (s->keys == NULL) {
         free(s->name);
+<<<<<<< HEAD
         s->name = NULL;
+=======
+        s->name = NULL; /*free again in dlt_config_file_release*/
+>>>>>>> 4fcd76b7cfb9cf58204432329df84514d2b99449
         dlt_log(LOG_ERR, "Cannot allocate memory for internal data structure\n");
         return -1;
     }