devel/yasm yasm-0.4.0-genmacro.patch,NONE,1.1 yasm.spec,1.1,1.2

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/devel/yasm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25119

Modified Files:
	yasm.spec 
Added Files:
	yasm-0.4.0-genmacro.patch 
Log Message:
Fix memory corruption in genmacro. If the string is empty, don't start
screwing with stuff at str[strlen(str)-1]. 


yasm-0.4.0-genmacro.patch:

--- NEW FILE yasm-0.4.0-genmacro.patch ---
--- yasm-0.4.0/modules/preprocs/nasm/genmacro.c~	2004-10-31 03:55:54.000000000 +0000
+++ yasm-0.4.0/modules/preprocs/nasm/genmacro.c	2005-02-14 09:21:37.000000000 +0000
@@ -102,8 +102,8 @@
 	    while (*strp == ' ' || *strp == '\t')
 		strp++;
 	    len = strlen(strp);
-	    while (strp[len-1] == ' ' || strp[len-1] == '\t' ||
-		   strp[len-1] == '\n') {
+	    while (len && (strp[len-1] == ' ' || strp[len-1] == '\t' ||
+			   strp[len-1] == '\n')) {
 		strp[len-1] = '\0';
 		len--;
 	    }


Index: yasm.spec
===================================================================
RCS file: /cvs/extras/devel/yasm/yasm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yasm.spec	31 Jan 2005 17:31:15 -0000	1.1
+++ yasm.spec	14 Feb 2005 09:27:35 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Complete rewrite of the NASM assembler
 Name: yasm
 Version: 0.4.0
-Release: 1
+Release: 2
 License: BSD
 Group: Development/Languages
 URL: http://www.tortall.net/projects/yasm/
 Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz
+Patch0: yasm-0.4.0-genmacro.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, xmlto, gettext-devel
 
@@ -36,7 +37,7 @@
 
 %prep
 %setup
-
+%patch0 -p1
 
 %build
 %configure
@@ -82,6 +83,9 @@
 
 
 %changelog
+* Mon Feb 14 2005 David Woodhouse <dwmw2 at infradead.org> 0.4.0-2
+- Fix corruption in genmacro
+
 * Fri Jan 28 2005 Matthias Saou <http://freshrpms.net/> 0.4.0-1
 - Initial RPM release.