fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 18:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ARB prog parser: Prevent NULL ptr deref for KIL instruction

Browse source 
The KIL instruction doesn't have a destination register, so
dereferencing dst in asm_instruction_ctor would cause a segfault.
This commit is contained in:
Ian Romanick 2009-07-30 09:41:35 -07:00
parent 600710907c
commit 17534ab88c
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/shader/program_parse.tab.c
View file

@ -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;

10
src/mesa/shader/program_parse.y
View file

@ -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;