diff options
author | beck <> | 2005-04-20 23:38:15 +0000 |
---|---|---|
committer | beck <> | 2005-04-20 23:38:15 +0000 |
commit | 06a0bc5cf18da4b710030f2c46a861ae6ad79f30 (patch) | |
tree | c2b5e47bf30506d5f8e98a8dcd3c74977663a7e0 /src | |
parent | 4edfffb1e41eb29be9defe36cc7f6164969151a4 (diff) | |
download | openbsd-06a0bc5cf18da4b710030f2c46a861ae6ad79f30.tar.gz openbsd-06a0bc5cf18da4b710030f2c46a861ae6ad79f30.tar.bz2 openbsd-06a0bc5cf18da4b710030f2c46a861ae6ad79f30.zip |
correct strlcpy abuse
ok millert@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/string/strerror_r.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/libc/string/strerror_r.c b/src/lib/libc/string/strerror_r.c index db264bcf50..c0ca434cbd 100644 --- a/src/lib/libc/string/strerror_r.c +++ b/src/lib/libc/string/strerror_r.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* $OpenBSD: strerror_r.c,v 1.2 2004/05/03 05:07:34 espie Exp $ */ | 1 | /* $OpenBSD: strerror_r.c,v 1.3 2005/04/20 23:38:15 beck Exp $ */ |
2 | /* Public Domain <marc@snafu.org> */ | 2 | /* Public Domain <marc@snafu.org> */ |
3 | 3 | ||
4 | #if defined(LIBC_SCCS) && !defined(lint) | 4 | #if defined(LIBC_SCCS) && !defined(lint) |
5 | static char *rcsid = "$OpenBSD: strerror_r.c,v 1.2 2004/05/03 05:07:34 espie Exp $"; | 5 | static char *rcsid = "$OpenBSD: strerror_r.c,v 1.3 2005/04/20 23:38:15 beck Exp $"; |
6 | #endif /* LIBC_SCCS and not lint */ | 6 | #endif /* LIBC_SCCS and not lint */ |
7 | 7 | ||
8 | #ifdef NLS | 8 | #ifdef NLS |
@@ -107,8 +107,12 @@ strerror_r(int errnum, char *strerrbuf, size_t buflen) | |||
107 | #else | 107 | #else |
108 | len = strlcpy(strerrbuf, UPREFIX, buflen); | 108 | len = strlcpy(strerrbuf, UPREFIX, buflen); |
109 | #endif | 109 | #endif |
110 | __itoa(errnum, strerrbuf, len, buflen); | 110 | if (len >= buflen) |
111 | ret_errno = EINVAL; | 111 | ret_errno = ERANGE; |
112 | else { | ||
113 | __itoa(errnum, strerrbuf, len, buflen); | ||
114 | ret_errno = EINVAL; | ||
115 | } | ||
112 | } | 116 | } |
113 | 117 | ||
114 | #ifdef NLS | 118 | #ifdef NLS |