Re: [FFmpeg-devel] [PATCH 4/5] avcodec/dsicinvideo: Propagate errors from cin_decode_rle()

[Michael Niedermayer]

On Tue, Apr 17, 2018 at 02:13:45AM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/dsicinvideo.c | 16 
>  1 file changed, 12 insertions(+), 4 deletions(-)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 4/5] avcodec/dsicinvideo: Propagate errors from cin_decode_rle()

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer 
---
 libavcodec/dsicinvideo.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c
index f95cbc74a0..add7afa383 100644
--- a/libavcodec/dsicinvideo.c
+++ b/libavcodec/dsicinvideo.c
@@ -226,27 +226,35 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
  * surface.width = surface.pitch */
 switch (bitmap_frame_type) {
 case 9:
-cin_decode_rle(buf, bitmap_frame_size,
+res =  cin_decode_rle(buf, bitmap_frame_size,
cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+if (res < 0)
+return res;
 break;
 case 34:
-cin_decode_rle(buf, bitmap_frame_size,
+res =  cin_decode_rle(buf, bitmap_frame_size,
cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+if (res < 0)
+return res;
 cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
  cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 case 35:
 bitmap_frame_size = cin_decode_huffman(buf, bitmap_frame_size,
cin->bitmap_table[CIN_INT_BMP], cin->bitmap_size);
-cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
+res =  cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], 
bitmap_frame_size,
cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+if (res < 0)
+return res;
 break;
 case 36:
 bitmap_frame_size = cin_decode_huffman(buf, bitmap_frame_size,
cin->bitmap_table[CIN_INT_BMP],
cin->bitmap_size);
-cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
+res = cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+if (res < 0)
+return res;
 cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
  cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
-- 
2.17.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel