proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-24 01:58:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a bug in gitfo_read_file()

Browse Source 
In particular, when asked to read an empty file, this function
calls malloc() with a zero size allocation request. Standard C
says that the behaviour of malloc() in this case is implementation
defined.

[C99, 7.20.3 says "... If the size of the space requested is zero,
the behavior is implementation-defined: either a null pointer is
returned, or the behavior is as if the size were some nonzero
value, except that the returned pointer shall not be used to
access an object."]

Finesse the issue by over-allocating by one byte. Setting the extra
byte to '\0' may also provide a useful sentinel for text files.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Ramsay Jones 2008-12-27 18:56:16 +00:00 committed by Shawn O. Pearce
parent d7fbfe155f
commit 42fd40db68
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fileops.c
View File

@ -53,14 +53,14 @@ int gitfo_read_file(gitfo_buf *obj, const char *path)
{ {
git_file fd; git_file fd;
off_t len; off_t len;
void *buff; unsigned char *buff;
assert(obj && path && *path); assert(obj && path && *path);
if ((fd = gitfo_open(path, O_RDONLY)) < 0) if ((fd = gitfo_open(path, O_RDONLY)) < 0)
return GIT_ERROR; /* TODO: error handling */ return GIT_ERROR; /* TODO: error handling */
if (((len = gitfo_size(fd)) < 0) || ((buff = malloc(len)) == NULL)) { if (((len = gitfo_size(fd)) < 0) || ((buff = malloc(len+1)) == NULL)) {
gitfo_close(fd); gitfo_close(fd);
return GIT_ERROR; /* TODO: error handling */ return GIT_ERROR; /* TODO: error handling */
} }
@ -70,6 +70,7 @@ int gitfo_read_file(gitfo_buf *obj, const char *path)
free(buff); free(buff);
return GIT_ERROR; /* TODO: error handling */ return GIT_ERROR; /* TODO: error handling */
} }
buff[len] = '\0';
gitfo_close(fd); gitfo_close(fd);