obu: also check frame_size_limit with Frame Header OBUs

1 files changed, 8 insertions, 7 deletions

diff --git a/src/obu.c b/src/obu.c
index 147887b..2c095ae 100644
--- a/src/obu.c
+++ b/src/obu.c
@@ -1297,13 +1297,6 @@ int dav1d_parse_obus(Dav1dContext *const c, Dav1dData *const in, int global) {
                 c->frame_hdr = NULL;
                 return DAV1D_ERR(EINVAL);
             }
-
-            break;
-        }
-        // OBU_FRAMEs shouldn't be signalled with show_existing_frame
-        if (c->frame_hdr->show_existing_frame) {
-            c->frame_hdr = NULL;
-            goto error;
         }
 
         if (c->frame_size_limit && (int64_t)c->frame_hdr->width[1] *
@@ -1315,6 +1308,14 @@ int dav1d_parse_obus(Dav1dContext *const c, Dav1dData *const in, int global) {
             return DAV1D_ERR(ERANGE);
         }
 
+        if (type != OBU_FRAME)
+            break;
+        // OBU_FRAMEs shouldn't be signaled with show_existing_frame
+        if (c->frame_hdr->show_existing_frame) {
+            c->frame_hdr = NULL;
+            goto error;
+        }
+
         // This is the frame header at the start of a frame OBU.
         // There's no trailing bit at the end to skip, but we do need
         // to align to the next byte.