From: Brian Paul Date: Sun, 4 Nov 2012 23:43:44 +0000 (-0700) Subject: mesa: assert that key->fragprog_inputs_read value isn't too large X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d61f879a1f2e6bb37368731a29d5267e1c25195;p=mesa.git mesa: assert that key->fragprog_inputs_read value isn't too large fragprog_inputs_read is a 12-bit bitfield so check the assigned value. MSVC warns on the assignment. Not easy to fix but let's do a sanity check. Reviewed-by: Jose Fonseca --- diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index efdca015e99..4cdec216696 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -160,6 +160,8 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) key->need_eye_coords = ctx->_NeedEyeCoords; + /* Make sure fp->Base.InputsRead fits in a 12-bit field */ + assert(fp->Base.InputsRead < (1 << 12)); key->fragprog_inputs_read = fp->Base.InputsRead; key->varying_vp_inputs = ctx->varying_vp_inputs;