Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

notes: check error code returned by git_iterator_advance

Browse Source 
When calling `git_note_next`, we end up calling `git_iterator_advance`
but ignore its error code. The intent is that we do not want to return
an error if it returns `GIT_ITEROVER`, as we want to return that value
on the next invocation of `git_note_next`. We should still check for any
other error codes returned by `git_iterator_advance` to catch unexpected
internal errors.

Fix this by checking the function's return value, ignoring
`GIT_ITEROVER`.
This commit is contained in:
Patrick Steinhardt
2020-02-07 11:55:23 +01:00
parent 2e6cbff86e
commit 31a577d066
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/notes.c
View File

@@ -808,8 +808,11 @@ int git_note_next(
git_oid_cpy(note_id, &item->id);
if (!(error = process_entry_path(item->path, annotated_id)))
git_iterator_advance(NULL, it);
if ((error = process_entry_path(item->path, annotated_id)) < 0)
return error;
return error;
if ((error = git_iterator_advance(NULL, it)) < 0 && error != GIT_ITEROVER)
return error;
return 0;
}