oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Our id3 tag buffer should be an array of bytes, not an array of pointers to bytes. Now I know where those warnings came from...

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4540 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman
2006-08-03 04:34:51 +00:00
parent 055e166619
commit c0036bcb45
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tag.c
View File

@@ -233,7 +233,7 @@ static int getId3v2FooterSize(FILE * stream, long offset, int whence)
static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence) static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
{ {
struct id3_tag *tag; struct id3_tag *tag;
id3_byte_t *buf[ID3_TAG_BUFLEN]; id3_byte_t buf[ID3_TAG_BUFLEN];
id3_byte_t *mbuf; id3_byte_t *mbuf;
int tagsize; int tagsize;
int bufsize; int bufsize;
@@ -244,12 +244,12 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
if (bufsize <= 0) return NULL; if (bufsize <= 0) return NULL;
/* Look for a tag header */ /* Look for a tag header */
tagsize = id3_tag_query((const id3_byte_t *)buf, bufsize); tagsize = id3_tag_query(buf, bufsize);
if (tagsize <= 0) return NULL; if (tagsize <= 0) return NULL;
if (tagsize <= bufsize) { if (tagsize <= bufsize) {
/* Got an id3 tag, and it fits in buf */ /* Got an id3 tag, and it fits in buf */
tag = id3_tag_parse((const id3_byte_t *)buf, tagsize); tag = id3_tag_parse(buf, tagsize);
} else { } else {
/* Got an id3tag that overflows buf, so get a new one */ /* Got an id3tag that overflows buf, so get a new one */
mbuf = malloc(tagsize); mbuf = malloc(tagsize);
@@ -261,7 +261,7 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
return NULL; return NULL;
} }
tag = id3_tag_parse((const id3_byte_t *)mbuf, tagsize); tag = id3_tag_parse(mbuf, tagsize);
free(mbuf); free(mbuf);
} }