diff options
| author | pfg <pfg@FreeBSD.org> | 2014-08-28 18:11:05 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2014-08-28 18:11:05 +0000 |
| commit | 564b330f17f47a63364f8c45c76c24493a627165 (patch) | |
| tree | 3d904b740bbafd0a43dee99599d230f2e5384ec4 | |
| parent | d3edf358e534ec56f98b2f0a586698b9621b6fa7 (diff) | |
| download | FreeBSD-src-564b330f17f47a63364f8c45c76c24493a627165.zip FreeBSD-src-564b330f17f47a63364f8c45c76c24493a627165.tar.gz | |
MFC r270256:
Always check the limits of array index variables before using them.
Obtained from: DragonFlyBSD
| -rw-r--r-- | bin/ed/cbc.c | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/libmap.c | 4 | ||||
| -rw-r--r-- | usr.bin/mail/edit.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c index 31838f5..80ed95a 100644 --- a/bin/ed/cbc.c +++ b/bin/ed/cbc.c @@ -237,7 +237,7 @@ expand_des_key(char *obuf, char *kbuf) /* * now translate it, bombing on any illegal hex digit */ - for (i = 0; kbuf[i] && i < 16; i++) + for (i = 0; i < 16 && kbuf[i]; i++) if ((nbuf[i] = hex_to_binary((int) kbuf[i], 16)) == -1) des_error("bad hex digit in key"); while (i < 16) diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c index 8b5faf8..691ad52 100644 --- a/libexec/rtld-elf/libmap.c +++ b/libexec/rtld-elf/libmap.c @@ -216,14 +216,14 @@ lmc_parse(char *lm_p, size_t lm_len) p = NULL; while (cnt < lm_len) { i = 0; - while (lm_p[cnt] != '\n' && cnt < lm_len && + while (cnt < lm_len && lm_p[cnt] != '\n' && i < sizeof(line) - 1) { line[i] = lm_p[cnt]; cnt++; i++; } line[i] = '\0'; - while (lm_p[cnt] != '\n' && cnt < lm_len) + while (cnt < lm_len && lm_p[cnt] != '\n') cnt++; /* skip over nl */ cnt++; diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c index ad8aa53..f9e974d 100644 --- a/usr.bin/mail/edit.c +++ b/usr.bin/mail/edit.c @@ -81,7 +81,7 @@ edit1(int *msgvec, int type) /* * Deal with each message to be edited . . . */ - for (i = 0; msgvec[i] && i < msgCount; i++) { + for (i = 0; i < msgCount && msgvec[i]; i++) { sig_t sigint; if (i > 0) { |
