Skip to content

Commit 9b541ea

Browse files
committed
wasmtime: avoid NULL pointer after wasm compilation
Signed-off-by: Maximilian Hüter <[email protected]>
1 parent 5ef8969 commit 9b541ea

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
@@ -243,12 +243,14 @@ libwasmtime_run_module (void *cookie, char *const argv[], wasm_engine_t *engine,
243243
// Compile wasm modules
244244
wasmtime_module_t *module = NULL;
245245
err = wasmtime_module_new (engine, (uint8_t *) wasm->data, wasm->size, &module);
246-
if (! module)
246+
if (err != NULL)
247247
{
248248
wasmtime_error_message (err, &error_message);
249249
wasmtime_error_delete (err);
250250
error (EXIT_FAILURE, 0, "failed to compile module: %.*s", (int) error_message.size, error_message.data);
251251
}
252+
if (module == NULL)
253+
error (EXIT_FAILURE, 0, "internal error: module is NULL");
252254
wasm_byte_vec_delete (wasm);
253255

254256
// Init WASI program
@@ -422,12 +424,14 @@ libwasmtime_run_component (void *cookie, char *const argv[], wasm_engine_t *engi
422424
// Compile wasm component
423425
wasmtime_component_t *component = NULL;
424426
wasmtime_error_t *err = wasmtime_component_new (engine, (uint8_t *) wasm->data, wasm->size, &component);
425-
if (! component || err != NULL)
427+
if (err != NULL)
426428
{
427429
wasmtime_error_message (err, &error_message);
428430
wasmtime_error_delete (err);
429431
error (EXIT_FAILURE, 0, "failed to compile component: %.*s", (int) error_message.size, error_message.data);
430432
}
433+
if (component == NULL)
434+
error (EXIT_FAILURE, 0, "internal error: component is NULL");
431435
wasm_byte_vec_delete (wasm);
432436

433437
// Set up WASIp2 config

0 commit comments

Comments
 (0)