From: Ray Strode <rstrode@redhat.com>
Date: Wed, 18 Jan 2017 15:07:00 +0000 (-0500)
Subject: device-manager: handle NULL renderer better
X-Git-Tag: 0.9.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdda9af2c305ecf57407856b1d061c076ae8fe4a;p=thirdparty%2Fplymouth.git

device-manager: handle NULL renderer better

Right now we'll pass a NULL device name and crash if the renderer
fails to open.

This commit fixes that.
---

diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index 4004e114..b4c33d4f 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -689,16 +689,18 @@ create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
                                 return;
                 }
 
-                old_renderer = ply_hashtable_lookup (manager->renderers,
-                                                     (void *) ply_renderer_get_device_name (renderer));
+                if (renderer != NULL) {
+                        old_renderer = ply_hashtable_lookup (manager->renderers,
+                                                             (void *) ply_renderer_get_device_name (renderer));
 
-                if (old_renderer != NULL) {
-                        ply_trace ("ignoring device %s since it's alerady managed",
-                                   ply_renderer_get_device_name (renderer));
-                        ply_renderer_free (renderer);
+                        if (old_renderer != NULL) {
+                                ply_trace ("ignoring device %s since it's alerady managed",
+                                           ply_renderer_get_device_name (renderer));
+                                ply_renderer_free (renderer);
 
-                        renderer = NULL;
-                        return;
+                                renderer = NULL;
+                                return;
+                        }
                 }
         }