diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-06-23 22:32:49 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-06-23 22:32:49 +0000 |
| commit | 4b72c5ffcbc02b70eb7bc4bb365703218d3d8a3c (patch) | |
| tree | 3809f9d29e5db399fdc434beb478470baaf579bc | |
| parent | 79e7f0d2c524484d10d0b11cc4b878d7ebaec533 (diff) | |
strncpy -> memcpy per deraadt suggestion.
also add a note why we can't use strlcpy.
| -rw-r--r-- | usr.bin/grep/grep.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index c7abfc35e3a..3fce875d9a5 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grep.c,v 1.14 2003/06/23 22:27:09 tedu Exp $ */ +/* $OpenBSD: grep.c,v 1.15 2003/06/23 22:32:48 tedu Exp $ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav @@ -171,7 +171,8 @@ add_pattern(char *pat, size_t len) if (pat[len - 1] == '\n') --len; pattern[patterns] = grep_malloc(len + 1); - strncpy(pattern[patterns], pat, len); + /* pat may not be NUL-terminated */ + memcpy(pattern[patterns], pat, len); pattern[patterns][len] = '\0'; ++patterns; |