RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-26 16:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'

Browse Source 
* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf':
  h264_ps: Return meaningful error codes and address a memory leak

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 22:49:50 +02:00
commit 037c9c25e6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264_ps.c
View File

@ -559,7 +559,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h, int ignore_truncation)
fail: fail:
av_free(sps); av_free(sps);
return -1; return AVERROR_INVALIDDATA;
} }
static void build_qp_table(PPS *pps, int t, int index, const int depth) static void build_qp_table(PPS *pps, int t, int index, const int depth)
@ -593,6 +593,7 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length)
PPS *pps; PPS *pps;
int qp_bd_offset; int qp_bd_offset;
int bits_left; int bits_left;
int ret;
if (pps_id >= MAX_PPS_COUNT) { if (pps_id >= MAX_PPS_COUNT) {
av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id); av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id);
@ -606,6 +607,7 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length)
if ((unsigned)pps->sps_id >= MAX_SPS_COUNT || if ((unsigned)pps->sps_id >= MAX_SPS_COUNT ||
!h->sps_buffers[pps->sps_id]) { !h->sps_buffers[pps->sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, "sps_id %u out of range\n", pps->sps_id); av_log(h->avctx, AV_LOG_ERROR, "sps_id %u out of range\n", pps->sps_id);
ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
sps = h->sps_buffers[pps->sps_id]; sps = h->sps_buffers[pps->sps_id];
@ -613,11 +615,13 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length)
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"Invalid luma bit depth=%d\n", "Invalid luma bit depth=%d\n",
sps->bit_depth_luma); sps->bit_depth_luma);
ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} else if (sps->bit_depth_luma == 11 || sps->bit_depth_luma == 13) { } else if (sps->bit_depth_luma == 11 || sps->bit_depth_luma == 13) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"Unimplemented luma bit depth=%d\n", "Unimplemented luma bit depth=%d\n",
sps->bit_depth_luma); sps->bit_depth_luma);
ret = AVERROR_PATCHWELCOME;
goto fail; goto fail;
} }
@ -663,6 +667,7 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length)
pps->ref_count[1] = get_ue_golomb(&h->gb) + 1; pps->ref_count[1] = get_ue_golomb(&h->gb) + 1;
if (pps->ref_count[0] - 1 > 32 - 1 || pps->ref_count[1] - 1 > 32 - 1) { if (pps->ref_count[0] - 1 > 32 - 1 || pps->ref_count[1] - 1 > 32 - 1) {
av_log(h->avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); av_log(h->avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
@ -724,5 +729,5 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length)
fail: fail:
av_free(pps); av_free(pps);
return -1; return ret;
} }