[extremetuxracer] fix use of memset()

Nils Philippsen nphilipp at fedoraproject.org
Wed Nov 9 10:33:09 UTC 2011


commit 708fe0e0b0cc86fad9f79f9d07122c8508a9aaa8
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed Nov 9 11:24:59 2011 +0100

    fix use of memset()

 extremetuxracer-0.4-memset.patch |   26 ++++++++++++++++++++++++++
 extremetuxracer.spec             |    5 +++++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/extremetuxracer-0.4-memset.patch b/extremetuxracer-0.4-memset.patch
new file mode 100644
index 0000000..a43d793
--- /dev/null
+++ b/extremetuxracer-0.4-memset.patch
@@ -0,0 +1,26 @@
+diff -up extremetuxracer-0.4/src/highscore.cpp.memset extremetuxracer-0.4/src/highscore.cpp
+--- extremetuxracer-0.4/src/highscore.cpp.memset	2007-09-20 21:47:02.000000000 +0200
++++ extremetuxracer-0.4/src/highscore.cpp	2011-11-09 10:59:39.720032708 +0100
+@@ -213,19 +213,19 @@ highscore::loadData()
+ 		bool end=false;
+ 		bool loop=false;
+ 		while(!end) {
+-			memset(buff,256,'\0');
++			memset(buff,'\0',256);
+ 			sfile >> buff;
+ 			if(std::string("<level>").compare(buff)==0) {
+ 				int n;
+ 				redim();
+ 				n = level_hs_length-1;
+-				memset(buff,256,'\0');
++				memset(buff,'\0',256);
+ 				sfile >> buff;
+ 				level_hs[n].level.assign(fromOutputFormat(buff));
+ 				loop=true;
+ 				for(_posts=0;loop&&_posts<10;_posts++) {
+ 					char nick[256];
+-					memset(nick,256,'\0');
++					memset(nick,'\0',256);
+ 					int score;
+ 					sfile >> nick >> score;
+ 					if(std::string("</level>").compare(nick)!=0) {
diff --git a/extremetuxracer.spec b/extremetuxracer.spec
index edbc91e..1186a23 100644
--- a/extremetuxracer.spec
+++ b/extremetuxracer.spec
@@ -31,6 +31,9 @@ Patch0: extremetuxracer-0.4-random-keypress-crash.patch
 # Build with newer libpng versions, modifies configure.ac
 Patch1: extremetuxracer-0.4-libpng.patch
 
+# Call memset() with correctly ordered parameters
+Patch2: extremetuxracer-0.4-memset.patch
+
 # Changes from rebuilding files with autoreconf
 Patch10: extremetuxracer-0.4-7-autoreconf.patch
 
@@ -105,6 +108,7 @@ Tux Racer.
 
 %patch0 -p1 -b .random-keypress-crash
 %patch1 -p1 -b .libpng
+%patch2 -p1 -b .memset
 
 %patch10 -p1 -b .autoreconf
 
@@ -161,6 +165,7 @@ rm -rf %{buildroot}
 * Wed Nov 09 2011 Nils Philippsen <nils at redhat.com> - 0.4-7
 - comment patches
 - patch and rebuild for libpng-1.5
+- fix use of memset()
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list