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

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

Browse Source 
Coverity fixes
This commit is contained in:
Carlos Martín Nieto 2016-02-09 06:41:02 +01:00
commit e0bbe78134
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/curl_stream.c
View File

@ -79,6 +79,7 @@ static int curls_certificate(git_cert **out, git_stream *stream)
for (slist = certinfo->certinfo[0]; slist; slist = slist->next) {
char *str = git__strdup(slist->data);
GITERR_CHECK_ALLOC(str);
git_vector_insert(&strings, str);
}
/* Copy the contents of the vector into a strarray so we can expose them */

5
src/merge.c
View File

@ -1985,9 +1985,6 @@ static int create_virtual_base(
git_index *index = NULL;
git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT;
result = git__calloc(1, sizeof(git_annotated_commit));
GITERR_CHECK_ALLOC(result);
/* Conflicts in the merge base creation do not propagate to conflicts
* in the result; the conflicted base will act as the common ancestor.
*/
@ -2001,6 +1998,8 @@ static int create_virtual_base(
recursion_level + 1, &virtual_opts)) < 0)
return -1;
result = git__calloc(1, sizeof(git_annotated_commit));
GITERR_CHECK_ALLOC(result);
result->type = GIT_ANNOTATED_COMMIT_VIRTUAL;
result->index = index;