Mirror/wren
1
0
Fork 1
mirror of https://github.com/wren-lang/wren.git synced 2026-01-18 13:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix possibility of having no reallocate function (#954)

Browse Source 
Before, if a config was provided it was expected to have a reallocate function, now it can remain null and the default will be used.
This commit is contained in:
Joram Vandemoortele
2021-04-04 20:24:48 +02:00
committed by GitHub
parent a501fba4bb
commit 33ab8be7e3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vm/wren_vm.c
View File

@ -56,8 +56,8 @@ WrenVM* wrenNewVM(WrenConfiguration* config)
WrenReallocateFn reallocate = defaultReallocate; WrenReallocateFn reallocate = defaultReallocate;
void* userData = NULL; void* userData = NULL;
if (config != NULL) { if (config != NULL) {
reallocate = config->reallocateFn;
userData = config->userData; userData = config->userData;
reallocate = config->reallocateFn ? config->reallocateFn : defaultReallocate;
} }
WrenVM* vm = (WrenVM*)reallocate(NULL, sizeof(*vm), userData); WrenVM* vm = (WrenVM*)reallocate(NULL, sizeof(*vm), userData);
@ -67,6 +67,10 @@ WrenVM* wrenNewVM(WrenConfiguration* config)
if (config != NULL) if (config != NULL)
{ {
memcpy(&vm->config, config, sizeof(WrenConfiguration)); memcpy(&vm->config, config, sizeof(WrenConfiguration));
// We choose to set this after copying,
// rather than modifying the user config pointer
vm->config.reallocateFn = reallocate;
} }
else else
{ {