Skip to content
Snippets Groups Projects
Commit d3022c10 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

fix compute_log_dir parameters and double freed

parent bbf1dbf2
No related branches found
No related tags found
No related merge requests found
Pipeline #15721 failed
...@@ -135,7 +135,7 @@ void parse_rename_interdependences(resolve_service_t *res, char const *prefix, s ...@@ -135,7 +135,7 @@ void parse_rename_interdependences(resolve_service_t *res, char const *prefix, s
c->res.logger.name = resolve_add_string(wres, logname) ; c->res.logger.name = resolve_add_string(wres, logname) ;
c->res.logger.destination = compute_log_dir(wres, res) ; c->res.logger.destination = compute_log_dir(wres, &c->res) ;
c->res.logger.execute.run.runas = c->res.logger.execute.run.runas ? resolve_add_string(wres, c->res.sa.s + c->res.logger.execute.run.runas) : resolve_add_string(wres, SS_LOGGER_RUNNER) ; c->res.logger.execute.run.runas = c->res.logger.execute.run.runas ? resolve_add_string(wres, c->res.sa.s + c->res.logger.execute.run.runas) : resolve_add_string(wres, SS_LOGGER_RUNNER) ;
...@@ -146,13 +146,14 @@ void parse_rename_interdependences(resolve_service_t *res, char const *prefix, s ...@@ -146,13 +146,14 @@ void parse_rename_interdependences(resolve_service_t *res, char const *prefix, s
log_die_nomem("stralloc") ; log_die_nomem("stralloc") ;
} }
free(wres) ;
} }
if (sastr_cmp(&sa, c->res.sa.s + c->res.name) < 0 ) if (sastr_cmp(&sa, c->res.sa.s + c->res.name) < 0 )
if (!sastr_add_string(&sa, c->res.sa.s + c->res.name)) if (!sastr_add_string(&sa, c->res.sa.s + c->res.name))
log_die_nomem("stralloc") ; log_die_nomem("stralloc") ;
} }
free(wres) ;
} }
wres = resolve_set_struct(DATA_SERVICE, res) ; wres = resolve_set_struct(DATA_SERVICE, res) ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment