git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-15 04:24:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine: fix an invalid memory access.

Browse source 
the surface and mesh data can be missed by an invalid condition.
this fixes an invalid memory access problem.

Issue: https://github.com/thorvg/thorvg/issues/1671
This commit is contained in:
Hermet Park 2023-09-26 17:21:42 +09:00 • committed by Hermet Park
parent 92b6f9dc48
commit 51c3a8912c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/renderer/sw_engine/tvgSwRenderer.cpp
View file

@ -773,10 +773,8 @@ RenderData SwRenderer::prepare(Surface* surface, const RenderMesh* mesh, RenderD
//prepare task //prepare task
auto task = static_cast<SwImageTask*>(data); auto task = static_cast<SwImageTask*>(data);
if (!task) task = new SwImageTask; if (!task) task = new SwImageTask;
if (flags & RenderUpdateFlag::Image) { task->source = surface;
task->source = surface; task->mesh = mesh;
task->mesh = mesh;
}
return prepareCommon(task, transform, clips, opacity, flags); return prepareCommon(task, transform, clips, opacity, flags);
} }

1
wasm_cross.txt
View file

@ -13,6 +13,7 @@ exe_suffix = 'js'
[built-in options] [built-in options]
cpp_args = ['-Wshift-negative-value', '-flto', '-Os', '-fno-exceptions'] cpp_args = ['-Wshift-negative-value', '-flto', '-Os', '-fno-exceptions']
cpp_link_args = ['-Wshift-negative-value', '-flto', '-Os', '-fno-exceptions', '--bind', '-sWASM=1', '-sALLOW_MEMORY_GROWTH=1', '-sFORCE_FILESYSTEM=1'] cpp_link_args = ['-Wshift-negative-value', '-flto', '-Os', '-fno-exceptions', '--bind', '-sWASM=1', '-sALLOW_MEMORY_GROWTH=1', '-sFORCE_FILESYSTEM=1']
#cpp_link_args = ['-Wshift-negative-value', '-flto', '-Os', '-fno-exceptions', '--bind', '-sWASM=1', '-sALLOW_MEMORY_GROWTH=1', '-sFORCE_FILESYSTEM=1', '-g'] //enable g flag for wasm debugging
[host_machine] [host_machine]
system = 'emscripten' system = 'emscripten'