]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
script: Don't crash for scripts without input validation functions
authorRay Strode <rstrode@redhat.com>
Tue, 12 Apr 2022 21:23:14 +0000 (17:23 -0400)
committerRay Strode <rstrode@redhat.com>
Tue, 12 Apr 2022 21:25:50 +0000 (17:25 -0400)
commit 5d1b49c601a085120e834c1e9134593318465eec adds support for
filtering input to plymouthd and the script plugin.

The script plugin additions, unfortunately, fail to properly handle
scripts that don't add a validation function.

This commit fixes that by assuming no validation function means
no filtering.

Closes: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/175
src/plugins/splash/script/script-lib-plymouth.c

index 6be7199e3d7acc5c68d7096c69dd125814e08484..4848580e71b188ad7c1cfdb7554b63158b62dce1 100644 (file)
@@ -387,6 +387,10 @@ bool script_lib_plymouth_on_validate_input (script_state_t             *state,
                                             const char                 *add_text)
 {
         bool input_valid;
+
+        if (script_obj_is_null (data->script_validate_input_func))
+                return true;
+
         script_obj_t *entry_text_obj = script_obj_new_string (entry_text);
         script_obj_t *add_text_obj = script_obj_new_string (add_text);
         script_return_t ret = script_execute_object (state,