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

avcodec/xiph: Return better error codes

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-05-17 18:04:52 +02:00
parent b7d334e7b6
commit 6fb79c1af5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/xiph.c
View File

@ -35,7 +35,7 @@ int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size,
header_start[i] = extradata; header_start[i] = extradata;
extradata += header_len[i]; extradata += header_len[i];
if (overall_len > extradata_size - header_len[i]) if (overall_len > extradata_size - header_len[i])
return -1; return AVERROR_INVALIDDATA;
overall_len += header_len[i]; overall_len += header_len[i];
} }
} else if (extradata_size >= 3 && extradata_size < INT_MAX - 0x1ff && extradata[0] == 2) { } else if (extradata_size >= 3 && extradata_size < INT_MAX - 0x1ff && extradata[0] == 2) {
@ -50,7 +50,7 @@ int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size,
header_len[i] += *extradata; header_len[i] += *extradata;
overall_len += *extradata; overall_len += *extradata;
if (overall_len > extradata_size) if (overall_len > extradata_size)
return -1; return AVERROR_INVALIDDATA;
} }
header_len[2] = extradata_size - overall_len; header_len[2] = extradata_size - overall_len;
header_start[0] = extradata; header_start[0] = extradata;