From 7003f17229524bc4322bd4e5893e64b40e603ac0 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 27 Dec 2023 14:50:09 -0500 Subject: [PATCH] fade-throbber,space-flares,two-step: Don't crash if no console viewer The splash plugins don't create a console viewer if `plymouth.prefer-fbcon` is on the kernel command line, but expect it to be not NULL regardless. This commit corrects that misconception. --- src/plugins/splash/fade-throbber/plugin.c | 3 +++ src/plugins/splash/space-flares/plugin.c | 3 +++ src/plugins/splash/two-step/plugin.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/plugins/splash/fade-throbber/plugin.c b/src/plugins/splash/fade-throbber/plugin.c index 35b1444c..1d0a6e82 100644 --- a/src/plugins/splash/fade-throbber/plugin.c +++ b/src/plugins/splash/fade-throbber/plugin.c @@ -135,6 +135,9 @@ view_show_prompt_on_console_viewer (view_t *view, { ply_boot_splash_plugin_t *plugin = view->plugin; + if (view->console_viewer == NULL) + return; + if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) ply_console_viewer_print (view->console_viewer, "\n"); diff --git a/src/plugins/splash/space-flares/plugin.c b/src/plugins/splash/space-flares/plugin.c index 1e984bac..9a4fb7e4 100644 --- a/src/plugins/splash/space-flares/plugin.c +++ b/src/plugins/splash/space-flares/plugin.c @@ -462,6 +462,9 @@ view_show_prompt_on_console_viewer (view_t *view, { ply_boot_splash_plugin_t *plugin = view->plugin; + if (view->console_viewer == NULL) + return; + if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) ply_console_viewer_print (view->console_viewer, "\n"); diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c index 83a1a58e..c7c0f81c 100644 --- a/src/plugins/splash/two-step/plugin.c +++ b/src/plugins/splash/two-step/plugin.c @@ -967,6 +967,9 @@ view_show_prompt_on_console_viewer (view_t *view, { ply_boot_splash_plugin_t *plugin = view->plugin; + if (view->console_viewer == NULL) + return; + if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) ply_console_viewer_print (view->console_viewer, "\n");