diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 4a293ebda2bc0b0f5d29b59055604a4bc9e370f4..1e706448c15aeeab421cc21c4bef883301e898e7 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -327,7 +327,7 @@ static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w,
         }
         break;
     default:
-        assert(0);
+        break;
     }
 }
 
@@ -343,7 +343,7 @@ static int decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src,
     uint16_t *end   = start + stride * (f->avctx->height - h + 1) - (1 << log2w);
     int ret;
 
-    if (code < 0 || code > 6)
+    if (code < 0 || code > 6 || log2w < 0)
         return AVERROR_INVALIDDATA;
 
     if (code == 0) {