oreodave/avm
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs with ordering of bytes in some operations

Browse Source 
Also fixed an overflow error in vm_dup_word, where I underflow the
index of vm->stack.data which causes a buffer overflow.
This commit is contained in:
Aryadev Chavali
2023-10-23 00:28:39 +01:00
parent ae9bc91713
commit 19eb401498
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime.c
View File

@@ -504,7 +504,8 @@ err_t vm_dup_word(vm_t *vm, word w)
return ERR_STACK_UNDERFLOW; return ERR_STACK_UNDERFLOW;
byte bytes[WORD_SIZE] = {0}; byte bytes[WORD_SIZE] = {0};
for (size_t i = 0; i < WORD_SIZE; ++i) for (size_t i = 0; i < WORD_SIZE; ++i)
bytes[i] = vm->stack.data[vm->stack.ptr - 1 - (WORD_SIZE * (w + 1)) + i]; bytes[WORD_SIZE - i - 1] =
vm->stack.data[vm->stack.ptr - (WORD_SIZE * (w + 1)) + i];
return vm_push_word(vm, DWORD(convert_bytes_to_word(bytes))); return vm_push_word(vm, DWORD(convert_bytes_to_word(bytes)));
} }
@@ -525,7 +526,7 @@ err_t vm_pop_hword(vm_t *vm, data_t *ret)
{ {
data_t b = {0}; data_t b = {0};
vm_pop_byte(vm, &b); vm_pop_byte(vm, &b);
bytes[HWORD_SIZE - 1 - i] = b.as_byte; bytes[i] = b.as_byte;
} }
*ret = DWORD(convert_bytes_to_hword(bytes)); *ret = DWORD(convert_bytes_to_hword(bytes));
return ERR_OK; return ERR_OK;
@@ -540,7 +541,7 @@ err_t vm_pop_word(vm_t *vm, data_t *ret)
{ {
data_t b = {0}; data_t b = {0};
vm_pop_byte(vm, &b); vm_pop_byte(vm, &b);
bytes[WORD_SIZE - 1 - i] = b.as_byte; bytes[i] = b.as_byte;
} }
*ret = DWORD(convert_bytes_to_word(bytes)); *ret = DWORD(convert_bytes_to_word(bytes));
return ERR_OK; return ERR_OK;