Change assert to exception if a dis module contains an invalid magic number. Broken threads now terminate the VM using the default scheduler. Tools can not get a callback for broken threads.

arr committed 10 years ago

Commit 096b0c71 parent 9c1abd69 files · +74 −28Browse files

Showing the changes to src/vm/module_reader.cpp (1 of 9 files). Show all

Unified · Split

         if (!success)
             throw module_reader_exception{ "Failed to read magic number" };
-        assert(header.magic_number == magic_number_constants::xmagic || header.magic_number == magic_number_constants::smagic);
         // If the object file is signed, read in the signature.
         if (header.magic_number == magic_number_constants::smagic)
         {
             const auto bytesRead = reader.get_next_bytes(header.Signature.length, header.Signature.signature.get());
             if (bytesRead != header.Signature.length) throw module_reader_exception{ "Failed to read full signature" };
         }
-        else
+        else if (header.magic_number == magic_number_constants::xmagic)
         {
             header.Signature.length = word_t{ 0 };
         }
+        else
+        {
+            throw module_reader_exception{ "Invalid magic number in module" };
+        }
         auto runtime_flags = operand_t{};
         std::tie(success, runtime_flags) = read_next_operand(reader);