From 78c56d80f90f913e4cbc14c865af308c6af9aeae Mon Sep 17 00:00:00 2001
From: Diego <96022404+dzfrias@users.noreply.github.com>
Date: Sun, 16 Jun 2024 07:12:43 -0700
Subject: [PATCH] LibWasm: Check data segment offset at correct time during
 instantiation

The data segment offset should be checked _before_ checking if the
contents of the segment are non-existent.
---
 .../Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp b/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp
index 7187c314d8d..403add53619 100644
--- a/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp
+++ b/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp
@@ -392,8 +392,6 @@ InstantiationResult AbstractMachine::instantiate(Module const& module, Vector<Ex
                     }
                     main_module_instance.datas().append(*maybe_data_address);
 
-                    if (data.init.is_empty())
-                        return;
                     auto address = main_module_instance.memories()[data.index.value()];
                     auto instance = m_store.get(address);
                     Checked<size_t> checked_offset = data.init.size();
@@ -405,6 +403,8 @@ InstantiationResult AbstractMachine::instantiate(Module const& module, Vector<Ex
                         };
                         return;
                     }
+                    if (data.init.is_empty())
+                        return;
                     instance->data().overwrite(offset, data.init.data(), data.init.size());
                 },
                 [&](DataSection::Data::Passive const& passive) {