proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-04 15:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

commit: clear user-provided buffers

Browse Source 
The functions `git_commit_header_field` and
`git_commit_extract_signature` both receive buffers used to hand back
the results to the user. While these functions called `git_buf_sanitize`
on these buffers, this is not the right thing to do, as it will simply
initialize or zero-terminate passed buffers. As we want to overwrite
contents, we instead have to call `git_buf_clear` to completely reset
them.
This commit is contained in:
Patrick Steinhardt 2017-02-13 13:42:16 +01:00
parent cdb2c2a0bf
commit dc851d9eae
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/git2/commit.h
View File

@ -255,7 +255,8 @@ GIT_EXTERN(int) git_commit_nth_gen_ancestor(
/** /**
* Get an arbitrary header field * Get an arbitrary header field
* *
* @param out the buffer to fill * @param out the buffer to fill; existing content will be
* overwritten
* @param commit the commit to look in * @param commit the commit to look in
* @param field the header field to return * @param field the header field to return
* @return 0 on succeess, GIT_ENOTFOUND if the field does not exist, * @return 0 on succeess, GIT_ENOTFOUND if the field does not exist,
@ -270,8 +271,10 @@ GIT_EXTERN(int) git_commit_header_field(git_buf *out, const git_commit *commit,
* `GITERR_INVALID`. If the commit does not have a signature, the * `GITERR_INVALID`. If the commit does not have a signature, the
* error class will be `GITERR_OBJECT`. * error class will be `GITERR_OBJECT`.
* *
* @param signature the signature block * @param signature the signature block; existing content will be
* @param signed_data signed data; this is the commit contents minus the signature block * overwritten
* @param signed_data signed data; this is the commit contents minus the signature block;
* existing content will be overwritten
* @param repo the repository in which the commit exists * @param repo the repository in which the commit exists
* @param commit_id the commit from which to extract the data * @param commit_id the commit from which to extract the data
* @param field the name of the header field containing the signature * @param field the name of the header field containing the signature

6
src/commit.c
View File

@ -642,7 +642,7 @@ int git_commit_header_field(git_buf *out, const git_commit *commit, const char *
{ {
const char *eol, *buf = commit->raw_header; const char *eol, *buf = commit->raw_header;
git_buf_sanitize(out); git_buf_clear(out);
while ((eol = strchr(buf, '\n'))) { while ((eol = strchr(buf, '\n'))) {
/* We can skip continuations here */ /* We can skip continuations here */
@ -706,8 +706,8 @@ int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_r
const char *h, *eol; const char *h, *eol;
int error; int error;
git_buf_sanitize(signature); git_buf_clear(signature);
git_buf_sanitize(signed_data); git_buf_clear(signed_data);
if (!field) if (!field)
field = "gpgsig"; field = "gpgsig";