Mesa (master): texgetimage: add missing return on error

Ian Romanick idr at kemper.freedesktop.org
Thu Nov 3 22:27:33 UTC 2011


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

Author: nobled <nobled at dreamwidth.org>
Date:   Wed Oct 19 07:54:06 2011 -0400

texgetimage: add missing return on error

Missed this back in the arb_robustness branch
<6b329b9274b18c50f4177eef7ee087d50ebc1525>.

NOTE: This is a candidate for the 7.11 branch.

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

---

 src/mesa/main/texgetimage.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 3adf7e3..31d49f2 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -851,6 +851,7 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target,
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetnCompressedTexImageARB(out of bounds access:"
                      " bufSize (%d) is too small)", clientMemSize);
+         return GL_TRUE;
       }
    } else {
       /* do bounds checking on PBO write */




More information about the mesa-commit mailing list