[PATCH 07/10] fast-import.c: convert trivial snprintf calls to xsnprintf
- From
Elia Pinto <gitter.spiros@gmail.com>
- Date
- Jun 3, 2016, 07:47 UTC
- Message-ID
- <20160603074724.12173-7-gitter.spiros@gmail.com>
- In-Reply-To
- <20160603074724.12173-1-gitter.spiros@gmail.com>
With the commits f2f02675 and 5096d490 we have been converted in some files the call from snprintf/sprintf/strcpy to xsnprintf. This patch converts the remaining calls to snprintf with xsnprintf under the following conditions:
- The call to snprintf does not control the outcome of the command or the presence of truncation errors. - A call to snprintf can generate a fatal error, directly or indirectly.
The other few remaining cases in which a call to snprintf can generate a soft error have not been changed.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> --- fast-import.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/fast-import.c b/fast-import.c index 59630ce..5beb63d 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1240,10 +1240,7 @@ static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark) sha1file_checkpoint(pack_file, &checkpoint); offset = checkpoint.offset; - hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1; - if (out_sz <= hdrlen) - die("impossibly large object header"); - + hdrlen = xsnprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1; git_SHA1_Init(&c); git_SHA1_Update(&c, out_buf, hdrlen);
-- 2.9.0.rc1.265.geb5d750