From 93ba356544a16e1f2bb0be3550d3b24ec2e5b13a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 19 Jun 2019 07:10:13 +1000 Subject: [PATCH] nouveau: fix frees in unsupported IR error paths. This is pointless in that we won't ever hit those paths in real life, but coverity complains. Fixes: f014ae3c7cce ("nouveau: add support for nir") Reviewed-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nv50/nv50_program.c | 1 + src/gallium/drivers/nouveau/nv50/nv50_state.c | 2 ++ src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 1 + src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 2 ++ 4 files changed, 6 insertions(+) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_program.c b/src/gallium/drivers/nouveau/nv50/nv50_program.c index 940fb9ce25c..a725aedcd8e 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_program.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.c @@ -346,6 +346,7 @@ nv50_program_translate(struct nv50_program *prog, uint16_t chipset, break; default: assert(!"unsupported IR!"); + free(info); return false; } diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index 228feced5d1..89558ee442f 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -768,6 +768,7 @@ nv50_sp_state_create(struct pipe_context *pipe, break; default: assert(!"unsupported IR!"); + free(prog); return NULL; } @@ -864,6 +865,7 @@ nv50_cp_state_create(struct pipe_context *pipe, break; default: assert(!"unsupported IR!"); + free(prog); return NULL; } diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c index c81d8952c98..1ff9f19f139 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c @@ -594,6 +594,7 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset, break; default: assert(!"unsupported IR!"); + free(info); return false; } diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index 2ab51c8529e..7c0f605dc16 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -607,6 +607,7 @@ nvc0_sp_state_create(struct pipe_context *pipe, break; default: assert(!"unsupported IR!"); + free(prog); return NULL; } @@ -739,6 +740,7 @@ nvc0_cp_state_create(struct pipe_context *pipe, break; default: assert(!"unsupported IR!"); + free(prog); return NULL; } -- 2.30.2