Am Tuesday 06 October 2009 20:29:00 schrieb Ian Romanick: > Nicolai Hähnle wrote: > > glUniformMatrix() with too large count parameter could previously lead to > > memory corruption. > > Is there a piglit test for this? I imagine calling it with count == > INT_MAX should crash fairly reliably. :)
Yes, though now that you mention INT_MAX, it should probably be tweaked for that :} Will do. > > Signed-off-by: Nicolai Hähnle <nhaeh...@gmail.com> > > Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> > > > --- > > src/mesa/shader/shader_api.c | 29 +++++++++++++++++++++-------- > > 1 files changed, 21 insertions(+), 8 deletions(-) > > > > diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c > > index 6b19b4c..fbd995e 100644 > > --- a/src/mesa/shader/shader_api.c > > +++ b/src/mesa/shader/shader_api.c > > @@ -1707,7 +1707,7 @@ set_program_uniform(GLcontext *ctx, struct > > gl_program *program, > > } > > else { > > /* non-array: count must be one */ > > - if (count != 1) { > > + if (count > 1) { > > _mesa_error(ctx, GL_INVALID_OPERATION, > > "glUniform(uniform is not an array)"); > > return; > > I'd update the comment here too. I had to look at the code to verify > that count == 0 was handled correctly. Okay. ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev