diff options
| author |   chl <chl@openbsd.org> | 2007-09-09 23:25:12 +0000 |
|---|---|---|
| committer | chl <chl@openbsd.org> | 2007-09-09 23:25:12 +0000 |
| commit | 2ed2be6ef3e74cfc0d72db1624a4eb9350fc819e (patch) | |
| tree | ec10a9cf36a046df83179249d891e81501553b1b | |
| parent | Make sure ptrace(2) cannot change any priviliged bits in the Machine State (diff) | |
| download | wireguard-openbsd-2ed2be6ef3e74cfc0d72db1624a4eb9350fc819e.tar.xz wireguard-openbsd-2ed2be6ef3e74cfc0d72db1624a4eb9350fc819e.zip | |
use strcspn to properly overwrite '\n' in fgets returned buffer
ok moritz@ gilles@
| -rw-r--r-- | regress/lib/libc/regex/main.c | 4 | ||||
| -rw-r--r-- | regress/lib/libc/regex/split.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/regress/lib/libc/regex/main.c b/regress/lib/libc/regex/main.c index fd092905faf..15e0bc8c1f8 100644 --- a/regress/lib/libc/regex/main.c +++ b/regress/lib/libc/regex/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 2004/02/28 08:06:46 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.6 2007/09/09 23:25:12 chl Exp $ */ /* $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $ */ #include <stdio.h> @@ -147,7 +147,7 @@ FILE *in; line++; if (inbuf[0] == '#' || inbuf[0] == '\n') continue; /* NOTE CONTINUE */ - inbuf[strlen(inbuf)-1] = '\0'; /* get rid of stupid \n */ + inbuf[strcspn(inbuf, "\n")] = '\0'; /* get rid of stupid \n */ if (debug) fprintf(stdout, "%d:\n", line); nf = split(inbuf, f, MAXF, "\t\t"); diff --git a/regress/lib/libc/regex/split.c b/regress/lib/libc/regex/split.c index f0f72c8b663..fcd81a35037 100644 --- a/regress/lib/libc/regex/split.c +++ b/regress/lib/libc/regex/split.c @@ -1,4 +1,4 @@ -/* $OpenBSD: split.c,v 1.4 2004/02/28 08:06:47 deraadt Exp $ */ +/* $OpenBSD: split.c,v 1.5 2007/09/09 23:25:12 chl Exp $ */ /* $NetBSD: split.c,v 1.2 1995/04/20 22:39:57 cgd Exp $ */ #include <stdio.h> @@ -171,7 +171,7 @@ char *argv[]; dosplit(argv[1], argv[2]); else if (argc > 1) while (fgets(buf, sizeof(buf), stdin) != NULL) { - buf[strlen(buf)-1] = '\0'; /* stomp newline */ + buf[strcspn(buf, "\n")] = '\0'; /* stomp newline */ dosplit(buf, argv[1]); } else |