Fix leaks, some warnings and an error by ethomson · Pull Request #3865 · libgit2/libgit2 · GitHub
Skip to content

Fix leaks, some warnings and an error #3865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethomson merged 9 commits into from
Aug 2, 2016
Merged

Fix leaks, some warnings and an error #3865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e02f567
repo::open: remove dead code, free buffers
Jul 15, 2016
531be3e
apply: compare preimage to image
Jul 15, 2016
c065f6a
apply: check allocation properly
Jul 15, 2016
581a4d3
apply: safety check files that dont end with eol
Jul 15, 2016
60e15ec
packbuilder: `size_t` all the things
Jul 15, 2016
498d080
tests: use a `size_t`
Jul 22, 2016
4aaae93
index: cast to avoid warning
Jul 22, 2016
b118f64
repository: don't cast to `int` for no reason
Jul 22, 2016
df87648
crlf: set a safe crlf default
Jul 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
8 changes: 4 additions & 4 deletions include/git2/pack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,21 +196,21 @@ GIT_EXTERN(int) git_packbuilder_foreach(git_packbuilder *pb, git_packbuilder_for
* @param pb the packbuilder
* @return the number of objects in the packfile
*/
GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb);
GIT_EXTERN(size_t) git_packbuilder_object_count(git_packbuilder *pb);

/**
* Get the number of objects the packbuilder has already written out
*
* @param pb the packbuilder
* @return the number of objects which have already been written
*/
GIT_EXTERN(uint32_t) git_packbuilder_written(git_packbuilder *pb);
GIT_EXTERN(size_t) git_packbuilder_written(git_packbuilder *pb);

/** Packbuilder progress notification function */
typedef int (*git_packbuilder_progress)(
int stage,
unsigned int current,
unsigned int total,
uint32_t current,
uint32_t total,
void *payload);

/**
Expand Down
7 changes: 5 additions & 2 deletions src/apply.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ static int patch_image_init_fromstr(
for (start = in; start < in + in_len; start = end) {
end = memchr(start, '\n', in_len);

if (end < in + in_len)
if (end == NULL)
end = in + in_len;

else if (end < in + in_len)
end++;

line = git_pool_mallocz(&out->pool, 1);
Expand Down Expand Up @@ -97,7 +100,7 @@ static bool match_hunk(
git_diff_line *preimage_line = git_vector_get(&preimage->lines, i);
git_diff_line *image_line = git_vector_get(&image->lines, linenum + i);

if (preimage_line->content_len != preimage_line->content_len ||
if (preimage_line->content_len != image_line->content_len ||
memcmp(preimage_line->content, image_line->content, image_line->content_len) != 0) {
match = 0;
break;
Expand Down
1 change: 1 addition & 0 deletions src/crlf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ static int crlf_check(
ca.eol = check_eol(attr_values[1]); /* eol */
}
ca.auto_crlf = GIT_AUTO_CRLF_DEFAULT;
ca.safe_crlf = GIT_SAFE_CRLF_DEFAULT;

/*
* Use the core Git logic to see if we should perform CRLF for this file
Expand Down
4 changes: 2 additions & 2 deletions src/index.c
View file
Open in desktop
Loading