[gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo/files: libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch

[Samuli Suominen (ssuominen)]

ssuominen    12/05/31 19:12:17

  Added:               
                        libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch
  Log:
  Grab patch from upstream 1.2.x branch for "Guard against num_components being a ridiculousvalue due to a corrupt header"
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch?rev=1.1&content-type=text/plain

Index: libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch
===================================================================
Wed May 30 20:36:42 2012 UTC by dcommander with message:

"Guard against num_components being a ridiculous value due to a corrupt header"

http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/jdmarker.c?r1=751&r2=831&pathrev=831

--- jdmarker.c
+++ jdmarker.c
@@ -323,14 +323,15 @@
 
   /* Collect the component-spec parameters */
 
-  for (i = 0; i < cinfo->num_components; i++)
+  for (i = 0; i < MAX_COMPS_IN_SCAN; i++)
     cinfo->cur_comp_info[i] = NULL;
 
   for (i = 0; i < n; i++) {
     INPUT_BYTE(cinfo, cc, return FALSE);
     INPUT_BYTE(cinfo, c, return FALSE);
     
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+    for (ci = 0, compptr = cinfo->comp_info;
+	 ci < cinfo->num_components && ci < MAX_COMPS_IN_SCAN;
 	 ci++, compptr++) {
       if (cc == compptr->component_id && !cinfo->cur_comp_info[ci])
 	goto id_found;