mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 03:06:17 +02:00
Code

strbuf: strbuf_read_file() should return ssize_t 

It is currently declared to return int, which could overflow for
large files.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2015-07-03 15:59:32 +02:00 committed by Junio C Hamano
parent 351d06df51
commit 6c8afe495b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
strbuf.c
View File

@ -481,9 +481,10 @@ int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
return 0;
}
int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
{
int fd, len;
int fd;
ssize_t len;
fd = open(path, O_RDONLY);
if (fd < 0)

2
strbuf.h
View File

@ -364,7 +364,7 @@ extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
* Read the contents of a file, specified by its path. The third argument
* can be used to give a hint about the file size, to avoid reallocs.
*/
extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
/**
* Read the target of a symbolic link, specified by its path. The third