From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 5 May 2017 10:40:59 +0000 (+0200)
Subject: egl-helpers: add missing error check
X-Git-Tag: v2.10.0-rc0~194^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=151c8e608efc29e4dde4a0dbc2e79ebbc86c319c;p=thirdparty%2Fqemu.git

egl-helpers: add missing error check

Code didn't check for qemu_egl_init_dpy_mesa() failures, add it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170505104101.30589-5-kraxel@redhat.com
---

diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index ec2e325e216..b50225158b5 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -80,6 +80,7 @@ static int qemu_egl_rendernode_open(const char *rendernode)
 int egl_rendernode_init(const char *rendernode)
 {
     qemu_egl_rn_fd = -1;
+    int rc;
 
     qemu_egl_rn_fd = qemu_egl_rendernode_open(rendernode);
     if (qemu_egl_rn_fd == -1) {
@@ -93,7 +94,11 @@ int egl_rendernode_init(const char *rendernode)
         goto err;
     }
 
-    qemu_egl_init_dpy_mesa((EGLNativeDisplayType)qemu_egl_rn_gbm_dev);
+    rc = qemu_egl_init_dpy_mesa((EGLNativeDisplayType)qemu_egl_rn_gbm_dev);
+    if (rc != 0) {
+        /* qemu_egl_init_dpy_mesa reports error */
+        goto err;
+    }
 
     if (!epoxy_has_egl_extension(qemu_egl_display,
                                  "EGL_KHR_surfaceless_context")) {