diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index f95f538f6c..4506c9b815 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -434,6 +434,8 @@ static int decode_blocks(SnowContext *s){
 
     for(y=0; y<h; y++){
         for(x=0; x<w; x++){
+            if (s->c.bytestream >= s->c.bytestream_end)
+                return AVERROR_INVALIDDATA;
             if ((res = decode_q_branch(s, 0, x, y)) < 0)
                 return res;
         }