diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-01-30 20:23:55 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-01-30 20:23:55 +0000 |
| commit | dedde474248d1e75396b9e90e141284901e588f1 (patch) | |
| tree | 5769e00fd7f808b94adfdefdb2664b3faffcf002 | |
| parent | b5562a10c8fe37833183be472d46301d56e7b36f (diff) | |
| download | rockbox-dedde474248d1e75396b9e90e141284901e588f1.tar.gz rockbox-dedde474248d1e75396b9e90e141284901e588f1.zip | |
Limit the size of each ID3 metadata item to avoid that the metadata buffer is filled by single items. Fixes FS#11875, FS#9805 and FS#9299.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29174 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/metadata.h | 2 | ||||
| -rw-r--r-- | apps/metadata/id3tags.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/metadata.h b/apps/metadata.h index 8c7188db24..f366aea61c 100644 --- a/apps/metadata.h +++ b/apps/metadata.h @@ -174,8 +174,10 @@ extern const struct afmt_entry audio_formats[AFMT_NUM_CODECS]; #if MEMORYSIZE > 2 #define ID3V2_BUF_SIZE 900 +#define ID3V2_MAX_ITEM_SIZE 120 #else #define ID3V2_BUF_SIZE 300 +#define ID3V2_MAX_ITEM_SIZE 60 #endif enum { diff --git a/apps/metadata/id3tags.c b/apps/metadata/id3tags.c index f3ddd73077..75056a273c 100644 --- a/apps/metadata/id3tags.c +++ b/apps/metadata/id3tags.c @@ -836,6 +836,12 @@ void setid3v2title(int fd, struct mp3entry *entry) if(framelen >= buffersize - bufferpos) framelen = buffersize - bufferpos - 1; + /* Limit the maximum length of an id3 data item to ID3V2_MAX_ITEM_SIZE + bytes. This reduces the chance that the available buffer is filled + by single metadata items like large comments. */ + if (ID3V2_MAX_ITEM_SIZE < framelen) + framelen = ID3V2_MAX_ITEM_SIZE; + logf("id3v2 frame: %.4s", header); /* Check for certain frame headers |