From: Stéphane Marchesin <marcheu@chromium.org>
Date: Wed, 15 Aug 2012 00:15:54 +0000 (-0700)
Subject: glsl/linker: Avoid buffer over-run in parcel_out_uniform_storage::visit_field
X-Git-Tag: android-x86-4.4-r1~4174
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ff996cafce511dd8a6c4e066e409c23e147a670c;p=android-x86%2Fexternal-mesa.git

glsl/linker: Avoid buffer over-run in parcel_out_uniform_storage::visit_field

When too may uniforms are used, the error will be caught in
check_resources (src/glsl/linker.cpp).

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Benoit Jacob <bjacob@mozilla.com>
---

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 25dc1d7dc55..eef9025cf28 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -313,7 +313,7 @@ private:
 	 const gl_texture_index target = base_type->sampler_index();
 	 const unsigned shadow = base_type->sampler_shadow;
 	 for (unsigned i = this->uniforms[id].sampler
-		 ; i < this->next_sampler
+		 ; i < MIN2(this->next_sampler, MAX_SAMPLERS)
 		 ; i++) {
 	    this->targets[i] = target;
 	    this->shader_samplers_used |= 1U << i;