[FFmpeg-devel] [PATCH 4/5] avcodec/sunrast: Check for availability of maplength before allocating image
Michael Niedermayer
michael at niedermayer.cc
Sat Sep 21 19:57:27 EEST 2019
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/sunrast.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index baf184968f..98bc4ffa63 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -100,14 +100,14 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
if (ret < 0)
return ret;
+ if (buf_end - buf < maplength)
+ return AVERROR_INVALIDDATA;
+
if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
return ret;
p->pict_type = AV_PICTURE_TYPE_I;
- if (buf_end - buf < maplength)
- return AVERROR_INVALIDDATA;
-
if (depth > 8 && maplength) {
av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n");
--
2.23.0
More information about the ffmpeg-devel
mailing list