generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Use AVERROR return codes instead of -1

Browse Source 
And report why it fails.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Jake Sebastian-Jones
2015-08-05 16:15:39 +10:00
committed by Luca Barbato
parent e5997152f5
commit 9469370fb3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264.c
View File

@@ -1273,15 +1273,20 @@ static int get_avc_nalsize(H264Context *h, const uint8_t *buf,
{ {
int i, nalsize = 0; int i, nalsize = 0;
if (*buf_index >= buf_size - h->nal_length_size) if (*buf_index >= buf_size - h->nal_length_size) {
return -1; av_log(h->avctx, AV_LOG_ERROR,
"AVC: The buffer size %d is too short to read "
"the nal length size %d at the offset %d.\n",
buf_size, h->nal_length_size, *buf_index);
return AVERROR_INVALIDDATA;
}
for (i = 0; i < h->nal_length_size; i++) for (i = 0; i < h->nal_length_size; i++)
nalsize = (nalsize << 8) | buf[(*buf_index)++]; nalsize = (nalsize << 8) | buf[(*buf_index)++];
if (nalsize <= 0 || nalsize > buf_size - *buf_index) { if (nalsize <= 0 || nalsize > buf_size - *buf_index) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"AVC: nal size %d\n", nalsize); "AVC: nal size %d\n", nalsize);
return -1; return AVERROR_INVALIDDATA;
} }
return nalsize; return nalsize;
} }