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

Merge pull request #270 from carlosmn/valgrind

Browse Source 
Two memory access fixes
This commit is contained in:
Vicent Martí 2011-06-21 07:24:57 -07:00
commit b3f2d4cb36
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/blob.c
View File

@ -88,15 +88,19 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
git_odb_stream *stream; git_odb_stream *stream;
struct stat st; struct stat st;
gitfo_lstat(path, &st);
islnk = S_ISLNK(st.st_mode);
if (repo->path_workdir == NULL) if (repo->path_workdir == NULL)
return git__throw(GIT_ENOTFOUND, "Failed to create blob. (No working directory found)"); return git__throw(GIT_ENOTFOUND, "Failed to create blob. (No working directory found)");
git__joinpath(full_path, repo->path_workdir, path); git__joinpath(full_path, repo->path_workdir, path);
error = gitfo_lstat(full_path, &st);
if (error < 0) {
return git__throw(GIT_EOSERR, "Failed to stat blob. %s", strerror(errno));
}
islnk = S_ISLNK(st.st_mode);
if (!islnk) { if (!islnk) {
if ((fd = gitfo_open(full_path, O_RDONLY)) < 0) if ((fd = gitfo_open(full_path, O_RDONLY)) < 0)
return git__throw(GIT_ENOTFOUND, "Failed to create blob. Could not open '%s'", full_path); return git__throw(GIT_ENOTFOUND, "Failed to create blob. Could not open '%s'", full_path);

3
src/odb_pack.c
View File

@ -1246,7 +1246,8 @@ static int packfile_unpack_compressed(
z_stream stream; z_stream stream;
unsigned char *buffer, *in; unsigned char *buffer, *in;
buffer = git__malloc(size); buffer = git__malloc(size + 1);
memset(buffer, 0x0, size + 1);
memset(&stream, 0, sizeof(stream)); memset(&stream, 0, sizeof(stream));
stream.next_out = buffer; stream.next_out = buffer;