walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[wasm-api] Make buffer_copy_contents return zero length on mem fail

This commit is contained in:
Behdad Esfahbod 2023-02-24 20:01:22 -07:00
parent 16ecb96922
commit 77f0f3c11a
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-wasm-api-buffer.hh
View File

@ -109,8 +109,8 @@ HB_WASM_API_COMPOUND (buffer_contents_t, buffer_copy_contents) (HB_WASM_EXEC_ENV
ret.info = wasm_runtime_module_dup_data (module_inst, (const char *) buffer->info, length * sizeof (buffer->info[0])); ret.info = wasm_runtime_module_dup_data (module_inst, (const char *) buffer->info, length * sizeof (buffer->info[0]));
ret.pos = wasm_runtime_module_dup_data (module_inst, (const char *) buffer->pos, length * sizeof (buffer->pos[0])); ret.pos = wasm_runtime_module_dup_data (module_inst, (const char *) buffer->pos, length * sizeof (buffer->pos[0]));
if (unlikely (buffer->successful && (!ret.info || !ret.pos))) if (!ret.info || !ret.pos)
buffer->successful = false; ret.length = 0;
} }
HB_WASM_API (bool_t, buffer_set_contents) (HB_WASM_EXEC_ENV HB_WASM_API (bool_t, buffer_set_contents) (HB_WASM_EXEC_ENV

15
src/hb-wasm-shape.cc
View File

@ -348,21 +348,10 @@ retry:
wasm_runtime_module_free (module_inst, arguments[2].of.i32); wasm_runtime_module_free (module_inst, arguments[2].of.i32);
if (unlikely (buffer->in_error ())) if (unlikely (!ret || !results[0].of.i32))
{
DEBUG_MSG (WASM, module_inst, "Buffer in error. Memory allocation fail in the wasm?");
if (retried)
goto fail;
buffer->successful = true;
retried = true;
release_shape_plan (face_data, plan);
goto retry;
}
if (unlikely (!ret))
{ {
DEBUG_MSG (WASM, module_inst, "Calling shape() failed: %s", DEBUG_MSG (WASM, module_inst, "Calling shape() failed: %s",
wasm_runtime_get_exception(module_inst)); wasm_runtime_get_exception (module_inst));
if (retried) if (retried)
goto fail; goto fail;
buffer->successful = true; buffer->successful = true;

2
src/wasm-graphite/shape.cc
View File

@ -75,6 +75,8 @@ shape (void *shape_plan,
} }
buffer_contents_t contents = buffer_copy_contents (buffer); buffer_contents_t contents = buffer_copy_contents (buffer);
if (!contents.length)
return false;
gr_segment *seg = nullptr; gr_segment *seg = nullptr;
const gr_slot *is; const gr_slot *is;