[arch-commits] Commit in lib32-libjpeg-turbo/trunk (PKGBUILD cve-2013-6629.patch)

[Florian Pritz]

    Date: Wednesday, December 11, 2013 @ 09:29:25
  Author: bluewind
Revision: 102428

upgpkg: lib32-libjpeg-turbo 1.3.0-4

fix CVE-2013-6629

Added:
  lib32-libjpeg-turbo/trunk/cve-2013-6629.patch
Modified:
  lib32-libjpeg-turbo/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   18 +++++++++++++++---
 cve-2013-6629.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-10 21:34:55 UTC (rev 102427)
+++ PKGBUILD	2013-12-11 08:29:25 UTC (rev 102428)
@@ -5,7 +5,7 @@
 _pkgbasename=libjpeg-turbo
 pkgname=lib32-$_pkgbasename
 pkgver=1.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)"
 arch=('x86_64')
 url="http://libjpeg-turbo.virtualgl.org/"
@@ -16,9 +16,16 @@
 conflicts=('lib32-libjpeg' 'lib32-turbojpeg')
 replaces=('lib32-libjpeg' 'lib32-turbojpeg')
 options=('!libtool')
-source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz)
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
+source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz
+        'cve-2013-6629.patch')
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28'
+          '10f2cf2276244d2b94d35bfca24639bc83ce1185')
 
+prepare() {
+  cd "$_pkgbasename-$pkgver"
+  patch -i ../cve-2013-6629.patch # FS#38094
+}
+
 build() {
   cd "$_pkgbasename-$pkgver"
 
@@ -33,6 +40,11 @@
   make
 }
 
+check() {
+  cd "$_pkgbasename-$pkgver"
+  make test
+  }
+
 package() {
   cd "$_pkgbasename-$pkgver"
 

Added: cve-2013-6629.patch
===================================================================
--- cve-2013-6629.patch	                        (rev 0)
+++ cve-2013-6629.patch	2013-12-11 08:29:25 UTC (rev 102428)
@@ -0,0 +1,36 @@
+Index: jdmarker.c
+===================================================================
+--- jdmarker.c	(revision 1088)
++++ jdmarker.c	(revision 1089)
+@@ -304,7 +304,7 @@
+ /* Process a SOS marker */
+ {
+   INT32 length;
+-  int i, ci, n, c, cc;
++  int i, ci, n, c, cc, pi;
+   jpeg_component_info * compptr;
+   INPUT_VARS(cinfo);
+ 
+@@ -348,6 +348,13 @@
+     
+     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+ 	     compptr->dc_tbl_no, compptr->ac_tbl_no);
++
++    /* This CSi (cc) should differ from the previous CSi */
++    for (pi = 0; pi < i; pi++) {
++      if (cinfo->cur_comp_info[pi] == compptr) {
++        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
++      }
++    }
+   }
+ 
+   /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+@@ -465,6 +472,8 @@
+     for (i = 0; i < count; i++)
+       INPUT_BYTE(cinfo, huffval[i], return FALSE);
+ 
++    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
++
+     length -= count;
+ 
+     if (index & 0x10) {		/* AC table definition */