OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/shader/program_parse.tab.c
View File

@@ -4748,7 +4748,15 @@ asm_instruction_ctor(gl_inst_opcode op,
if (inst) { if (inst) {
_mesa_init_instructions(& inst->Base, 1); _mesa_init_instructions(& inst->Base, 1);
inst->Base.Opcode = op; inst->Base.Opcode = op;
/* 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.DstReg = *dst;
}
inst->Base.SrcReg[0] = src0->Base; inst->Base.SrcReg[0] = src0->Base;
inst->SrcReg[0] = *src0; inst->SrcReg[0] = *src0;

8
src/mesa/shader/program_parse.y
View File

@@ -1879,7 +1879,15 @@ asm_instruction_ctor(gl_inst_opcode op,
if (inst) { if (inst) {
_mesa_init_instructions(& inst->Base, 1); _mesa_init_instructions(& inst->Base, 1);
inst->Base.Opcode = op; inst->Base.Opcode = op;
/* 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.DstReg = *dst;
}
inst->Base.SrcReg[0] = src0->Base; inst->Base.SrcReg[0] = src0->Base;
inst->SrcReg[0] = *src0; inst->SrcReg[0] = *src0;