highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-08 04:59:56 +01:00
parent d1122b7ce5
commit b918d6e2e6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vorbis.c
View File

@@ -71,7 +71,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
codes[p] = 0; codes[p] = 0;
if (bits[p] > 32) if (bits[p] > 32)
return 1; return AVERROR_INVALIDDATA;
for (i = 0; i < bits[p]; ++i) for (i = 0; i < bits[p]; ++i)
exit_at_level[i+1] = 1 << i; exit_at_level[i+1] = 1 << i;
@@ -87,7 +87,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
for (; p < num; ++p) { for (; p < num; ++p) {
if (bits[p] > 32) if (bits[p] > 32)
return 1; return AVERROR_INVALIDDATA;
if (bits[p] == 0) if (bits[p] == 0)
continue; continue;
// find corresponding exit(node which the tree can grow further from) // find corresponding exit(node which the tree can grow further from)
@@ -95,7 +95,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
if (exit_at_level[i]) if (exit_at_level[i])
break; break;
if (!i) // overspecified tree if (!i) // overspecified tree
return 1; return AVERROR_INVALIDDATA;
code = exit_at_level[i]; code = exit_at_level[i];
exit_at_level[i] = 0; exit_at_level[i] = 0;
// construct code (append 0s to end) and introduce new exits // construct code (append 0s to end) and introduce new exits
@@ -116,7 +116,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
//no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC) //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC)
for (p = 1; p < 33; p++) for (p = 1; p < 33; p++)
if (exit_at_level[p]) if (exit_at_level[p])
return 1; return AVERROR_INVALIDDATA;
return 0; return 0;
} }