r4008 - in packages/trunk/hex-a-hop/debian: . patches

Jens Seidel jseidel-guest at alioth.debian.org
Thu Aug 30 22:34:38 UTC 2007


Author: jseidel-guest
Date: 2007-08-30 22:34:38 +0000 (Thu, 30 Aug 2007)
New Revision: 4008

Added:
   packages/trunk/hex-a-hop/debian/patches/misc_errors.patch
Modified:
   packages/trunk/hex-a-hop/debian/changelog
   packages/trunk/hex-a-hop/debian/patches/series
Log:
* Fixed a few errors in the code found with valgrind.


Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog	2007-08-30 22:26:11 UTC (rev 4007)
+++ packages/trunk/hex-a-hop/debian/changelog	2007-08-30 22:34:38 UTC (rev 4008)
@@ -1,3 +1,10 @@
+hex-a-hop (0.0.20070315-5) unstable; urgency=low
+
+  [Jens Seidel]
+  * Fixed a few errors in the code found with valgrind.
+
+ -- Jens Seidel <jensseidel at users.sf.net>  Fri, 31 Aug 2007 00:15:00 +0200
+
 hex-a-hop (0.0.20070315-4) unstable; urgency=low
 
   [Jens Seidel]

Added: packages/trunk/hex-a-hop/debian/patches/misc_errors.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/misc_errors.patch	                        (rev 0)
+++ packages/trunk/hex-a-hop/debian/patches/misc_errors.patch	2007-08-30 22:34:38 UTC (rev 4008)
@@ -0,0 +1,25 @@
+Index: hex-a-hop/hex_puzzzle.cpp
+===================================================================
+--- hex-a-hop.orig/hex_puzzzle.cpp
++++ hex-a-hop/hex_puzzzle.cpp
+@@ -617,8 +617,8 @@
+ 	{
+ 		if (currentStage > 0 && numStages > 0)
+ 		{
+-			memmove(&time[0], &time[currentStage], sizeof(time[0]) * numStages-currentStage);
+-			memmove(&stage[0], &stage[currentStage], sizeof(stage[0]) * numStages-currentStage);
++			memmove(&time[0], &time[currentStage], sizeof(time[0]) * (numStages-currentStage));
++			memmove(&stage[0], &stage[currentStage], sizeof(stage[0]) * (numStages-currentStage));
+ 			numStages -= currentStage;
+ 			currentStage = 0;
+ 		}
+@@ -1887,7 +1887,8 @@
+ 				PackFile1::Entry* e = levelFiles.Find(filename);
+ 				if (!e) return false;
+ 
+-				strcpy(currentFile, filename);
++				if (currentFile != filename) // equal (overlapping) strings are forbidden
++					strcpy(currentFile, filename);
+ 				currentLevelInfo = GetLevelInfo(currentFile);
+ 				
+ 				loadPtr = (char*)e->Data();

Modified: packages/trunk/hex-a-hop/debian/patches/series
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/series	2007-08-30 22:26:11 UTC (rev 4007)
+++ packages/trunk/hex-a-hop/debian/patches/series	2007-08-30 22:34:38 UTC (rev 4008)
@@ -10,3 +10,4 @@
 array_subscripts_warning.patch
 i18n_increase_array_sizes.patch
 mouse_cursor_without_font.patch
+misc_errors.patch




More information about the Pkg-games-commits mailing list