From 320bdeac03a97dafb8929c93df795e1b2e5bc694 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 7 Sep 2011 13:08:22 +0100 Subject: [PATCH] text: Consistently protect against NULL strings When calling clutter_text_set_text_internal() or clutter_text_set_markup_internal() we need to make sure to pass a non-NULL string. --- clutter/clutter-text.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c index 5423b77..afa6a18 100644 --- a/clutter/clutter-text.c +++ b/clutter/clutter-text.c @@ -1186,10 +1186,11 @@ clutter_text_set_property (GObject *gobject, const char *str = g_value_get_string (value); clutter_text_set_contents (self, str); + if (self->priv->use_markup) - clutter_text_set_markup_internal (self, str); + clutter_text_set_markup_internal (self, str ? str : ""); else - clutter_text_set_text_internal (self, str); + clutter_text_set_text_internal (self, str ? str : ""); } break; @@ -4508,6 +4509,7 @@ clutter_text_set_text (ClutterText *self, * Pango markup, and it is logically equivalent to: * * |[ + * /* the order is important */ * clutter_text_set_text (CLUTTER_TEXT (actor), markup); * clutter_text_set_use_markup (CLUTTER_TEXT (actor), TRUE); * ]| @@ -4522,11 +4524,7 @@ clutter_text_set_markup (ClutterText *self, clutter_text_set_use_markup_internal (self, TRUE); clutter_text_set_contents (self, markup); - - if (markup != NULL && *markup != '\0') - clutter_text_set_markup_internal (self, markup); - else - clutter_text_set_text_internal (self, ""); + clutter_text_set_markup_internal (self, markup ? markup : ""); } /** -- 2.7.4