r11867 - packages/trunk/alex4/debian/patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-03-09 20:05:14 +0000 (Wed, 09 Mar 2011)
New Revision: 11867

Modified:
   packages/trunk/alex4/debian/patches/hardening.patch
Log:
Fix an undefined order of operations problem.

Modified: packages/trunk/alex4/debian/patches/hardening.patch
===================================================================
--- packages/trunk/alex4/debian/patches/hardening.patch	2011-03-09 20:04:54 UTC (rev 11866)
+++ packages/trunk/alex4/debian/patches/hardening.patch	2011-03-09 20:05:14 UTC (rev 11867)
@@ -1,6 +1,7 @@
 Description: Harden the build.
  - check the fread() and fwrite() return values
  - swap a return and an fclose()
+ - fix an undefined order of operations problem
 Forwarded: no
 Author: Peter Pentchev <roam at ringlet.net>
 Last-Update: 2011-03-07
@@ -152,3 +153,15 @@
  
  	// close file
  	fclose(fp);
+--- a/src/shooter.c
++++ b/src/shooter.c
+@@ -903,7 +903,8 @@
+ 									s_var.score += 1000000;
+ 								}
+ 								else {  // increase power
+-									s_var.power_level = MIN(s_var.power_level ++, 7);
++									if (++s_var.power_level > 7)
++										s_var.power_level = 7;
+ 								}
+ 								play_sound_id(SMPL_HEART);	
+