Mesa (master): stw/wgl: add null context check in wglBindTexImageARB()

Brian Paul brianp at kemper.freedesktop.org
Fri Mar 31 19:36:00 UTC 2017


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Oct 10 15:54:09 2016 -0600

stw/wgl: add null context check in wglBindTexImageARB()

To avoid dereferencing a null pointer in case wglMakeCurrent() wasn't
called.  Found while debugging SWKOTOR game.

Reviewed-by: Neha Bhende <bhenden at vmware.com>
Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

 src/gallium/state_trackers/wgl/stw_ext_rendertexture.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/state_trackers/wgl/stw_ext_rendertexture.c b/src/gallium/state_trackers/wgl/stw_ext_rendertexture.c
index 5eeb0df21f..9d76696677 100644
--- a/src/gallium/state_trackers/wgl/stw_ext_rendertexture.c
+++ b/src/gallium/state_trackers/wgl/stw_ext_rendertexture.c
@@ -129,6 +129,12 @@ wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer)
     * we do here.
     */
 
+   if (!curctx) {
+      debug_printf("No rendering context in wglBindTexImageARB()\n");
+      SetLastError(ERROR_INVALID_OPERATION);
+      return FALSE;
+   }
+
    fb = stw_framebuffer_from_HPBUFFERARB(hPbuffer);
    if (!fb) {
       debug_printf("Invalid pbuffer handle in wglBindTexImageARB()\n");




More information about the mesa-commit mailing list