diff options
| author |   tedu <tedu@openbsd.org> | 2003-06-23 03:23:40 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2003-06-23 03:23:40 +0000 |
| commit | f92e9c5664d28384710215fe060886d2900afc29 (patch) | |
| tree | 554b108c6082472d12d05adb3bc5998584bed5d5 /usr.bin/grep/grep.c | |
| parent | Don't remove anchor too early in table code, it makes PF use freed memory. (diff) | |
| download | wireguard-openbsd-f92e9c5664d28384710215fe060886d2900afc29.tar.xz wireguard-openbsd-f92e9c5664d28384710215fe060886d2900afc29.zip | |
use strlcpy, not strncpy. ok deraadt@ millert@
Diffstat (limited to 'usr.bin/grep/grep.c')
| -rw-r--r-- | usr.bin/grep/grep.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index fe4935426f8..25b7b13103f 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grep.c,v 1.10 2003/06/23 02:02:41 tedu Exp $ */ +/* $OpenBSD: grep.c,v 1.11 2003/06/23 03:23:40 tedu Exp $ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav @@ -165,11 +165,10 @@ add_pattern(char *pat, size_t len) pattern_sz *= 2; pattern = grep_realloc(pattern, ++pattern_sz); } - if (pat[len-1] == '\n') + if (pat[len - 1] == '\n') --len; - pattern[patterns] = grep_malloc(len+1); - strncpy(pattern[patterns], pat, len); - pattern[patterns][len] = '\0'; + pattern[patterns] = grep_malloc(len + 1); + strlcpy(pattern[patterns], pat, len + 1); ++patterns; } |