rpms/SDL_image/devel SDL_image-IMG_lbm.patch, NONE, 1.1 SDL_image.spec, 1.15, 1.16
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Tue Jan 29 19:09:22 UTC 2008
- Previous message (by thread): rpms/gruler/F-8 gruler.desktop, NONE, 1.1 gruler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gruler/F-7 gruler.desktop, NONE, 1.1 gruler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bpepple
Update of /cvs/pkgs/rpms/SDL_image/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2730
Modified Files:
SDL_image.spec
Added Files:
SDL_image-IMG_lbm.patch
Log Message:
* Tue Jan 29 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.6-5
- Add patch to fix ILBM image buffer overflow. (#430693)
SDL_image-IMG_lbm.patch:
--- NEW FILE SDL_image-IMG_lbm.patch ---
--- trunk/SDL_image/IMG_lbm.c 2007/07/20 04:37:11 3341
+++ trunk/SDL_image/IMG_lbm.c 2008/01/03 20:05:34 3521
@@ -28,6 +28,7 @@
EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain
(http://www.multimania.com/mavati) in December 2003.
Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004.
+ Buffer overflow fix in RLE decompression by David Raulo in January 2008.
*/
#include <stdio.h>
@@ -328,7 +329,7 @@
count ^= 0xFF;
count += 2; /* now it */
- if ( !SDL_RWread( src, &color, 1, 1 ) )
+ if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) )
{
error="error reading BODY chunk";
goto done;
@@ -339,7 +340,7 @@
{
++count;
- if ( !SDL_RWread( src, ptr, count, 1 ) )
+ if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) )
{
error="error reading BODY chunk";
goto done;
Index: SDL_image.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_image/devel/SDL_image.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SDL_image.spec 25 Jan 2008 14:49:23 -0000 1.15
+++ SDL_image.spec 29 Jan 2008 19:08:39 -0000 1.16
@@ -1,6 +1,6 @@
Name: SDL_image
Version: 1.2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Image loading library for SDL
Group: System Environment/Libraries
@@ -8,6 +8,7 @@
URL: http://www.libsdl.org/projects/SDL_image/
Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
Patch0: %{name}-buffer-overflow.patch
+Patch1: %{name}-IMG_lbm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 1.2.10
@@ -38,6 +39,7 @@
%prep
%setup -q
%patch0 -p2 -b .overflow
+%patch1 -p2 -b .ilbm
%build
# XCF support is crashy in 1.2.4
@@ -83,8 +85,11 @@
%changelog
+* Tue Jan 29 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.6-5
+- Add patch to fix ILBM image buffer overflow. (#430693)
+
* Thu Jan 24 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.6-4
-- Add patch to fix buffer-overflow. (#430238)
+- Add patch to fix buffer-overflow. (#430100)
* Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.6-3
- Rebuild.
- Previous message (by thread): rpms/gruler/F-8 gruler.desktop, NONE, 1.1 gruler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gruler/F-7 gruler.desktop, NONE, 1.1 gruler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list