diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-11-12 11:03:38 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-11-12 11:03:38 +0000 |
| commit | 77958f22377d8dda770168c4d0a2e165b81b02c1 (patch) | |
| tree | 44e63f213485fffc7215ce1d6ee5bb1939dff474 | |
| parent | 5cf7c0cf9ed87d1800a47cd68c00a6ebae0d726d (diff) | |
Don't reuse a loop counter specifying the size of an array outside
of the loop to then access an offset in the array as this can lead
to an off by one.
found by parfait
ok miod@
| -rw-r--r-- | usr.sbin/popa3d/standalone.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.sbin/popa3d/standalone.c b/usr.sbin/popa3d/standalone.c index e47f3404e19..b3be2844793 100644 --- a/usr.sbin/popa3d/standalone.c +++ b/usr.sbin/popa3d/standalone.c @@ -1,4 +1,4 @@ -/* $OpenBSD: standalone.c,v 1.13 2009/11/11 18:11:24 deraadt Exp $ */ +/* $OpenBSD: standalone.c,v 1.14 2009/11/12 11:03:37 jsg Exp $ */ /* * Standalone POP server: accepts connections, checks the anti-flood limits, @@ -234,7 +234,7 @@ handle(int sock) pid_t pid; struct tms buf; int error; - int j, n, i; + int j, n, i, s; log = 0; new = 0; @@ -267,7 +267,9 @@ handle(int sock) j = -1; n = 0; + s = 0; for (i = 0; i < MAX_SESSIONS; i++) { + s = i; if (sessions[i].start > now) sessions[i].start = 0; if (sessions[i].pid || @@ -281,13 +283,13 @@ handle(int sock) } if (n >= MAX_SESSIONS_PER_SOURCE) { - if (!sessions[i].log || - now < sessions[i].log || - now - sessions[i].log >= MIN_DELAY * CLK_TCK) { + if (!sessions[s].log || + now < sessions[s].log || + now - sessions[s].log >= MIN_DELAY * CLK_TCK) { syslog(SYSLOG_PRI_HI, "%s: per source limit reached", hbuf); - sessions[i].log = now; + sessions[s].log = now; } close(new); return -1; |