torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a memory leak in error path of my default-torrc code

Browse Source 
Fixes Coverity CID # 500
This commit is contained in:
Nick Mathewson
2011-11-30 12:16:39 -05:00
parent e83862a0ff
commit 9da99b4939
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/config.c
+6 -8
View File
@@ -4399,7 +4399,8 @@ int
options_init_from_torrc(int argc, char **argv)
{
char *cf=NULL, *cf_defaults=NULL;
int i, retval, command;
int i, command;
int retval = -1;
static char **backup_argv;
static int backup_argc;
char *command_arg = NULL;
@@ -4466,19 +4467,16 @@ options_init_from_torrc(int argc, char **argv)
retval = options_init_from_string(cf_defaults, cf, command, command_arg,
&errmsg);
tor_free(cf);
tor_free(cf_defaults);
if (retval < 0)
goto err;
return 0;
err:
tor_free(cf);
tor_free(cf_defaults);
if (errmsg) {
log(LOG_WARN,LD_CONFIG,"%s", errmsg);
tor_free(errmsg);
}
return -1;
return retval < 0 ? -1 : 0;
}
/** Load the options from the configuration in <b>cf</b>, validate