rpms/SDL_image/FC-6 SDL_image-1.2.5-IMG_xpm.patch, NONE, 1.1 SDL_image.spec, 1.9, 1.10

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/SDL_image/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26237

Modified Files:
	SDL_image.spec 
Added Files:
	SDL_image-1.2.5-IMG_xpm.patch 
Log Message:
* Sun Nov 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.5-3
- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)


SDL_image-1.2.5-IMG_xpm.patch:

--- NEW FILE SDL_image-1.2.5-IMG_xpm.patch ---
--- IMG_xpm.c~	2006-05-12 05:02:44.000000000 +0200
+++ IMG_xpm.c	2006-10-31 19:03:25.000000000 +0100
@@ -326,7 +326,8 @@
 	linebuf = NULL;
 	buflen = 0;
 
-	start = SDL_RWtell(src);
+    if(src)
+        start = SDL_RWtell(src);
 
 	if(xpm)
 		xpmlines = &xpm;
@@ -453,7 +454,8 @@
 
 done:
 	if(error) {
-		SDL_RWseek(src, start, SEEK_SET);
+        if (src)
+            SDL_RWseek(src, start, SEEK_SET);
 		if ( image ) {
 			SDL_FreeSurface(image);
 			image = NULL;


Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/FC-6/SDL_image.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_image.spec	31 Aug 2006 21:47:34 -0000	1.9
+++ SDL_image.spec	26 Nov 2006 15:14:30 -0000	1.10
@@ -1,12 +1,13 @@
 Name:		SDL_image
 Version:	1.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_image/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.2.5-IMG_xpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	SDL-devel >= 1.2.10
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .imgxpm
 
 
 %build
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.5-3
+- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.5-2
 - Rebuild for FC6.