summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-03-24 13:25:22 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-24 12:34:07 -0700
commit614b19542f649945774a084f2bcf56191f46947c (patch)
treebd0d963f1126a22baacda94c821958c5eba16a1a
parentmailmap: use Michael J Gruber's new address (diff)
downloadtgif-614b19542f649945774a084f2bcf56191f46947c.tar.xz
fast-import: use xsnprintf for writing sha1s
When we have to write a sha1 with a newline, we do so by copying both into a single buffer, so that we can issue a single write() call. We use snprintf but don't bother to check the output, since we know it will fit. However, we should use xsnprintf() in such a case so that we're notified if our assumption turns out to be wrong (and to make it easier to audit for unchecked snprintf calls). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 64fe602f0b..9ae2053a8f 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -3003,7 +3003,7 @@ static void parse_get_mark(const char *p)
if (!oe)
die("Unknown mark: %s", command_buf.buf);
- snprintf(output, sizeof(output), "%s\n", sha1_to_hex(oe->idx.sha1));
+ xsnprintf(output, sizeof(output), "%s\n", sha1_to_hex(oe->idx.sha1));
cat_blob_write(output, 41);
}