Added extra overflow patch frrom native build

diff --git a/jasper/compare.supp b/jasper/compare.supp
index aaa49e1..bc12b76 100644 (file)
--- a/jasper/compare.supp
+++ b/jasper/compare.supp
@@ -1,3 +1,10 @@
+# Mingw specific
 extra patch 'jasper-1.900.1-enable-shared.patch'
+# Mingw specific
 extra patch 'jasper-1.900.1-mingw.patch'
+# Mingw specific
 extra patch 'jasper-1.900.1-sleep.patch'
+# Linux OpenGL specific
+missing patch 'jasper-1.701.0-GL-ac.patch'
+# Linux OpenGL specific
+missing patch 'jasper-1.701.0-GL.patch'

diff --git a/jasper/mingw-jasper.spec b/jasper/mingw-jasper.spec
index 828598d..d8e8cad 100644 (file)
--- a/jasper/mingw-jasper.spec
+++ b/jasper/mingw-jasper.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw-jasper
 Version:        1.900.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Jasper library
 
 License:        JasPer
@@ -15,6 +15,7 @@ Source0:        http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version
 Patch1:         jasper-1.900.1-sleep.patch
 Patch2:         jasper-1.900.1-mingw.patch
 Patch3:         jasper-1.900.1-enable-shared.patch
+Patch4:         patch-libjasper-stepsizes-overflow.diff
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,6 +36,7 @@ MinGW Windows Jasper library.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-4
+- Add overflow patch from rawhide
+
 * Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-3
 - Run autoreconf after changing configure.ac script and add BRs for autotools
 

diff --git a/jasper/patch-libjasper-stepsizes-overflow.diff b/jasper/patch-libjasper-stepsizes-overflow.diff
new file mode 100644 (file)
index 0000000..097559f
--- /dev/null
+++ b/jasper/patch-libjasper-stepsizes-overflow.diff
@@ -0,0 +1,14 @@
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c     2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c  2007-04-06 01:29:02.000000000 +0200
+@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc
+               compparms->numstepsizes = (len - n) / 2;
+               break;
+       }
+-      if (compparms->numstepsizes > 0) {
++      if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
++              jpc_qcx_destroycompparms(compparms);
++                return -1;
++        } else if (compparms->numstepsizes > 0) {
+               compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+                 sizeof(uint_fast16_t));
+               assert(compparms->stepsizes);