Skip to content

Commit ecd15a3

Browse files
committed
Fix bug with seq_alloc_sequential not respecting a run-time disabled arena
1 parent 7383575 commit ecd15a3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

engine/src/script/script.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ gaddr_t Script::guest_alloc(gaddr_t bytes)
548548

549549
gaddr_t Script::guest_alloc_sequential(gaddr_t bytes)
550550
{
551-
return machine().arena().seq_alloc_aligned(bytes, 8);
551+
return machine().arena().seq_alloc_aligned(bytes, 8, machine().memory.initial_rodata_end() != 0x0);
552552
}
553553

554554
bool Script::guest_free(gaddr_t addr)

engine/src/script/script.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ template <typename T> struct GuestObjects
523523
other.m_address = 0x0;
524524
other.m_count = 0u;
525525
}
526+
GuestObjects& operator=(GuestObjects&& other) = delete;
526527

527528
~GuestObjects()
528529
{

0 commit comments

Comments
 (0)