diff --git a/lib/mp4_generic.cpp b/lib/mp4_generic.cpp
index 9822e4c2..64417337 100644
--- a/lib/mp4_generic.cpp
+++ b/lib/mp4_generic.cpp
@@ -2734,7 +2734,7 @@ namespace MP4{
     }
     size_t count = 0;
     size_t offset = 78;
-    while (offset < payloadSize()){
+    while (offset <= payloadSize() - 8){
       offset += getBoxLen(offset);
       count++;
     }
@@ -2878,7 +2878,7 @@ namespace MP4{
     }
     size_t count = 0;
     size_t offset = 28;
-    while (offset < payloadSize()){
+    while (offset <= payloadSize() - 8){
       offset += getBoxLen(offset);
       count++;
     }