summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2018-07-31 07:33:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-31 18:31:08 (GMT)
commitca3e1826a063ff7576a5e134f3b20b68196a1a5d (patch)
tree684b9c09f1ae0d751668e2ecf916ef4747b211d9 /sequencer.c
parent53f9a3e157dbbc901a02ac2c73346d375e24978c (diff)
downloadgit-ca3e1826a063ff7576a5e134f3b20b68196a1a5d.zip
git-ca3e1826a063ff7576a5e134f3b20b68196a1a5d.tar.gz
git-ca3e1826a063ff7576a5e134f3b20b68196a1a5d.tar.bz2
sequencer: fix "rebase -i --root" corrupting author header
When "git rebase -i --root" creates a new root commit (say, by swapping in a different commit for the root), it corrupts the commit's "author" header with trailing garbage: author A U Thor <author@example.com> @1112912773 -07000or@example.com This is a result of read_author_ident() neglecting to NUL-terminate the buffer into which it composes the "author" header. (Note that the "@" preceding the timestamp and the extra "0" in the timezone are separate bugs which will be fixed subsequently.) Security considerations: Construction of the "author" header by read_author_ident() happens in-place and in parallel with parsing the content of "rebase-merge/author-script" which occupies the same buffer. This is possible because the constructed "author" header is always smaller than the content of "rebase-merge/author-script". Despite neglecting to NUL-terminate the constructed "author" header, memory is never accessed (either by read_author_ident() or its caller) beyond the allocated buffer since a NUL-terminator is present at the end of the loaded "rebase-merge/author-script" content, and additional NUL's are inserted as part of the parsing process. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 4034c04..df11136 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -741,7 +741,7 @@ static const char *read_author_ident(struct strbuf *buf)
return NULL;
}
- buf->len = out - buf->buf;
+ strbuf_setlen(buf, out - buf->buf);
return buf->buf;
}