diff options
| author |   xsa <xsa@openbsd.org> | 2005-04-15 14:34:15 +0000 |
|---|---|---|
| committer | xsa <xsa@openbsd.org> | 2005-04-15 14:34:15 +0000 |
| commit | fe0dabd9a4164e3b14a624bead23a4b2f17d22ff (patch) | |
| tree | 5d546d1caf2893cab0a66cee029b3cb8db443c18 /usr.bin/cvs/commit.c | |
| parent | Remove standard defines from cpp processing, to prevent accidental (diff) | |
| download | wireguard-openbsd-fe0dabd9a4164e3b14a624bead23a4b2f17d22ff.tar.xz wireguard-openbsd-fe0dabd9a4164e3b14a624bead23a4b2f17d22ff.zip | |
snprintf() return values checks; joris ok
Diffstat (limited to 'usr.bin/cvs/commit.c')
| -rw-r--r-- | usr.bin/cvs/commit.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index ea7c55a74e0..1cfad2fbfb9 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.23 2005/04/12 14:58:40 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.24 2005/04/15 14:34:15 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -162,7 +162,7 @@ cvs_commit_prepare(CVSFILE *cf, void *arg) int cvs_commit_file(CVSFILE *cf, void *arg) { - int ret; + int ret, l; char *repo, rcspath[MAXPATHLEN], fpath[MAXPATHLEN]; RCSFILE *rf; struct cvsroot *root; @@ -212,8 +212,13 @@ cvs_commit_file(CVSFILE *cf, void *arg) } } - snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s", + l = snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s", root->cr_dir, repo, fpath, RCS_FILE_EXT); + if (l == -1 || l >= (int)sizeof(rcspath)) { + errno = ENAMETOOLONG; + cvs_log(LP_ERRNO, "%s", rcspath); + return (-1); + } cvs_ent_free(entp); |