Date: Tue, 20 Dec 2016 01:52:00 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428970 - in head/games/openbor: . files Message-ID: <201612200152.uBK1q0nw098248@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Dec 20 01:51:59 2016 New Revision: 428970 URL: https://svnweb.freebsd.org/changeset/ports/428970 Log: games/openbor: fix off-by-one noticed by gcc6 openbor.c: In function 'common_dot': openbor.c:20485:39: warning: iteration 10 invokes undefined behavior [-Waggressive-loop-optimizations] iDot_time = self->dot_time[iIndex]; //Get expire time. ~~~~~~~~~~~~~~^~~~~~~~ openbor.c:20483:5: note: within this loop for(iIndex = 0; iIndex <= MAX_DOTS; iIndex++) //Loop through all DOT indexes. ^~~ Modified: head/games/openbor/Makefile (contents, props changed) head/games/openbor/files/patch-openbor.c (contents, props changed) Modified: head/games/openbor/Makefile ============================================================================== --- head/games/openbor/Makefile Tue Dec 20 01:44:05 2016 (r428969) +++ head/games/openbor/Makefile Tue Dec 20 01:51:59 2016 (r428970) @@ -2,7 +2,7 @@ PORTNAME= openbor PORTVERSION= 3.0.r4415 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games devel MASTER_SITES= LOCAL/jbeich \ https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn Modified: head/games/openbor/files/patch-openbor.c ============================================================================== --- head/games/openbor/files/patch-openbor.c Tue Dec 20 01:44:05 2016 (r428969) +++ head/games/openbor/files/patch-openbor.c Tue Dec 20 01:51:59 2016 (r428970) @@ -18,6 +18,15 @@ // Allocate memory and get pointer. result = malloc(alloc_size); +@@ -20480,7 +20480,7 @@ void common_dot() + entity *eOpp; //Owner of dot effect. + s_collision_attack attack; //Attack struct. + +- for(iIndex = 0; iIndex <= MAX_DOTS; iIndex++) //Loop through all DOT indexes. ++ for(iIndex = 0; iIndex < MAX_DOTS; iIndex++) //Loop through all DOT indexes. + { + iDot_time = self->dot_time[iIndex]; //Get expire time. + iDot_cnt = self->dot_cnt[iIndex]; //Get next tick time. @@ -34617,7 +34617,7 @@ void keyboard_setup(int player) strncpy(buttonnames[SDID_SPECIAL], "Special", 16); strncpy(buttonnames[SDID_START], "Start", 16);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612200152.uBK1q0nw098248>