commit 36b925eb9d63991ab4d6cb3316566636c605c054
author Vincent Rabaud <vrabaud@google.com> Fri Jan 12 13:44:18 2024 +0100
committer GitHub <noreply@github.com> Fri Jan 12 13:44:18 2024 +0100
tree 38a158bec452d49905711fa2a40b2e8547becd35
parent feb542deb11ec209079cfb7996d76a93bff8270d

Fix AVM header parsing for good (#1934)

src/obu.c

diff --git a/src/obu.c b/src/obu.c
index 9389e9d..e05b5ca 100644
--- a/src/obu.c
+++ b/src/obu.c
@@ -379,9 +379,10 @@
     avifBitsRead(bits, 2);       // enable_superres, enable_cdef
     if (avifBitsRead(bits, 1)) { // enable_restoration
 #if CONFIG_LR_IMPROVEMENTS
-        avifBitsRead(bits, /*RESTORE_SWITCHABLE_TYPES=*/5); // lr_tools_disable_mask[0]
+        const int lr_tools_disable_mask_length = /*RESTORE_SWITCHABLE_TYPES=*/5 - 1;
+        avifBitsRead(bits, lr_tools_disable_mask_length); // lr_tools_disable_mask[0]
         if (avifBitsRead(bits, 1)) {
-            avifBitsRead(bits, /*RESTORE_SWITCHABLE_TYPES=*/5 - 1 - 1); // lr_tools_disable_mask[1]
+            avifBitsRead(bits, lr_tools_disable_mask_length - 1); // lr_tools_disable_mask[1]
         }
 #endif
     }