From: Ray Strode Date: Fri, 22 Dec 2023 13:27:30 +0000 (-0500) Subject: ply-label: Make NULL safe X-Git-Tag: 23.356.9~4^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a045f01568f53ca10ef8b76d9f507ccd3546e9d8;p=thirdparty%2Fplymouth.git ply-label: Make NULL safe commit 42d07913a0b72b8607190ab31931d5460765f589 made the pango plugin NULL safe but the same problem exists in the freetype plugin. This commit makes things NULL safe a layer higher. --- diff --git a/src/libply-splash-graphics/ply-label.c b/src/libply-splash-graphics/ply-label.c index acdae83b..0c03ebc5 100644 --- a/src/libply-splash-graphics/ply-label.c +++ b/src/libply-splash-graphics/ply-label.c @@ -157,7 +157,7 @@ ply_label_load_plugin (ply_label_t *label) if (label->text != NULL) { if (label->rich_text == NULL) { label->plugin_interface->set_text_for_control (label->control, - label->text); + label->text?: ""); } else { label->plugin_interface->set_rich_text_for_control (label->control, label->rich_text, @@ -259,7 +259,7 @@ ply_label_set_text (ply_label_t *label, return; label->plugin_interface->set_text_for_control (label->control, - text); + text?: ""); } void