KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw: fix double free of NIR IR 

Check the shader IR type first before freeing the NIR IR in
draw_delete_xxx_shader() in case the IR has been converted to TGSI
and the NIR IR has already been freed.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Neha Bhende <bhenden@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16199>
This commit is contained in:
Charmaine Lee 2022-04-26 18:56:32 -07:00
parent f4f350a06c
commit 8d73315bce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/draw/draw_gs.c
View File

@ -960,7 +960,7 @@ void draw_delete_geometry_shader(struct draw_context *draw,
for (i = 0; i < TGSI_MAX_VERTEX_STREAMS; i++)
FREE(dgs->stream[i].primitive_lengths);
if (dgs->state.ir.nir)
if (dgs->state.type == PIPE_SHADER_IR_NIR && dgs->state.ir.nir)
ralloc_free(dgs->state.ir.nir);
FREE((void*) dgs->state.tokens);
FREE(dgs);

4
src/gallium/auxiliary/draw/draw_tess.c
View File

@ -501,7 +501,7 @@ void draw_delete_tess_ctrl_shader(struct draw_context *draw,
}
#endif
if (dtcs->state.ir.nir)
if (dtcs->state.type == PIPE_SHADER_IR_NIR && dtcs->state.ir.nir)
ralloc_free(dtcs->state.ir.nir);
FREE(dtcs);
}
@ -626,7 +626,7 @@ void draw_delete_tess_eval_shader(struct draw_context *draw,
align_free(dtes->tes_input);
}
#endif
if (dtes->state.ir.nir)
if (dtes->state.type == PIPE_SHADER_IR_NIR && dtes->state.ir.nir)
ralloc_free(dtes->state.ir.nir);
FREE(dtes);
}