From: Ray Strode <rstrode@redhat.com>
Date: Sun, 26 Nov 2023 03:44:49 +0000 (-0500)
Subject: label-pango: Handle NULL text better
X-Git-Tag: 23.51.283~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42d07913a0b72b8607190ab31931d5460765f589;p=thirdparty%2Fplymouth.git

label-pango: Handle NULL text better
---

diff --git a/src/plugins/controls/label-pango/plugin.c b/src/plugins/controls/label-pango/plugin.c
index 3fdc4ba7..d53da97c 100644
--- a/src/plugins/controls/label-pango/plugin.c
+++ b/src/plugins/controls/label-pango/plugin.c
@@ -188,7 +188,7 @@ init_pango_text_layout (cairo_t       *cairo_context,
         if (width >= 0)
                 pango_layout_set_width (pango_layout, width * PANGO_SCALE);
 
-        pango_layout_set_text (pango_layout, text, -1);
+        pango_layout_set_text (pango_layout, text ?: "", -1);
         pango_cairo_update_layout (cairo_context, pango_layout);
 
         return pango_layout;
@@ -321,7 +321,7 @@ set_text_for_control (ply_label_plugin_control_t *label,
 {
         ply_rectangle_t dirty_area;
 
-        if (label->text != text) {
+        if (strcmp (label->text ?: "", text ?: "") != 0) {
                 dirty_area = label->area;
                 free (label->text);
                 label->text = strdup (text);