Commit 7a4dfd6028499d6f1089c87aa779d686e15f9285
2011-04-07T11:30:02
Simplify error path in config_set Many error paths freed their local data althought it is freed later on when the end of the function notices that there was an error. This can cause double frees and invalid memory access. Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/src/config.c b/src/config.c
index 5f0bcd8..92d8115 100644
--- a/src/config.c
+++ b/src/config.c
@@ -285,27 +285,23 @@ static int config_set(git_config *cfg, const char *name, const char *value)
*/
var = git__malloc(sizeof(git_cvar));
- if(var == NULL){
- error = GIT_ENOMEM;
- goto out;
- }
+ if (var == NULL)
+ return GIT_ENOMEM;
+
+ memset(var, 0x0, sizeof(git_cvar));
var->name = git__strdup(name);
- if(var->name == NULL){
+ if (var->name == NULL) {
error = GIT_ENOMEM;
- free(var);
goto out;
}
var->value = value ? git__strdup(value) : NULL;
if (var->value == NULL && value != NULL) {
error = GIT_ENOMEM;
- cvar_free(var);
goto out;
}
- var->next = NULL;
-
CVAR_LIST_APPEND(&cfg->var_list, var);
out:
@@ -313,7 +309,6 @@ static int config_set(git_config *cfg, const char *name, const char *value)
cvar_free(var);
return error;
-
}
int git_config_set_int(git_config *cfg, const char *name, int value)