diff --git a/ChangeLog b/ChangeLog index a5ba1d764..7766db474 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-28 Matthias Clasen + + * glib/gstrfuncs.c (g_strcompress): Warn and don't crash + when meeting a trailing \\. (#301373, Benjamin Otte) + 2005-04-27 Tor Lillqvist * glib/gconvert.c (open_converter, g_convert_with_iconv): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a5ba1d764..7766db474 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-04-28 Matthias Clasen + + * glib/gstrfuncs.c (g_strcompress): Warn and don't crash + when meeting a trailing \\. (#301373, Benjamin Otte) + 2005-04-27 Tor Lillqvist * glib/gconvert.c (open_converter, g_convert_with_iconv): Don't diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a5ba1d764..7766db474 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-04-28 Matthias Clasen + + * glib/gstrfuncs.c (g_strcompress): Warn and don't crash + when meeting a trailing \\. (#301373, Benjamin Otte) + 2005-04-27 Tor Lillqvist * glib/gconvert.c (open_converter, g_convert_with_iconv): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a5ba1d764..7766db474 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-04-28 Matthias Clasen + + * glib/gstrfuncs.c (g_strcompress): Warn and don't crash + when meeting a trailing \\. (#301373, Benjamin Otte) + 2005-04-27 Tor Lillqvist * glib/gconvert.c (open_converter, g_convert_with_iconv): Don't diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 80789881b..7cdb3ea5c 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -1966,6 +1966,9 @@ g_strcompress (const gchar *source) p++; switch (*p) { + case '\0': + g_warning ("g_strcompress: trailing \\"); + goto out; case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': *q = 0; @@ -2002,6 +2005,7 @@ g_strcompress (const gchar *source) *q++ = *p; p++; } + out: *q = 0; return dest;