From: Eric Anholt <eric@anholt.net>
Date: Thu, 5 Jan 2012 01:11:33 +0000 (-0800)
Subject: swrast: Fix use of uninitialized value in rbmapping changes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38c6f1e6caf097c0aefc7a9b161e9da3d5235ea9;p=mesa.git

swrast: Fix use of uninitialized value in rbmapping changes.

I'm so surprised that gcc didn't catch this that I feel like I must be
misreading.  srcMap is what we initialize (along with dstMap) from
this map value right after this check.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index a14b44b9d24..1e0f9fe7d1f 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -500,7 +500,7 @@ swrast_fast_copy_pixels(struct gl_context *ctx,
                                   srcRb->Width, srcRb->Height,
                                   GL_MAP_READ_BIT | GL_MAP_WRITE_BIT,
                                   &map, &rowStride);
-      if (!srcMap) {
+      if (!map) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
          return GL_TRUE; /* don't retry with slow path */
       }