← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-security

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/intel/intel_tex_validate.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers, Steve Beattie
  • Date: 2012-10-19 09:04:04 UTC
  • mfrom: (163.1.4 precise-proposed)
  • Revision ID: package-import@ubuntu.com-20121019090404-5zbjpsp6knv7zl3b
Tags: 8.0.4-0ubuntu0.2
https://launchpad.net/bugs/1046933
[ Steve Beattie ]
* SECURITY UPDATE: samplers array overflow (LP: #1046933)
  - debian/patches/50-CVE-2012-2864.patch: ensure that more than
    MAX_SAMPLERS are not used
  - CVE-2012-2864

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/intel/intel_tex_validate.c
97
97
         /* skip too small size mipmap */
98
98
         if (intelImage == NULL)
99
99
                 break;
100
 
         /* Need to import images in main memory or held in other trees.
101
 
          * If it's a render target, then its data isn't needed to be in
102
 
          * the object tree (otherwise we'd be FBO incomplete), and we need
103
 
          * to keep track of the image's MT as needing to be pulled in still,
104
 
          * or we'll lose the rendering that's done to it.
105
 
          */
106
 
         if (intelObj->mt != intelImage->mt &&
107
 
             !intelImage->used_as_render_target) {
 
100
 
 
101
         if (intelObj->mt != intelImage->mt) {
108
102
            intel_miptree_copy_teximage(intel, intelImage, intelObj->mt);
109
103
         }
110
104
      }