Skip to content

Commit 4ddd82a

Browse files
committed
wasmtime: avoid NULL pointer after wasm compilation
Signed-off-by: Maximilian Hüter <[email protected]>
1 parent 3777fba commit 4ddd82a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/libcrun/handlers/wasmtime.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,14 @@ libwasmtime_run_module (void *cookie, char *const argv[], wasm_engine_t *engine,
255255
// Compile wasm modules
256256
wasmtime_module_t *module = NULL;
257257
err = wasmtime_module_new (engine, (uint8_t *) wasm->data, wasm->size, &module);
258-
if (! module)
258+
if (err != NULL)
259259
{
260260
wasmtime_error_message (err, &error_message);
261261
wasmtime_error_delete (err);
262262
error (EXIT_FAILURE, 0, "failed to compile module: %.*s", (int) error_message.size, error_message.data);
263263
}
264+
if (module == NULL)
265+
error (EXIT_FAILURE, 0, "internal error: module is NULL");
264266
wasm_byte_vec_delete (wasm);
265267

266268
// Init WASI program
@@ -434,12 +436,14 @@ libwasmtime_run_component (void *cookie, char *const argv[], wasm_engine_t *engi
434436
// Compile wasm component
435437
wasmtime_component_t *component = NULL;
436438
wasmtime_error_t *err = wasmtime_component_new (engine, (uint8_t *) wasm->data, wasm->size, &component);
437-
if (! component || err != NULL)
439+
if (err != NULL)
438440
{
439441
wasmtime_error_message (err, &error_message);
440442
wasmtime_error_delete (err);
441443
error (EXIT_FAILURE, 0, "failed to compile component: %.*s", (int) error_message.size, error_message.data);
442444
}
445+
if (component == NULL)
446+
error (EXIT_FAILURE, 0, "internal error: component is NULL");
443447
wasm_byte_vec_delete (wasm);
444448

445449
// Set up WASIp2 config

0 commit comments

Comments
 (0)