Handle NULL gracefully. (#314523, Ed Catmur)

2005-08-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle
	NULL gracefully.  (#314523, Ed Catmur)

diff --git a/ChangeLog b/ChangeLog
index 43328682b0583b1b6069f3b3bfa6aabd87edf9e8..e68d25f1c4b3e9c040929a3ecd1c70d8ec0bfb3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle
+       NULL gracefully.  (#314523, Ed Catmur)
+
 2005-08-25  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 43328682b0583b1b6069f3b3bfa6aabd87edf9e8..e68d25f1c4b3e9c040929a3ecd1c70d8ec0bfb3c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle
+       NULL gracefully.  (#314523, Ed Catmur)
+
 2005-08-25  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index db6551cbf05822504ac2ea90bed316e8fdfc4ec8..9cd60bead45aa7edcf429390b2a45d69f0269973 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -4784,6 +4784,9 @@ _gtk_toolbar_elide_underscores (const gchar *original)
   const gchar *p;
   gboolean last_underscore;
   
+  if (!original)
+    return NULL;
+
   q = result = g_malloc (strlen (original) + 1);
   last_underscore = FALSE;