Revision: 1992
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1992&view=rev
Author: teuf
Date: 2008-05-30 05:04:25 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Patch from Ian Stewart
* src/itdb_itunesdb.c: don't pass NULL sort_composer names down to
jump_table_letter, fixes a crash reported by Andy Busch
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/itdb_itunesdb.c
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-05-30 12:00:21 UTC (rev 1991)
+++ libgpod/trunk/ChangeLog 2008-05-30 12:04:25 UTC (rev 1992)
@@ -1,5 +1,12 @@
2008-05-30 Christophe Fergeau <[EMAIL PROTECTED]>
+ Patch from Ian Stewart
+
+ * src/itdb_itunesdb.c: don't pass NULL sort_composer names down to
+ jump_table_letter, fixes a crash reported by Andy Busch
+
+2008-05-30 Christophe Fergeau <[EMAIL PROTECTED]>
+
* src/Makefile.am:
* src/db-artwork-parser.c:
* src/db-artwork-writer.c:
Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c 2008-05-30 12:00:21 UTC (rev 1991)
+++ libgpod/trunk/src/itdb_itunesdb.c 2008-05-30 12:04:25 UTC (rev 1992)
@@ -3775,6 +3775,7 @@
gunichar chr = 0;
gboolean found_alnum_chars = FALSE;
+ g_return_val_if_fail (p != NULL, '0');
g_assert (g_utf8_validate (p, -1, NULL));
while (*p != '\0') {
@@ -3911,12 +3912,12 @@
else if (tr->composer)
{
ct->composer = g_utf8_collate_key (tr->composer, -1);
- ct->letter_composer = jump_table_letter (tr->sort_composer);
+ ct->letter_composer = jump_table_letter (tr->composer);
}
else
{
ct->composer = g_strdup ("");
- ct->letter_composer = jump_table_letter (tr->composer);
+ ct->letter_composer = '0';
}
ct->track_nr = tr->track_nr;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
