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

p_read: ensure requested len is ssize_t

Browse Source 
Ensure that the given length to `p_read` is of ssize_t and ensure
that callers test the return as if it were an `ssize_t`.
This commit is contained in:
Edward Thomson 2015-02-11 13:01:00 -05:00 committed by Edward Thomson
parent ec3b4d35f6
commit 8d534b4758
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fileops.c
View File

@ -127,6 +127,11 @@ int git_futils_readbuffer_fd(git_buf *buf, git_file fd, size_t len)
git_buf_clear(buf); git_buf_clear(buf);
if (!git__is_ssizet(len)) {
giterr_set(GITERR_INVALID, "Read too large.");
return -1;
}
GITERR_CHECK_ALLOC_ADD(len, 1); GITERR_CHECK_ALLOC_ADD(len, 1);
if (git_buf_grow(buf, len + 1) < 0) if (git_buf_grow(buf, len + 1) < 0)
return -1; return -1;

12
src/posix.c
View File

@ -155,6 +155,14 @@ ssize_t p_read(git_file fd, void *buf, size_t cnt)
{ {
char *b = buf; char *b = buf;
if (!git__is_ssizet(cnt)) {
#ifdef GIT_WIN32
SetLastError(ERROR_INVALID_PARAMETER);
#endif
errno = EINVAL;
return -1;
}
while (cnt) { while (cnt) {
ssize_t r; ssize_t r;
#ifdef GIT_WIN32 #ifdef GIT_WIN32
@ -229,7 +237,9 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs
out->data = malloc(len); out->data = malloc(len);
GITERR_CHECK_ALLOC(out->data); GITERR_CHECK_ALLOC(out->data);
if ((p_lseek(fd, offset, SEEK_SET) < 0) || ((size_t)p_read(fd, out->data, len) != len)) { if (!git__is_ssizet(len) ||
(p_lseek(fd, offset, SEEK_SET) < 0) ||
(p_read(fd, out->data, len) != (ssize_t)len)) {
giterr_set(GITERR_OS, "mmap emulation failed"); giterr_set(GITERR_OS, "mmap emulation failed");
return -1; return -1;
} }

7
src/util.h
View File

@ -153,6 +153,13 @@ GIT_INLINE(int) git__is_sizet(git_off_t p)
return p == (git_off_t)r; return p == (git_off_t)r;
} }
/** @return true if p fits into the range of an ssize_t */
GIT_INLINE(int) git__is_ssizet(size_t p)
{
ssize_t r = (ssize_t)p;
return p == (size_t)r;
}
/** @return true if p fits into the range of a uint32_t */ /** @return true if p fits into the range of a uint32_t */
GIT_INLINE(int) git__is_uint32(size_t p) GIT_INLINE(int) git__is_uint32(size_t p)
{ {