Skip to content

fix: squirrel scanline/border callback memory leak (#2825) #2965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshgoebel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: squirrel scanline/border callback memory leak (#2825) #2965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions src/api/squirrel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1776,29 +1776,37 @@ static void callSquirrelIntCallback(tic_mem* tic, s32 value, void* data, const c
tic_core* core = (tic_core*)tic;
HSQUIRRELVM vm = core->currentVM;

if (vm)
if (!vm) return;

sq_pushroottable(vm); // [root]
sq_pushstring(vm, name, -1); // [root, name]

if (SQ_FAILED(sq_get(vm, -2))) // [root] (name not found)
{
sq_pushroottable(vm);
sq_pushstring(vm, name, -1);
if (SQ_SUCCEEDED(sq_get(vm, -2)))
{
sq_pushroottable(vm);
sq_pushinteger(vm, value);
sq_poptop(vm); // []
return;
}
// [root, fn]
sq_pushroottable(vm); // [root, fn, root]
sq_pushinteger(vm, value); // [root, fn, root, value]

if(SQ_FAILED(sq_call(vm, 2, SQFalse, SQTrue)))
{
sq_getlasterror(vm);
sq_tostring(vm, -1);

const SQChar* errorString = "unknown error";
sq_getstring(vm, -1, &errorString);
if (core->data)
core->data->error(core->data->data, errorString);
sq_pop(vm, 3); // error string, error and root table
}
}
else sq_poptop(vm);
if (SQ_FAILED(sq_call(vm, 2, SQFalse, SQTrue))) // [root, fn]
{
sq_getlasterror(vm); // [root, fn, err]
sq_tostring(vm, -1); // [root, fn, err, str]

const SQChar* errorString = "unknown error";
sq_getstring(vm, -1, &errorString);
if (core->data)
core->data->error(core->data->data, errorString);
sq_pop(vm, 3); // [root] (error string, error, function)
}
else
{
sq_poptop(vm); // [root] (fn)
}

sq_poptop(vm); // [] (root)
}

static void callSquirrelScanline(tic_mem* tic, s32 row, void* data)
Expand Down