Fix watchpoint segfault when using debug interpreter without server

bytecodealliance · Dec 12, 2022 · e8fc477 · e8fc477
1 parent 1449275
commit e8fc477
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/iwasm/interpreter/wasm_interp_classic.c b/core/iwasm/interpreter/wasm_interp_classic.c
@@ -1157,8 +1157,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
 #if WASM_ENABLE_DEBUG_INTERP != 0
     uint8 *frame_ip_orig = NULL;
     WASMDebugInstance *debug_instance = wasm_exec_env_get_instance(exec_env);
-    bh_list *watch_point_list_read = &debug_instance->watch_point_list_read;
-    bh_list *watch_point_list_write = &debug_instance->watch_point_list_write;
+    bh_list *watch_point_list_read =
+        debug_instance ? &debug_instance->watch_point_list_read : NULL;
+    bh_list *watch_point_list_write =
+        debug_instance ? &debug_instance->watch_point_list_write : NULL;
 #endif
 
 #if WASM_ENABLE_LABELS_AS_VALUES != 0