X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxan.c;h=bccbe24d85b7489c18f14c463abf52a882adef24;hb=4116151a4bf35cffd2b55b028e714bb2c383c86f;hp=25e62e66a255467c11cffbfba33ddf13f46dd98d;hpb=6f5f7f705d10e639cf047be216a94de1e39a96e9;p=ffmpeg

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 25e62e66a25..bccbe24d85b 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -359,17 +359,29 @@ static int xan_wc3_decode_frame(XanContext *s) {
 
         case 9:
         case 19:
+            if (buf_end - size_segment < 1) {
+                av_log(s->avctx, AV_LOG_ERROR, "size_segment overread\n");
+                return AVERROR_INVALIDDATA;
+            }
             size = *size_segment++;
             break;
 
         case 10:
         case 20:
+            if (buf_end - size_segment < 2) {
+                av_log(s->avctx, AV_LOG_ERROR, "size_segment overread\n");
+                return AVERROR_INVALIDDATA;
+            }
             size = AV_RB16(&size_segment[0]);
             size_segment += 2;
             break;
 
         case 11:
         case 21:
+            if (buf_end - size_segment < 3) {
+                av_log(s->avctx, AV_LOG_ERROR, "size_segment overread\n");
+                return AVERROR_INVALIDDATA;
+            }
             size = AV_RB24(size_segment);
             size_segment += 3;
             break;