Module Name: src
Committed By: pooka
Date: Wed Dec 12 11:10:56 UTC 2012
Modified Files:
src/sys/kern: kern_rate.c
Log Message:
Signed overflow is undefined behavior, and one version of gcc
clearly tells us:
kern_rate.c:98: warning: assuming signed overflow does not
occur when assuming that (X + c) > X is always true
Check value against INT_MAX instead. Also, for good measure throw
in a __predict() to flag the assumed common case.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/kern_rate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rate.c
diff -u src/sys/kern/kern_rate.c:1.1 src/sys/kern/kern_rate.c:1.2
--- src/sys/kern/kern_rate.c:1.1 Thu Sep 25 17:17:10 2008
+++ src/sys/kern/kern_rate.c Wed Dec 12 11:10:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rate.c,v 1.1 2008/09/25 17:17:10 pooka Exp $ */
+/* $NetBSD: kern_rate.c,v 1.2 2012/12/12 11:10:56 pooka Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rate.c,v 1.1 2008/09/25 17:17:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rate.c,v 1.2 2012/12/12 11:10:56 pooka Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -95,7 +95,7 @@ ppsratecheck(struct timeval *lasttime, i
#if 1 /*DIAGNOSTIC?*/
/* be careful about wrap-around */
- if (*curpps + 1 > *curpps)
+ if (__predict_true(*curpps != INT_MAX))
*curpps = *curpps + 1;
#else
/*
