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

Merged release 0.15.2 from branch 'v0.15.x'

Browse Source 
Conflicts:

	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2009-08-15 21:18:38 +02:00
parent e28a0e97b5 5715534b53
commit f401c1059c
11 changed files with 157 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tag_ape.c
View File

@@ -22,6 +22,7 @@
#include <glib.h>
#include <assert.h>
#include <stdio.h>
static const char *const ape_tag_names[] = {
@@ -95,15 +96,18 @@ tag_ape_load(const char *file)
/* find beginning of ape tag */
tagLen = GUINT32_FROM_LE(footer.length);
if (tagLen < sizeof(footer))
if (tagLen <= sizeof(footer) + 10)
goto fail;
if (tagLen > 1024 * 1024)
/* refuse to load more than one megabyte of tag data */
goto fail;
if (fseek(fp, size - tagLen, SEEK_SET))
goto fail;
/* read tag into buffer */
tagLen -= sizeof(footer);
if (tagLen <= 0)
goto fail;
assert(tagLen > 10);
buffer = g_malloc(tagLen);
if (fread(buffer, 1, tagLen, fp) != tagLen)
goto fail;
@@ -121,7 +125,7 @@ tag_ape_load(const char *file)
/* get the key */
key = p;
while (tagLen - size > 0 && *p != '\0') {
while (tagLen > size && *p != '\0') {
p++;
tagLen--;
}