From 17534ab88ce29119f79de8abfcc4170471e8f5a4 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 30 Jul 2009 09:41:35 -0700 Subject: ARB prog parser: Prevent NULL ptr deref for KIL instruction The KIL instruction doesn't have a destination register, so dereferencing dst in asm_instruction_ctor would cause a segfault. --- src/mesa/shader/program_parse.tab.c | 10 +++++++++- src/mesa/shader/program_parse.y | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c index 1d07198897..9b4c4e8277 100644 --- a/src/mesa/shader/program_parse.tab.c +++ b/src/mesa/shader/program_parse.tab.c @@ -4748,7 +4748,15 @@ asm_instruction_ctor(gl_inst_opcode op, if (inst) { _mesa_init_instructions(& inst->Base, 1); inst->Base.Opcode = op; - inst->Base.DstReg = *dst; + + /* In the core ARB extensions only the KIL instruction doesn't have a + * destination register. + */ + if (dst == NULL) { + init_dst_reg(& inst->Base.DstReg); + } else { + inst->Base.DstReg = *dst; + } inst->Base.SrcReg[0] = src0->Base; inst->SrcReg[0] = *src0; diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y index 9a5907a4e0..1a214b38ae 100644 --- a/src/mesa/shader/program_parse.y +++ b/src/mesa/shader/program_parse.y @@ -1879,7 +1879,15 @@ asm_instruction_ctor(gl_inst_opcode op, if (inst) { _mesa_init_instructions(& inst->Base, 1); inst->Base.Opcode = op; - inst->Base.DstReg = *dst; + + /* In the core ARB extensions only the KIL instruction doesn't have a + * destination register. + */ + if (dst == NULL) { + init_dst_reg(& inst->Base.DstReg); + } else { + inst->Base.DstReg = *dst; + } inst->Base.SrcReg[0] = src0->Base; inst->SrcReg[0] = *src0; -- cgit v1.2.3