Module: Mesa Branch: 8.0 Commit: c33b752899d26ecacb7affa76e90632436294974 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c33b752899d26ecacb7affa76e90632436294974
Author: Chad Versace <[email protected]> Date: Fri Jul 20 15:41:27 2012 -0700 i830: Fix stack corruption Found by compiler warning: i830_texstate.c:131:28: warning: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer-memaccess] memset(state, 0, sizeof(state)); ~~~~~ ^~~~~ On 64-bit systems, memset here would write an extra 4 bytes. Note: This is a candidate for the stable branches. Reviewed-by: Brian Paul <[email protected]> Signed-off-by: Chad Versace <[email protected]> (cherry picked from commit 735070c45b403a9631415b09e9fd519f601f0229) --- src/mesa/drivers/dri/i915/i830_texstate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c index 5f32b92..b7d2d33 100644 --- a/src/mesa/drivers/dri/i915/i830_texstate.c +++ b/src/mesa/drivers/dri/i915/i830_texstate.c @@ -128,7 +128,7 @@ i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3) GLubyte border[4]; GLuint dst_x, dst_y; - memset(state, 0, sizeof(state)); + memset(state, 0, sizeof(*state)); /*We need to refcount these. */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
