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

Merge pull request #3603 from pks-t/pks/coverity-fixes

Browse Source 
Coverity fixes
This commit is contained in:
Carlos Martín Nieto 2016-02-09 16:10:43 +01:00
commit 534cc5a3cb
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/attr_file.c
View File

@ -123,7 +123,7 @@ int git_attr_file__load(
break; break;
} }
case GIT_ATTR_FILE__FROM_FILE: { case GIT_ATTR_FILE__FROM_FILE: {
int fd; int fd = -1;
/* For open or read errors, pretend that we got ENOTFOUND. */ /* For open or read errors, pretend that we got ENOTFOUND. */
/* TODO: issue warning when warning API is available */ /* TODO: issue warning when warning API is available */
@ -133,7 +133,8 @@ int git_attr_file__load(
(fd = git_futils_open_ro(entry->fullpath)) < 0 || (fd = git_futils_open_ro(entry->fullpath)) < 0 ||
(error = git_futils_readbuffer_fd(&content, fd, (size_t)st.st_size)) < 0) (error = git_futils_readbuffer_fd(&content, fd, (size_t)st.st_size)) < 0)
nonexistent = true; nonexistent = true;
else
if (fd >= 0)
p_close(fd); p_close(fd);
break; break;

4
src/checkout.c
View File

@ -1487,8 +1487,10 @@ static int blob_content_to_file(
if (!data->opts.disable_filters && if (!data->opts.disable_filters &&
(error = git_filter_list__load_ext( (error = git_filter_list__load_ext(
&fl, data->repo, blob, hint_path, &fl, data->repo, blob, hint_path,
GIT_FILTER_TO_WORKTREE, &filter_opts))) GIT_FILTER_TO_WORKTREE, &filter_opts))) {
p_close(fd);
return error; return error;
}
/* setup the writer */ /* setup the writer */
memset(&writer, 0, sizeof(struct checkout_stream)); memset(&writer, 0, sizeof(struct checkout_stream));

12
src/pack-objects.c
View File

@ -91,7 +91,7 @@ static unsigned name_hash(const char *name)
static int packbuilder_config(git_packbuilder *pb) static int packbuilder_config(git_packbuilder *pb)
{ {
git_config *config; git_config *config;
int ret; int ret = 0;
int64_t val; int64_t val;
if ((ret = git_repository_config_snapshot(&config, pb->repo)) < 0) if ((ret = git_repository_config_snapshot(&config, pb->repo)) < 0)
@ -100,8 +100,10 @@ static int packbuilder_config(git_packbuilder *pb)
#define config_get(KEY,DST,DFLT) do { \ #define config_get(KEY,DST,DFLT) do { \
ret = git_config_get_int64(&val, config, KEY); \ ret = git_config_get_int64(&val, config, KEY); \
if (!ret) (DST) = val; \ if (!ret) (DST) = val; \
else if (ret == GIT_ENOTFOUND) (DST) = (DFLT); \ else if (ret == GIT_ENOTFOUND) { \
else if (ret < 0) return -1; } while (0) (DST) = (DFLT); \
ret = 0; \
} else if (ret < 0) goto out; } while (0)
config_get("pack.deltaCacheSize", pb->max_delta_cache_size, config_get("pack.deltaCacheSize", pb->max_delta_cache_size,
GIT_PACK_DELTA_CACHE_SIZE); GIT_PACK_DELTA_CACHE_SIZE);
@ -113,9 +115,10 @@ static int packbuilder_config(git_packbuilder *pb)
#undef config_get #undef config_get
out:
git_config_free(config); git_config_free(config);
return 0; return ret;
} }
int git_packbuilder_new(git_packbuilder **out, git_repository *repo) int git_packbuilder_new(git_packbuilder **out, git_repository *repo)
@ -605,6 +608,7 @@ static git_pobject **compute_write_order(git_packbuilder *pb)
} }
if (wo_end != pb->nr_objects) { if (wo_end != pb->nr_objects) {
git__free(wo);
giterr_set(GITERR_INVALID, "invalid write order"); giterr_set(GITERR_INVALID, "invalid write order");
return NULL; return NULL;
} }

1
src/pack.c
View File

@ -790,7 +790,6 @@ int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p,
obj->zstream.next_out = Z_NULL; obj->zstream.next_out = Z_NULL;
st = inflateInit(&obj->zstream); st = inflateInit(&obj->zstream);
if (st != Z_OK) { if (st != Z_OK) {
git__free(obj);
giterr_set(GITERR_ZLIB, "failed to init packfile stream"); giterr_set(GITERR_ZLIB, "failed to init packfile stream");
return -1; return -1;
} }