diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-04-06 23:57:52 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-04-06 23:57:52 +0000 |
| commit | f85dfc8e3ff6c448c283e868df0c93b8740c25c9 (patch) | |
| tree | 55f766cc9db500036fcfafb582b4cc2b6b52f67b | |
| parent | 9bf2df7ea3567fc8a48e36d3f64988d220cd69bd (diff) | |
strlcpy; tedu ok
| -rw-r--r-- | bin/systrace/systrace-translate.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bin/systrace/systrace-translate.c b/bin/systrace/systrace-translate.c index f7863c7aa8c..45c915cea00 100644 --- a/bin/systrace/systrace-translate.c +++ b/bin/systrace/systrace-translate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: systrace-translate.c,v 1.14 2002/12/09 07:24:56 itojun Exp $ */ +/* $OpenBSD: systrace-translate.c,v 1.15 2003/04/06 23:57:51 deraadt Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -50,7 +50,7 @@ #include "systrace.h" #define FL(w,c) do { \ - if (flags & (w)) \ + if (flags & (w) && p < str + sizeof str) \ *p++ = (c); \ } while (0) @@ -74,17 +74,17 @@ print_oflags(char *buf, size_t buflen, struct intercept_translate *tl) p = str; switch (flags & O_ACCMODE) { case O_RDONLY: - strcpy(p, "ro"); + strlcpy(p, "ro", str + sizeof str - p); isread = 1; break; case O_WRONLY: - strcpy(p, "wo"); + strlcpy(p, "wo", str + sizeof str - p); break; case O_RDWR: - strcpy(p, "rw"); + strlcpy(p, "rw", str + sizeof str - p); break; default: - strcpy(p, "--"); + strlcpy(p, "--", str + sizeof str - p); break; } @@ -118,17 +118,17 @@ linux_print_oflags(char *buf, size_t buflen, struct intercept_translate *tl) p = str; switch (flags & LINUX_O_ACCMODE) { case LINUX_O_RDONLY: - strcpy(p, "ro"); + strlcpy(p, "ro", str + sizeof str - p); isread = 1; break; case LINUX_O_WRONLY: - strcpy(p, "wo"); + strlcpy(p, "wo", str + sizeof str - p); break; case LINUX_O_RDWR: - strcpy(p, "rw"); + strlcpy(p, "rw", str + sizeof str - p); break; default: - strcpy(p, "--"); + strlcpy(p, "--", str + sizeof str - p); break; } |