From 184522693900814e40c30c090706f6c90af068a5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Jan 2005 15:29:56 +0000 Subject: [PATCH] Don't crash if G_FILENAME_ENCODING is empty. (#164330, Pawel Sakowski) 2005-01-17 Matthias Clasen * glib/gconvert.c (g_get_filename_charsets): Don't crash if G_FILENAME_ENCODING is empty. (#164330, Pawel Sakowski) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gconvert.c | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93d72abef..3aa50c54d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-17 Matthias Clasen + + * glib/gconvert.c (g_get_filename_charsets): Don't crash + if G_FILENAME_ENCODING is empty. (#164330, Pawel Sakowski) + 2005-01-10 Owen Taylor * Makefile.am (EXTRA_DIST): Add missing ChangeLog.pre* diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 93d72abef..3aa50c54d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-01-17 Matthias Clasen + + * glib/gconvert.c (g_get_filename_charsets): Don't crash + if G_FILENAME_ENCODING is empty. (#164330, Pawel Sakowski) + 2005-01-10 Owen Taylor * Makefile.am (EXTRA_DIST): Add missing ChangeLog.pre* diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 93d72abef..3aa50c54d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-01-17 Matthias Clasen + + * glib/gconvert.c (g_get_filename_charsets): Don't crash + if G_FILENAME_ENCODING is empty. (#164330, Pawel Sakowski) + 2005-01-10 Owen Taylor * Makefile.am (EXTRA_DIST): Add missing ChangeLog.pre* diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 93d72abef..3aa50c54d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-01-17 Matthias Clasen + + * glib/gconvert.c (g_get_filename_charsets): Don't crash + if G_FILENAME_ENCODING is empty. (#164330, Pawel Sakowski) + 2005-01-10 Owen Taylor * Makefile.am (EXTRA_DIST): Add missing ChangeLog.pre* diff --git a/glib/gconvert.c b/glib/gconvert.c index 2ebcfdf22..dc065606c 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -1070,7 +1070,7 @@ g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) cache->charset = g_strdup (charset); p = getenv ("G_FILENAME_ENCODING"); - if (p != NULL) + if (p != NULL && p[0] != '\0') { cache->filename_charsets = g_strsplit (p, ",", 0); cache->is_utf8 = (strcmp (cache->filename_charsets[0], "UTF-8") == 0);