diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-12-14 13:53:26 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-12-14 13:53:26 -0600 |
| commit | 30c8e26074925fde4e2a0a6f5bb6a5a0398c277f (patch) | |
| tree | 521e9ad790803c5d91bc0a75e086d687aa513d67 /include/git2 | |
| parent | 6aa06b65cfcce164d7ad3ef184f40acb68406078 (diff) | |
| parent | 944dbd1259f930c8af543be172072a94afe9254a (diff) | |
| download | libgit2-30c8e26074925fde4e2a0a6f5bb6a5a0398c277f.tar.gz | |
Merge pull request #3521 from pks-t/blame-line-overflow
Line count overflow in git_blame_hunk and git_blame__entry
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/blame.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/git2/blame.h b/include/git2/blame.h index 173e9994b..84bb7f94c 100644 --- a/include/git2/blame.h +++ b/include/git2/blame.h @@ -74,8 +74,8 @@ typedef struct git_blame_options { uint16_t min_match_characters; git_oid newest_commit; git_oid oldest_commit; - uint32_t min_line; - uint32_t max_line; + size_t min_line; + size_t max_line; } git_blame_options; #define GIT_BLAME_OPTIONS_VERSION 1 @@ -113,15 +113,15 @@ GIT_EXTERN(int) git_blame_init_options( * root, or the commit specified in git_blame_options.oldest_commit) */ typedef struct git_blame_hunk { - uint16_t lines_in_hunk; + size_t lines_in_hunk; git_oid final_commit_id; - uint16_t final_start_line_number; + size_t final_start_line_number; git_signature *final_signature; git_oid orig_commit_id; const char *orig_path; - uint16_t orig_start_line_number; + size_t orig_start_line_number; git_signature *orig_signature; char boundary; @@ -156,7 +156,7 @@ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byindex( */ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byline( git_blame *blame, - uint32_t lineno); + size_t lineno); /** * Get the blame for a single file. |