fix bug #877122: problem parsing cuesheet with CATALOG entry

diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c
index a8f5149..d95b74f 100644 (file)
--- a/src/share/grabbag/cuesheet.c
+++ b/src/share/grabbag/cuesheet.c
@@ -140,8 +140,9 @@ static FLAC__int64 local__parse_msf_(const char *s)
        return ret;
 }
 
-static char *local__get_field_(char **s)
+static char *local__get_field_(char **s, FLAC__bool allow_quotes)
 {
+       FLAC__bool has_quote = false;
        char *p;
 
        FLAC__ASSERT(0 != s);
@@ -153,12 +154,33 @@ static char *local__get_field_(char **s)
        while(**s && 0 != strchr(" \t\r\n", **s))
                (*s)++;
 
-       if(**s == 0)
+       if(**s == 0) {
                *s = 0;
+               return 0;
+       }
+
+       if(allow_quotes && (**s == '"')) {
+               has_quote = true;
+               (*s)++;
+               if(**s == 0) {
+                       *s = 0;
+                       return 0;
+               }
+       }
 
        p = *s;
 
-       if(p) {
+       if(has_quote) {
+               *s = strchr(*s, '\"');
+               /* if there is no matching end quote, it's an error */
+               if(0 == *s)
+                       p = *s = 0;
+               else {
+                       **s = '\0';
+                       (*s)++;
+               }
+       }
+       else {
                while(**s && 0 == strchr(" \t\r\n", **s))
                        (*s)++;
                if(**s) {
@@ -199,13 +221,13 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                        return false;
                }
 
-               if(0 != (field = local__get_field_(&line))) {
+               if(0 != (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                        if(0 == FLAC__STRCASECMP(field, "CATALOG")) {
                                if(disc_has_catalog) {
                                        *error_message = "found multiple CATALOG commands";
                                        return false;
                                }
-                               if(0 == (field = local__get_field_(&line))) {
+                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/true))) {
                                        *error_message = "CATALOG is missing catalog number";
                                        return false;
                                }
@@ -229,7 +251,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                        *error_message = "FLAGS command must come after TRACK but before INDEX";
                                        return false;
                                }
-                               while(0 != (field = local__get_field_(&line))) {
+                               while(0 != (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        if(0 == FLAC__STRCASECMP(field, "PRE"))
                                                cs->tracks[cs->num_tracks-1].pre_emphasis = 1;
                                }
@@ -242,7 +264,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                        *error_message = "found INDEX before any TRACK";
                                        return false;
                                }
-                               if(0 == (field = local__get_field_(&line))) {
+                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        *error_message = "INDEX is missing index number";
                                        return false;
                                }
@@ -270,7 +292,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                        return false;
                                }
                                /*@@@ search for duplicate track number? */
-                               if(0 == (field = local__get_field_(&line))) {
+                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        *error_message = "INDEX is missing an offset after the index number";
                                        return false;
                                }
@@ -320,7 +342,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                        *error_message = "ISRC command must come after TRACK but before INDEX";
                                        return false;
                                }
-                               if(0 == (field = local__get_field_(&line))) {
+                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        *error_message = "ISRC is missing ISRC number";
                                        return false;
                                }
@@ -350,7 +372,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                                return false;
                                        }
                                }
-                               if(0 == (field = local__get_field_(&line))) {
+                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        *error_message = "TRACK is missing track number";
                                        return false;
                                }
@@ -372,7 +394,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                        return false;
                                }
                                /*@@@ search for duplicate track number? */
-                               if(0 == (field = local__get_field_(&line))) {
+                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        *error_message = "TRACK is missing a track type after the track number";
                                        return false;
                                }
@@ -387,10 +409,10 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                track_has_isrc = false;
                        }
                        else if(0 == FLAC__STRCASECMP(field, "REM")) {
-                               if(0 != (field = local__get_field_(&line))) {
+                               if(0 != (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                        if(0 == strcmp(field, "FLAC__lead-in")) {
                                                FLAC__int64 xx;
-                                               if(0 == (field = local__get_field_(&line))) {
+                                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                                        *error_message = "FLAC__lead-in is missing offset";
                                                        return false;
                                                }
@@ -412,7 +434,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                                        *error_message = "multiple FLAC__lead-out commands";
                                                        return false;
                                                }
-                                               if(0 == (field = local__get_field_(&line))) {
+                                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                                        *error_message = "FLAC__lead-out is missing track number";
                                                        return false;
                                                }
@@ -423,7 +445,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
                                                }
                                                forced_leadout_track_num = (unsigned)track_num;
                                                /*@@@ search for duplicate track number? */
-                                               if(0 == (field = local__get_field_(&line))) {
+                                               if(0 == (field = local__get_field_(&line, /*allow_quotes=*/false))) {
                                                        *error_message = "FLAC__lead-out is missing offset";
                                                        return false;
                                                }