mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanups: prevent leak of two strduped strings in config.c

Browse Source 
Config_filename and lockfile are strduped and then leaked in
git_config_set_multivar.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Serge E. Hallyn
2006-04-17 10:14:48 -05:00
committed by Junio C Hamano
parent ecc13e73cf
commit dafc88b136
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
config.c
View File

@ -420,6 +420,7 @@ int git_config_set_multivar(const char* key, const char* value,
{ {
int i; int i;
int fd, in_fd; int fd, in_fd;
int ret;
char* config_filename = strdup(git_path("config")); char* config_filename = strdup(git_path("config"));
char* lock_file = strdup(git_path("config.lock")); char* lock_file = strdup(git_path("config.lock"));
const char* last_dot = strrchr(key, '.'); const char* last_dot = strrchr(key, '.');
@ -429,9 +430,10 @@ int git_config_set_multivar(const char* key, const char* value,
* key name separated by a dot, we have to know where the dot is. * key name separated by a dot, we have to know where the dot is.
*/ */
if (last_dot == NULL) { if (last_dot == NULL) {
fprintf(stderr, "key does not contain a section: %s\n", key); fprintf(stderr, "key does not contain a section: %s\n", key);
return 2; ret = 2;
goto out_free;
} }
store.baselen = last_dot - key; store.baselen = last_dot - key;
@ -447,7 +449,8 @@ int git_config_set_multivar(const char* key, const char* value,
(i == store.baselen+1 && !isalpha(key[i])))) { (i == store.baselen+1 && !isalpha(key[i])))) {
fprintf(stderr, "invalid key: %s\n", key); fprintf(stderr, "invalid key: %s\n", key);
free(store.key); free(store.key);
return 1; ret = 1;
goto out_free;
} else } else
store.key[i] = tolower(key[i]); store.key[i] = tolower(key[i]);
store.key[i] = 0; store.key[i] = 0;
@ -460,7 +463,8 @@ int git_config_set_multivar(const char* key, const char* value,
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "could not lock config file\n"); fprintf(stderr, "could not lock config file\n");
free(store.key); free(store.key);
return -1; ret = -1;
goto out_free;
} }
/* /*
@ -475,13 +479,15 @@ int git_config_set_multivar(const char* key, const char* value,
strerror(errno)); strerror(errno));
close(fd); close(fd);
unlink(lock_file); unlink(lock_file);
return 3; /* same as "invalid config file" */ ret = 3; /* same as "invalid config file" */
goto out_free;
} }
/* if nothing to unset, error out */ /* if nothing to unset, error out */
if (value == NULL) { if (value == NULL) {
close(fd); close(fd);
unlink(lock_file); unlink(lock_file);
return 5; ret = 5;
goto out_free;
} }
store.key = (char*)key; store.key = (char*)key;
@ -507,7 +513,8 @@ int git_config_set_multivar(const char* key, const char* value,
fprintf(stderr, "Invalid pattern: %s\n", fprintf(stderr, "Invalid pattern: %s\n",
value_regex); value_regex);
free(store.value_regex); free(store.value_regex);
return 6; ret = 6;
goto out_free;
} }
} }
@ -528,7 +535,8 @@ int git_config_set_multivar(const char* key, const char* value,
regfree(store.value_regex); regfree(store.value_regex);
free(store.value_regex); free(store.value_regex);
} }
return 3; ret = 3;
goto out_free;
} }
free(store.key); free(store.key);
@ -542,7 +550,8 @@ int git_config_set_multivar(const char* key, const char* value,
(store.seen > 1 && multi_replace == 0)) { (store.seen > 1 && multi_replace == 0)) {
close(fd); close(fd);
unlink(lock_file); unlink(lock_file);
return 5; ret = 5;
goto out_free;
} }
fstat(in_fd, &st); fstat(in_fd, &st);
@ -593,10 +602,18 @@ int git_config_set_multivar(const char* key, const char* value,
if (rename(lock_file, config_filename) < 0) { if (rename(lock_file, config_filename) < 0) {
fprintf(stderr, "Could not rename the lock file?\n"); fprintf(stderr, "Could not rename the lock file?\n");
return 4; ret = 4;
goto out_free;
} }
return 0; ret = 0;
out_free:
if (config_filename)
free(config_filename);
if (lock_file)
free(lock_file);
return ret;
} }