[tracker] Fixes NB#162585, tracker-extract is crashing for mp3s with id3v24 tags



commit 1fb89cab9afd1f7ce236e0858f0f9b161393e8ea
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Mar 31 22:07:22 2010 +0100

    Fixes NB#162585, tracker-extract is crashing for mp3s with id3v24 tags

 src/tracker-extract/tracker-extract-mp3.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index c9523e7..6dcd2c9 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -1944,7 +1944,7 @@ extract_mp3 (const gchar          *uri,
 	audio_offset = parse_id3v2 (buffer, buffer_size, &md.id3v1, uri, metadata, &md);
 
 	md.title = tracker_coalesce (4, md.id3v24.title2, md.id3v23.title2, md.id3v22.title2, md.id3v1.title);
-	md.lyricist = tracker_coalesce (2, md.id3v24.text, md.id3v23.toly);
+	md.lyricist = tracker_coalesce (4, md.id3v24.text, md.id3v23.toly, md.id3v23.text, md.id3v22.text);
 
 	md.composer = tracker_coalesce (3,
 	                                md.id3v24.composer,
@@ -1968,7 +1968,6 @@ extract_mp3 (const gchar          *uri,
 	                                      md.id3v22.recording_time, md.id3v22.release_time,
 	                                      md.id3v1.recording_time);
 	md.publisher = tracker_coalesce (3, md.id3v24.publisher, md.id3v23.publisher, md.id3v22.publisher);
-	md.text = tracker_coalesce (3, md.id3v24.text, md.id3v23.text, md.id3v22.text);
 	md.copyright = tracker_coalesce (3, md.id3v24.copyright, md.id3v23.copyright, md.id3v22.copyright);
 	md.comment = tracker_coalesce (7,
 	                               md.id3v24.title3, md.id3v24.comment,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]