From 06103a3046037d5402c5a379a571d89d383a364a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Fri, 7 Aug 2009 23:23:45 +0000 Subject: [PATCH] As cdtext extraction preempts a cddb lookup, make sure we got useful data from cdtext. Out of the 30 CDs I've tried all get reported as having cdtext but only one renders any useful data. This should at least give cddb a shot. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32194 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/cdda/cdda.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/add-ons/kernel/file_systems/cdda/cdda.cpp b/src/add-ons/kernel/file_systems/cdda/cdda.cpp index 3716cad2de..30be6e4f20 100644 --- a/src/add-ons/kernel/file_systems/cdda/cdda.cpp +++ b/src/add-ons/kernel/file_systems/cdda/cdda.cpp @@ -562,6 +562,14 @@ read_cdtext(int fd, struct cdtext &cdtext) free(buffer); + if (cdtext.artist == NULL || cdtext.album == NULL) + return B_ERROR; + + for (int i = 0; i < cdtext.track_count; i++) { + if (cdtext.titles[i] == NULL) + return B_ERROR; + } + sanitize_string(cdtext.artist); sanitize_album(cdtext); sanitize_titles(cdtext);