Merge branch 'main' of https://github.com/wasm3/wasm3 into main

source/m3_parse.c

@@ -591,33 +591,32 @@ _   (Read_u32 (& version, & pos, end));
 
     _throwif (m3Err_wasmMalformed, magic != 0x6d736100);
     _throwif (m3Err_incompatibleWasmVersion, version != 1);
-                                                                                    m3log (parse,  "found magic + version");
-    u8 previousSection = 0;
+
+    static const u8 sectionsOrder[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 10, 11, 0 }; // 0 is a placeholder
+    u8 expectedSection = 0;
 
     while (pos < end)
     {
         u8 section;
 _       (ReadLEB_u7 (& section, & pos, end));
 
-        if (section > previousSection or                    // from the spec: sections must appear in order
-            section == 0 or                                 // custom section
-            (section == 12 and previousSection == 9) or     // if present, DataCount goes after Element
-            (section == 10 and previousSection == 12))      // and before Code
-        {
-            u32 sectionLength;
-_           (ReadLEB_u32 (& sectionLength, & pos, end));
-            _throwif(m3Err_wasmMalformed, pos + sectionLength > end);
-_           (ParseModuleSection (module, section, pos, sectionLength));
+        if (section != 0) {
+            // Ensure sections appear only once and in order
+            while (sectionsOrder[expectedSection++] != section) {
+                _throwif(m3Err_misorderedWasmSection, expectedSection >= 12);
+            }
+        }
 
-            pos += sectionLength;
+        u32 sectionLength;
+_       (ReadLEB_u32 (& sectionLength, & pos, end));
+        _throwif(m3Err_wasmMalformed, pos + sectionLength > end);
 
-            if (section)
-                previousSection = section;
-        }
-        else _throw (m3Err_misorderedWasmSection);
+_       (ParseModuleSection (module, section, pos, sectionLength));
+
+        pos += sectionLength;
     }
 
-    } _catch:
+} _catch:
 
     if (result)
     {