proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-27 10:46:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

filebuf: handle write error in lock_file

Browse Source 
When writing to a file with locking not check if writing the
locked file actually succeeds. Fix the issue by returning error
code and message when writing fails.
This commit is contained in:
Patrick Steinhardt 2016-03-10 17:05:30 +01:00 committed by Edward Thomson
parent f17ed63759
commit 18c4ae70d1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/filebuf.c
View File

@ -70,6 +70,7 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode)
git_file source; git_file source;
char buffer[FILEIO_BUFSIZE]; char buffer[FILEIO_BUFSIZE];
ssize_t read_bytes; ssize_t read_bytes;
int error;
source = p_open(file->path_original, O_RDONLY); source = p_open(file->path_original, O_RDONLY);
if (source < 0) { if (source < 0) {
@ -80,7 +81,8 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode)
} }
while ((read_bytes = p_read(source, buffer, sizeof(buffer))) > 0) { while ((read_bytes = p_read(source, buffer, sizeof(buffer))) > 0) {
p_write(file->fd, buffer, read_bytes); if ((error = p_write(file->fd, buffer, read_bytes)) < 0)
break;
if (file->compute_digest) if (file->compute_digest)
git_hash_update(&file->digest, buffer, read_bytes); git_hash_update(&file->digest, buffer, read_bytes);
} }
@ -90,6 +92,9 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode)
if (read_bytes < 0) { if (read_bytes < 0) {
giterr_set(GITERR_OS, "Failed to read file '%s'", file->path_original); giterr_set(GITERR_OS, "Failed to read file '%s'", file->path_original);
return -1; return -1;
} else if (error < 0) {
giterr_set(GITERR_OS, "Failed to write file '%s'", file->path_lock);
return -1;
} }
} }