From 4f5a56e73cd28662dbe8f81787b0e69ff9e94950 Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 21 Aug 2014 02:40:33 +0000 Subject: Always check the limits of array index variables before using them. Obtained from: DragonFlyBSD MFC after: 1 week --- libexec/rtld-elf/libmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libexec') 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++; -- cgit v1.1