diff options
| author | Jeff King <peff@peff.net> | 2015-09-24 17:06:08 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-25 10:18:18 -0700 |
| commit | 5096d4909f9b13c7a650d9dbb7c9702ea7413566 (patch) | |
| tree | 07229a8952f2d6782f3064d9dfd1e7855e8e5269 /builtin/init-db.c | |
| parent | db85a8a9c2fb492d3cd528dbbcc52075c607cf79 (diff) | |
| download | git-5096d4909f9b13c7a650d9dbb7c9702ea7413566.tar.gz git-5096d4909f9b13c7a650d9dbb7c9702ea7413566.tar.xz | |
convert trivial sprintf / strcpy calls to xsnprintf
We sometimes sprintf into fixed-size buffers when we know
that the buffer is large enough to fit the input (either
because it's a constant, or because it's numeric input that
is bounded in size). Likewise with strcpy of constant
strings.
However, these sites make it hard to audit sprintf and
strcpy calls for buffer overflows, as a reader has to
cross-reference the size of the array with the input. Let's
use xsnprintf instead, which communicates to a reader that
we don't expect this to overflow (and catches the mistake in
case we do).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/init-db.c')
| -rw-r--r-- | builtin/init-db.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index 69323e186..e7d0e31f4 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -262,7 +262,8 @@ static int create_default_files(const char *template_path) } /* This forces creation of new config file */ - sprintf(repo_version_string, "%d", GIT_REPO_VERSION); + xsnprintf(repo_version_string, sizeof(repo_version_string), + "%d", GIT_REPO_VERSION); git_config_set("core.repositoryformatversion", repo_version_string); path[len] = 0; @@ -414,13 +415,13 @@ int init_db(const char *template_dir, unsigned int flags) */ if (shared_repository < 0) /* force to the mode value */ - sprintf(buf, "0%o", -shared_repository); + xsnprintf(buf, sizeof(buf), "0%o", -shared_repository); else if (shared_repository == PERM_GROUP) - sprintf(buf, "%d", OLD_PERM_GROUP); + xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_GROUP); else if (shared_repository == PERM_EVERYBODY) - sprintf(buf, "%d", OLD_PERM_EVERYBODY); + xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY); else - die("oops"); + die("BUG: invalid value for shared_repository"); git_config_set("core.sharedrepository", buf); git_config_set("receive.denyNonFastforwards", "true"); } |