proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 14:39:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check errors while generating diff patch string

Browse Source
This commit is contained in:
Russell Belfer 2012-10-25 11:12:56 -07:00
parent 93cf7bb8e2
commit 3943dc78a5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/diff_output.c
View File

@ -1514,8 +1514,7 @@ static int print_to_buffer_cb(
GIT_UNUSED(delta); GIT_UNUSED(delta);
GIT_UNUSED(range); GIT_UNUSED(range);
GIT_UNUSED(line_origin); GIT_UNUSED(line_origin);
git_buf_put(output, content, content_len); return git_buf_put(output, content, content_len);
return 0;
} }
int git_diff_patch_to_str( int git_diff_patch_to_str(
@ -1527,6 +1526,8 @@ int git_diff_patch_to_str(
diff_print_info pi; diff_print_info pi;
size_t h, l; size_t h, l;
assert(string && patch);
pi.diff = patch->diff; pi.diff = patch->diff;
pi.print_cb = print_to_buffer_cb; pi.print_cb = print_to_buffer_cb;
pi.cb_data = &output; pi.cb_data = &output;
@ -1534,13 +1535,13 @@ int git_diff_patch_to_str(
error = print_patch_file(&pi, patch->delta, 0); error = print_patch_file(&pi, patch->delta, 0);
for (h = 0; h < patch->hunks_size; ++h) { for (h = 0; h < patch->hunks_size && !error; ++h) {
diff_patch_hunk *hunk = &patch->hunks[h]; diff_patch_hunk *hunk = &patch->hunks[h];
error = print_patch_hunk(&pi, patch->delta, error = print_patch_hunk(&pi, patch->delta,
&hunk->range, hunk->header, hunk->header_len); &hunk->range, hunk->header, hunk->header_len);
for (l = 0; l < hunk->line_count; ++l) { for (l = 0; l < hunk->line_count && !error; ++l) {
diff_patch_line *line = &patch->lines[hunk->line_start + l]; diff_patch_line *line = &patch->lines[hunk->line_start + l];
error = print_patch_line( error = print_patch_line(
@ -1549,6 +1550,12 @@ int git_diff_patch_to_str(
} }
} }
/* GIT_EUSER means git_buf_put in print_to_buffer_cb returned -1,
* meaning a memory allocation failure, so just map to -1...
*/
if (error == GIT_EUSER)
error = -1;
git_buf_free(&temp); git_buf_free(&temp);
*string = git_buf_detach(&output); *string = git_buf_detach(&output);