diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2008-12-07 11:46:05 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2008-12-07 11:46:05 +0000 |
| commit | d96089c62f807989453b2fb87558e0b5fe5b2ea0 (patch) | |
| tree | d83d6946e70f9c889368c23bae991a8af008036b | |
| parent | 195cdd3140589e0a484518e34f9effa036377b85 (diff) | |
| download | libgpod-d96089c62f807989453b2fb87558e0b5fe5b2ea0.tar.gz libgpod-d96089c62f807989453b2fb87558e0b5fe5b2ea0.tar.xz libgpod-d96089c62f807989453b2fb87558e0b5fe5b2ea0.zip | |
* itdb_itunesdb.c (jump_table_letter): don't terminate when
an invalid utf8 string is encountered (replaced g_assert() with
g_return_val_if_fail()).
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2157 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-12-07 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * itdb_itunesdb.c (jump_table_letter): don't terminate when + an invalid utf8 string is encountered (replaced g_assert() with + g_return_val_if_fail()). + 2008-11-30 Jorg Schuler <jcsjcs at users.sourceforge.net> * configure.ac: don't add "-Wall" to CFLAGS diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index 2f45320..78cb943 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -3775,7 +3775,7 @@ static gunichar2 jump_table_letter (gchar *p) gboolean found_alnum_chars = FALSE; g_return_val_if_fail (p != NULL, '0'); - g_assert (g_utf8_validate (p, -1, NULL)); + g_return_val_if_fail (g_utf8_validate (p, -1, NULL), '0'); while (*p != '\0') { chr = g_utf8_get_char (p); |