Mesa (master): swrast: Avoid aliasing violation.

Matt Turner mattst88 at kemper.freedesktop.org
Tue Jul 26 19:12:39 UTC 2016


Module: Mesa
Branch: master
Commit: a1e9b72102f21426b6c4e6b47ac1742eb79d904f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1e9b72102f21426b6c4e6b47ac1742eb79d904f

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu May 26 15:52:33 2016 -0700

swrast: Avoid aliasing violation.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/swrast/s_masking.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c
index c95587b..c10bf1a 100644
--- a/src/mesa/swrast/s_masking.c
+++ b/src/mesa/swrast/s_masking.c
@@ -56,8 +56,8 @@ _swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,
     * Note that we're not using span->array->mask[] here.  We could...
     */
    if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-      /* treat 4xGLubyte as 1xGLuint */
-      const GLuint srcMask = *((GLuint *) ctx->Color.ColorMask[buf]);
+      GLuint srcMask;
+      memcpy(&srcMask, ctx->Color.ColorMask[buf], sizeof(srcMask));
       const GLuint dstMask = ~srcMask;
       const GLuint *dst = (const GLuint *) rbPixels;
       GLuint *src = (GLuint *) span->array->rgba8;




More information about the mesa-commit mailing list