diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index ddbf769..fc21a06 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -1955,6 +1955,11 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
         {
             memcpy(pu1_bitstrm_buf, pu1_buf + u4_length_of_start_code,
                    buflen);
+            /* Decoder may read extra 8 bytes near end of the frame */
+            if((buflen + 8) < buf_size)
+            {
+                memset(pu1_bitstrm_buf + buflen, 0, 8);
+            }
             u4_first_start_code_found = 1;
 
         }