aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-07 19:21:08 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-07 19:21:08 +0800
commitec6cebc3342d4b8777f690df0f687fc00d3d7122 (patch)
tree0dcceda1df5b8d608e53f611da9d5797be0788ff /src
parent61281d748f97710b1561ab81cdc1ce33d47f0b78 (diff)
downloadgsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.tar
gsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.tar.gz
gsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.tar.bz2
gsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.tar.lz
gsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.tar.xz
gsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.tar.zst
gsoc2013-empathy-ec6cebc3342d4b8777f690df0f687fc00d3d7122.zip
status_icon_update_notification: don't crash if event->message is NULL
g_markup_escape_text isn't NULL-safe so we should be sure that event->message is not NULL before calling it.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-status-icon.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 79e59c5f5..bbb97f410 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -138,7 +138,10 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
}
if (priv->event) {
- gchar *message_esc = g_markup_escape_text (priv->event->message, -1);
+ gchar *message_esc = NULL;
+
+ if (priv->event->message != NULL)
+ message_esc = g_markup_escape_text (priv->event->message, -1);
if (priv->notification) {
notify_notification_update (priv->notification,