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

Merge pull request #3201 from libgit2/cmn/coverity

Browse Source 
A few more fixes from coverity
This commit is contained in:
Edward Thomson 2015-06-10 09:02:54 -04:00
commit da6720fcc5
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/filter.c
View File

@ -887,7 +887,7 @@ int git_filter_list_stream_file(
git_vector filter_streams = GIT_VECTOR_INIT; git_vector filter_streams = GIT_VECTOR_INIT;
git_writestream *stream_start; git_writestream *stream_start;
ssize_t readlen; ssize_t readlen;
int fd, error; int fd = -1, error;
if ((error = stream_list_init( if ((error = stream_list_init(
&stream_start, &filter_streams, filters, target)) < 0 || &stream_start, &filter_streams, filters, target)) < 0 ||
@ -909,9 +909,10 @@ int git_filter_list_stream_file(
else if (readlen < 0) else if (readlen < 0)
error = readlen; error = readlen;
p_close(fd);
done: done:
if (fd >= 0)
p_close(fd);
stream_list_free(&filter_streams); stream_list_free(&filter_streams);
git_buf_free(&abspath); git_buf_free(&abspath);
return error; return error;

4
src/merge.c
View File

@ -1143,9 +1143,9 @@ static void merge_diff_list_count_candidates(
if (GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry) && if (GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry) &&
(!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->our_entry) || (!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->our_entry) ||
!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->their_entry))) !GIT_MERGE_INDEX_ENTRY_EXISTS(entry->their_entry)))
src_count++; (*src_count)++;
else if (!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry)) else if (!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry))
tgt_count++; (*tgt_count)++;
} }
} }

10
src/object.c
View File

@ -129,10 +129,10 @@ int git_object_lookup_prefix(
if (error < 0) if (error < 0)
return error; return error;
if (len > GIT_OID_HEXSZ) if (len > GIT_OID_RAWSZ)
len = GIT_OID_HEXSZ; len = GIT_OID_RAWSZ;
if (len == GIT_OID_HEXSZ) { if (len == GIT_OID_RAWSZ) {
git_cached_obj *cached = NULL; git_cached_obj *cached = NULL;
/* We want to match the full id : we can first look up in the cache, /* We want to match the full id : we can first look up in the cache,
@ -172,9 +172,9 @@ int git_object_lookup_prefix(
memcpy(short_oid.id, id->id, (len + 1) / 2); memcpy(short_oid.id, id->id, (len + 1) / 2);
if (len % 2) if (len % 2)
short_oid.id[len / 2] &= 0xF0; short_oid.id[len / 2] &= 0xF0;
memset(short_oid.id + (len + 1) / 2, 0, (GIT_OID_HEXSZ - len) / 2); memset(short_oid.id + (len + 1) / 2, 0, (GIT_OID_RAWSZ - len) / 2);
/* If len < GIT_OID_HEXSZ (a strict short oid was given), we have /* If len < GIT_OID_RAWSZ (a strict short oid was given), we have
* 2 options : * 2 options :
* - We always search in the cache first. If we find that short oid is * - We always search in the cache first. If we find that short oid is
* ambiguous, we can stop. But in all the other cases, we must then * ambiguous, we can stop. But in all the other cases, we must then

21
src/pack.c
View File

@ -319,9 +319,9 @@ static int pack_index_check(const char *path, struct git_pack_file *p)
static int pack_index_open(struct git_pack_file *p) static int pack_index_open(struct git_pack_file *p)
{ {
char *idx_name;
int error = 0; int error = 0;
size_t name_len, base_len; size_t name_len;
git_buf idx_name = GIT_BUF_INIT;
if (p->index_version > -1) if (p->index_version > -1)
return 0; return 0;
@ -329,22 +329,23 @@ static int pack_index_open(struct git_pack_file *p)
name_len = strlen(p->pack_name); name_len = strlen(p->pack_name);
assert(name_len > strlen(".pack")); /* checked by git_pack_file alloc */ assert(name_len > strlen(".pack")); /* checked by git_pack_file alloc */
if ((idx_name = git__malloc(name_len)) == NULL) git_buf_grow(&idx_name, name_len);
git_buf_put(&idx_name, p->pack_name, name_len - strlen(".pack"));
git_buf_puts(&idx_name, ".idx");
if (git_buf_oom(&idx_name)) {
giterr_set_oom();
return -1; return -1;
}
base_len = name_len - strlen(".pack");
memcpy(idx_name, p->pack_name, base_len);
memcpy(idx_name + base_len, ".idx", sizeof(".idx"));
if ((error = git_mutex_lock(&p->lock)) < 0) { if ((error = git_mutex_lock(&p->lock)) < 0) {
git__free(idx_name); git_buf_free(&idx_name);
return error; return error;
} }
if (p->index_version == -1) if (p->index_version == -1)
error = pack_index_check(idx_name, p); error = pack_index_check(idx_name.ptr, p);
git__free(idx_name); git_buf_free(&idx_name);
git_mutex_unlock(&p->lock); git_mutex_unlock(&p->lock);