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

odb__hashlink: check st.st_size before casting

Browse Source
This commit is contained in:
Edward Thomson 2015-02-10 22:34:03 -05:00 committed by Edward Thomson
parent 392702ee2c
commit 15d54fdd34
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/odb.c
View File

@ -216,28 +216,28 @@ int git_odb__hashfd_filtered(
int git_odb__hashlink(git_oid *out, const char *path) int git_odb__hashlink(git_oid *out, const char *path)
{ {
struct stat st; struct stat st;
git_off_t size; size_t size;
int result; int result;
if (git_path_lstat(path, &st) < 0) if (git_path_lstat(path, &st) < 0)
return -1; return -1;
size = st.st_size; if (!git__is_sizet(st.st_size)) {
giterr_set(GITERR_FILESYSTEM, "File size overflow for 32-bit systems");
if (!git__is_sizet(size)) {
giterr_set(GITERR_OS, "File size overflow for 32-bit systems");
return -1; return -1;
} }
size = (size_t)st.st_size;
if (S_ISLNK(st.st_mode)) { if (S_ISLNK(st.st_mode)) {
char *link_data; char *link_data;
ssize_t read_len; ssize_t read_len;
GITERR_CHECK_ALLOC_ADD(size, 1); GITERR_CHECK_ALLOC_ADD(size, 1);
link_data = git__malloc((size_t)(size + 1)); link_data = git__malloc(size + 1);
GITERR_CHECK_ALLOC(link_data); GITERR_CHECK_ALLOC(link_data);
read_len = p_readlink(path, link_data, (size_t)size); read_len = p_readlink(path, link_data, size);
link_data[size] = '\0'; link_data[size] = '\0';
if (read_len != (ssize_t)size) { if (read_len != (ssize_t)size) {
giterr_set(GITERR_OS, "Failed to read symlink data for '%s'", path); giterr_set(GITERR_OS, "Failed to read symlink data for '%s'", path);
@ -245,13 +245,13 @@ int git_odb__hashlink(git_oid *out, const char *path)
return -1; return -1;
} }
result = git_odb_hash(out, link_data, (size_t)size, GIT_OBJ_BLOB); result = git_odb_hash(out, link_data, size, GIT_OBJ_BLOB);
git__free(link_data); git__free(link_data);
} else { } else {
int fd = git_futils_open_ro(path); int fd = git_futils_open_ro(path);
if (fd < 0) if (fd < 0)
return -1; return -1;
result = git_odb__hashfd(out, fd, (size_t)size, GIT_OBJ_BLOB); result = git_odb__hashfd(out, fd, size, GIT_OBJ_BLOB);
p_close(fd); p_close(fd);
} }