Mesa (master): glsl: Return NULL on _slan_gen_asm error path on non-debug builds.

Vinson Lee vlee at kemper.freedesktop.org
Thu Mar 4 09:02:44 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Mar  4 00:58:36 2010 -0800

glsl: Return NULL on _slan_gen_asm error path on non-debug builds.

Exit the function early on the error path, instead of continuing, to
prevent a null pointer dereference later on.

---

 src/mesa/shader/slang/slang_codegen.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 6d1cea2..809355c 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1894,6 +1894,7 @@ _slang_gen_asm(slang_assemble_ctx *A, slang_operation *oper,
       _mesa_problem(NULL, "undefined __asm function %s\n",
                     (char *) oper->a_id);
       assert(info);
+      return NULL;
    }
    assert(info->NumParams <= 3);
 




More information about the mesa-commit mailing list