cue_tag: check cd_get_track()!=NULL
This commit is contained in:
parent
b89281411f
commit
5649f22322
@ -175,18 +175,20 @@ struct tag *
|
|||||||
cue_tag(struct Cd *cd, unsigned tnum)
|
cue_tag(struct Cd *cd, unsigned tnum)
|
||||||
{
|
{
|
||||||
struct tag *cd_tag, *track_tag;
|
struct tag *cd_tag, *track_tag;
|
||||||
|
struct Track *track;
|
||||||
|
|
||||||
assert(cd != NULL);
|
assert(cd != NULL);
|
||||||
|
|
||||||
if (tnum > 256)
|
track = cd_get_track(cd, tnum);
|
||||||
|
if (track == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* tag from CDtext info */
|
/* tag from CDtext info */
|
||||||
cd_tag = cue_tag_cd(cd_get_cdtext(cd), cd_get_rem(cd));
|
cd_tag = cue_tag_cd(cd_get_cdtext(cd), cd_get_rem(cd));
|
||||||
|
|
||||||
/* tag from TRACKtext info */
|
/* tag from TRACKtext info */
|
||||||
track_tag = cue_tag_track(track_get_cdtext(cd_get_track(cd, tnum)),
|
track_tag = cue_tag_track(track_get_cdtext(track),
|
||||||
track_get_rem(cd_get_track(cd, tnum)));
|
track_get_rem(track));
|
||||||
|
|
||||||
return cue_tag_merge(cd_tag, track_tag);
|
return cue_tag_merge(cd_tag, track_tag);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user