diff options
| author | Tim Janik <timj@gtk.org> | 2002-04-04 23:10:58 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2002-04-04 23:10:58 +0000 |
| commit | cca4abf498309f3aff2a0d924f23b3d6bacc82d9 (patch) | |
| tree | 4452130d9485968d06b6ad322cd0e22f5ed8eea6 /gdk/x11 | |
| parent | e61fd79f19dcb1dfe3ca507696ab40345ca56b35 (diff) | |
| download | gtk+-cca4abf498309f3aff2a0d924f23b3d6bacc82d9.tar.gz | |
fix segfault upon NULL return from gdk_utf8_to_string_target().
Fri Apr 5 01:06:15 2002 Tim Janik <timj@gtk.org>
* gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault
upon NULL return from gdk_utf8_to_string_target().
* gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix
return value comment to mention NULL returns upon EMFILE.
Diffstat (limited to 'gdk/x11')
| -rw-r--r-- | gdk/x11/gdkselection-x11.c | 3 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index 3ddd69e036..dc37ecc365 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -591,7 +591,8 @@ sanitize_utf8 (const gchar *src) * * Return value: the newly-allocated string, or %NULL if the * conversion failed. (It should not fail for - * any properly formed UTF-8 string.) + * any properly formed UTF-8 string unless system + * limits like memory or file descriptors are exceeded.) **/ gchar * gdk_utf8_to_string_target (const gchar *str) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index c3379f76ee..912907d348 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1819,7 +1819,7 @@ set_text_property (GdkWindow *window, { prop_type = XA_STRING; prop_text = gdk_utf8_to_string_target (utf8_str); - prop_length = strlen (prop_text); + prop_length = prop_text ? strlen (prop_text) : 0; prop_format = 8; } else |