commit 318fb537a429ac4c5249f5aa8515b0c11b2bbbe0
author Emma Anholt <emma@anholt.net> Fri Sep 10 12:12:32 2021 -0700
committer Chia-I Wu <olvaffe@gmail.com> Mon Sep 13 17:28:12 2021 +0000
tree 04fa7ab4d96a01b0c46ecdf2691dc3f97e5fc349
parent aa305273b658a73a2c198392948df2c2b179389e

Fix double-free on shader compile failure.

This crashed for me all the time with nir_to_tgsi triggering compile
failures.  The glsl_strings get freed at shader destroy time, no need
to do so here.

Reviewed-by: Chia-I Wu <olvaffe@gmail.com>

src/vrend_renderer.c

diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index b698218..dd31b4f 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -1214,7 +1214,6 @@
       char infolog[65536];
       int len;
       glGetShaderInfoLog(shader->id, 65536, &len, infolog);
-      glDeleteShader(shader->id);
       vrend_report_context_error(sub_ctx->parent, VIRGL_ERROR_CTX_ILLEGAL_SHADER, 0);
       vrend_printf("shader failed to compile\n%s\n", infolog);
       vrend_shader_dump(shader);
@@ -4672,13 +4671,8 @@
 
       struct vrend_shader *shader = sel->current;
       if (shader && !shader->is_compiled) {//shader->sel->type == PIPE_SHADER_FRAGMENT || shader->sel->type == PIPE_SHADER_GEOMETRY) {
-         bool ret;
-
-         ret = vrend_compile_shader(sub_ctx, shader);
-         if (ret == false) {
-            strarray_free(&shader->glsl_strings, true);
+         if (!vrend_compile_shader(sub_ctx, shader))
             return -1;
-         }
       }
       if (vrend_state.use_gles && sel->sinfo.gles_use_tex_query_level)
          gles_emulate_query_texture_levels_mask |= 1 << i;