diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-03-27 23:46:28 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-28 00:32:37 +0200 |
commit | a48a1071a686b250bf8b7982ca0ce8dda1d93c61 (patch) | |
tree | 38f17af2b10d7ba3697bd85c9cb405c24f77be33 /gnu/packages/patches | |
parent | bc4a2b853c92b29d8590db711dbd8bd1bc22db3d (diff) | |
download | guix-a48a1071a686b250bf8b7982ca0ce8dda1d93c61.tar guix-a48a1071a686b250bf8b7982ca0ce8dda1d93c61.tar.gz |
gnu: libgit2: Patch use-after-free.
* gnu/packages/patches/libgit2-use-after-free.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/version-control.scm (libgit2)[inputs]: Add it.
[arguments] <#:phases>: Add 'apply-patch' phase.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/libgit2-use-after-free.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/libgit2-use-after-free.patch b/gnu/packages/patches/libgit2-use-after-free.patch new file mode 100644 index 0000000000..580af8781a --- /dev/null +++ b/gnu/packages/patches/libgit2-use-after-free.patch @@ -0,0 +1,24 @@ +This patch is taken from <https://github.com/libgit2/libgit2/pull/4122>; +we need it to fix the use-after-free error in 'git_commit_extract_signature' +reported at <https://github.com/libgit2/libgit2/issues/4118>. + +From ade0d9c658fdfc68d8046935f6908f033fe7a529 Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt <ps@pks.im> +Date: Mon, 13 Feb 2017 13:46:17 +0100 +Subject: [PATCH 3/3] commit: avoid possible use-after-free + +diff --git a/src/commit.c b/src/commit.c +index 89a4db1..05b70a9 100644 +--- a/src/commit.c ++++ b/src/commit.c +@@ -766,8 +766,9 @@ int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_r + if (git_buf_oom(signature)) + goto oom; + ++ error = git_buf_puts(signed_data, eol+1); + git_odb_object_free(obj); +- return git_buf_puts(signed_data, eol+1); ++ return error; + } + + giterr_set(GITERR_OBJECT, "this commit is not signed"); |