From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
akihiko.odaki@gmail.com
Subject: [PATCH v3 06/12] ui/shader: fix potential leak of shader on error
Date: Mon, 7 Mar 2022 11:46:26 +0400 [thread overview]
Message-ID: <20220307074632.238049-7-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20220307074632.238049-1-marcandre.lureau@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Value of 0 for program and shaders are silently ignored and indicate error.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
ui/shader.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/shader.c b/ui/shader.c
index e8b8d321b7c7..4c80fc831f68 100644
--- a/ui/shader.c
+++ b/ui/shader.c
@@ -130,15 +130,17 @@ static GLuint qemu_gl_create_link_program(GLuint vert, GLuint frag)
static GLuint qemu_gl_create_compile_link_program(const GLchar *vert_src,
const GLchar *frag_src)
{
- GLuint vert_shader, frag_shader, program;
+ GLuint vert_shader, frag_shader, program = 0;
vert_shader = qemu_gl_create_compile_shader(GL_VERTEX_SHADER, vert_src);
frag_shader = qemu_gl_create_compile_shader(GL_FRAGMENT_SHADER, frag_src);
if (!vert_shader || !frag_shader) {
- return 0;
+ goto end;
}
program = qemu_gl_create_link_program(vert_shader, frag_shader);
+
+end:
glDeleteShader(vert_shader);
glDeleteShader(frag_shader);
--
2.35.1.273.ge6ebfd0e8cbb
next prev parent reply other threads:[~2022-03-07 7:57 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 7:46 [PATCH v3 00/12] GL & D-Bus display related fixes marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 01/12] ui/console: move check for compatible GL context marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 02/12] ui/console: move dcl compatiblity check to a callback marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 03/12] ui/console: egl-headless is compatible with non-gl listeners marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 04/12] ui/dbus: associate the DBusDisplayConsole listener with the given console marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 05/12] ui/console: move console compatibility check to dcl_display_console() marcandre.lureau
2022-03-07 7:46 ` marcandre.lureau [this message]
2022-03-07 7:46 ` [PATCH v3 07/12] ui/shader: free associated programs marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 08/12] ui/console: add a dpy_gfx_switch callback helper marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 09/12] ui/console: optionally update after gfx switch marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 10/12] ui/dbus: fix texture sharing marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 11/12] ui/dbus: do not send 2d scanout until gfx_update marcandre.lureau
2022-03-07 7:46 ` [PATCH v3 12/12] ui/console: call gfx_switch() even if the current scanout is GL marcandre.lureau
2022-03-07 8:08 ` Akihiko Odaki
2022-03-07 10:19 ` Marc-André Lureau
2022-03-07 10:34 ` Akihiko Odaki
2022-03-07 11:50 ` Marc-André Lureau
2022-03-07 12:24 ` Akihiko Odaki
2022-03-07 12:32 ` Marc-André Lureau
2022-03-07 12:49 ` Akihiko Odaki
2022-03-08 14:26 ` Marc-André Lureau
2022-03-08 14:42 ` Akihiko Odaki
2022-03-09 8:02 ` Marc-André Lureau
2022-03-09 8:05 ` Akihiko Odaki
2022-03-09 8:11 ` Marc-André Lureau
2022-03-09 8:21 ` Akihiko Odaki
2022-03-09 8:33 ` Marc-André Lureau
2022-03-09 8:34 ` Akihiko Odaki
2022-03-09 8:40 ` Marc-André Lureau
2022-03-09 8:49 ` Akihiko Odaki
2022-03-09 8:54 ` Marc-André Lureau
2022-03-09 9:02 ` Akihiko Odaki
2022-03-09 9:26 ` Gerd Hoffmann
2022-03-09 9:32 ` Akihiko Odaki
2022-03-09 9:53 ` Marc-André Lureau
2022-03-09 10:01 ` Akihiko Odaki
2022-03-09 10:07 ` Marc-André Lureau
2022-03-09 10:20 ` Akihiko Odaki
2022-03-09 10:27 ` Marc-André Lureau
2022-03-09 10:38 ` Akihiko Odaki
2022-03-09 10:45 ` Marc-André Lureau
2022-03-09 10:54 ` Akihiko Odaki
2022-03-09 10:13 ` Gerd Hoffmann
2022-03-09 10:15 ` [PATCH v3 00/12] GL & D-Bus display related fixes Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220307074632.238049-7-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=akihiko.odaki@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).