Browse Source

Fix the example code. The loop invariant 'i' was not bound by MAXTOKENS

which could result in writing a NUL byte outside of tokens[].  A fix, from
Patrick Latifi, is to move the increment into the "i < MAXTOKENS - 1" block.
OPENBSD_3_5
millert 21 years ago
parent
commit
442cc4dad5
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/lib/libc/string/strtok.3

+ 3
- 3
src/lib/libc/string/strtok.3 View File

@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: strtok.3,v 1.16 2003/06/02 20:18:38 millert Exp $
.\" $OpenBSD: strtok.3,v 1.17 2004/01/20 06:06:48 millert Exp $
.\" .\"
.Dd June 29, 1991 .Dd June 29, 1991
.Dt STRTOK 3 .Dt STRTOK 3
@ -104,9 +104,9 @@ int i = 0;
snprintf(s, sizeof(s), "cat dog horse cow"); snprintf(s, sizeof(s), "cat dog horse cow");
for ((p = strtok_r(s, " ", &last)); p; for ((p = strtok_r(s, " ", &last)); p;
(p = strtok_r(NULL, " ", &last)), i++) {
(p = strtok_r(NULL, " ", &last))) {
if (i < MAXTOKENS - 1) if (i < MAXTOKENS - 1)
tokens[i] = p;
tokens[i++] = p;
} }
tokens[i] = NULL; tokens[i] = NULL;
.Ed .Ed


Loading…
Cancel
Save