diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9f6437cd8f..d8d0a7d4f3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3875,7 +3875,11 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
                     break;
             }
 
-            if(buf_index+3 >= buf_size) break;
+
+            if (buf_index + 3 >= buf_size) {
+                buf_index = buf_size;
+                break;
+            }
 
             buf_index+=3;
             if(buf_index >= next_avc) continue;