diff options
Diffstat (limited to 'src/plugins/id3v24_extractor.c')
-rw-r--r-- | src/plugins/id3v24_extractor.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/id3v24_extractor.c b/src/plugins/id3v24_extractor.c index 8c9cb9b..9055a7b 100644 --- a/src/plugins/id3v24_extractor.c +++ b/src/plugins/id3v24_extractor.c | |||
@@ -138,11 +138,9 @@ EXTRACTOR_id3v24_extract (const unsigned char *data, | |||
138 | int unsync; | 138 | int unsync; |
139 | int extendedHdr; | 139 | int extendedHdr; |
140 | int experimental; | 140 | int experimental; |
141 | int footer; | ||
142 | uint32_t tsize; | 141 | uint32_t tsize; |
143 | uint32_t pos; | 142 | uint32_t pos; |
144 | uint32_t ehdrSize; | 143 | uint32_t ehdrSize; |
145 | uint32_t padding; | ||
146 | uint32_t csize; | 144 | uint32_t csize; |
147 | int i; | 145 | int i; |
148 | uint16_t flags; | 146 | uint16_t flags; |
@@ -162,14 +160,13 @@ EXTRACTOR_id3v24_extract (const unsigned char *data, | |||
162 | experimental = (data[5] & 0x20) > 0; | 160 | experimental = (data[5] & 0x20) > 0; |
163 | if (experimental) | 161 | if (experimental) |
164 | return 0; | 162 | return 0; |
165 | footer = (data[5] & 0x10) > 0; | 163 | /* footer = (data[5] & 0x10) > 0; */ |
166 | tsize = (((data[6] & 0x7F) << 21) | | 164 | tsize = (((data[6] & 0x7F) << 21) | |
167 | ((data[7] & 0x7F) << 14) | | 165 | ((data[7] & 0x7F) << 14) | |
168 | ((data[8] & 0x7F) << 7) | ((data[9] & 0x7F) << 0)); | 166 | ((data[8] & 0x7F) << 7) | ((data[9] & 0x7F) << 0)); |
169 | if (tsize + 10 > size) | 167 | if (tsize + 10 > size) |
170 | return 0; | 168 | return 0; |
171 | pos = 10; | 169 | pos = 10; |
172 | padding = 0; | ||
173 | if (extendedHdr) | 170 | if (extendedHdr) |
174 | { | 171 | { |
175 | ehdrSize = (((data[10] & 0x7F) << 21) | | 172 | ehdrSize = (((data[10] & 0x7F) << 21) | |