undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config-set: check write-in-full returns in set_multivar

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-11 13:16:26 -08:00
parent d1b2ddc863
commit 93c1e07947
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
config.c
View File

@ -694,11 +694,9 @@ int git_config_set_multivar(const char* key, const char* value,
store.key = (char*)key;
if (!store_write_section(fd, key) ||
!store_write_pair(fd, key, value)) {
ret = write_error();
goto out_free;
}
} else{
!store_write_pair(fd, key, value))
goto write_err_out;
} else {
struct stat st;
char* contents;
int i, copy_begin, copy_end, new_line = 0;
@ -777,31 +775,33 @@ int git_config_set_multivar(const char* key, const char* value,
/* write the first part of the config */
if (copy_end > copy_begin) {
write_in_full(fd, contents + copy_begin,
copy_end - copy_begin);
if (new_line)
write_in_full(fd, "\n", 1);
if (write_in_full(fd, contents + copy_begin,
copy_end - copy_begin) <
copy_end - copy_begin)
goto write_err_out;
if (new_line &&
write_in_full(fd, "\n", 1) != 1)
goto write_err_out;
}
copy_begin = store.offset[i];
}
/* write the pair (value == NULL means unset) */
if (value != NULL) {
if (store.state == START)
if (!store_write_section(fd, key)) {
ret = write_error();
goto out_free;
}
if (!store_write_pair(fd, key, value)) {
ret = write_error();
goto out_free;
if (store.state == START) {
if (!store_write_section(fd, key))
goto write_err_out;
}
if (!store_write_pair(fd, key, value))
goto write_err_out;
}
/* write the rest of the config */
if (copy_begin < st.st_size)
write_in_full(fd, contents + copy_begin,
st.st_size - copy_begin);
if (write_in_full(fd, contents + copy_begin,
st.st_size - copy_begin) <
st.st_size - copy_begin)
goto write_err_out;
munmap(contents, st.st_size);
unlink(config_filename);
@ -824,6 +824,11 @@ out_free:
free(lock_file);
}
return ret;
write_err_out:
ret = write_error();
goto out_free;
}
int git_config_rename_section(const char *old_name, const char *new_name)