Module: libav Branch: master Commit: 612cc0712836af2f025b0c68b11da29b9f259d5a
Author: Andreas Cadhalpun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Tue Jan 31 01:59:38 2017 +0100 pgssubdec: reset rle_data_len/rle_remaining_len on allocation error The code relies on their validity and otherwise can try to access a NULL object->rle pointer, causing segmentation faults. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Diego Biurrun <[email protected]> --- libavcodec/pgssubdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 886685b..a6a43ae 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -297,8 +297,11 @@ static int parse_object_segment(AVCodecContext *avctx, av_fast_malloc(&object->rle, &object->rle_buffer_size, rle_bitmap_len); - if (!object->rle) + if (!object->rle) { + object->rle_data_len = 0; + object->rle_remaining_len = 0; return AVERROR(ENOMEM); + } memcpy(object->rle, buf, buf_size); object->rle_data_len = buf_size; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
