From 1e07207397eee92cad63084a8133f736ded75b3a Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nick@wasmer.io>
Date: Wed, 16 Dec 2020 12:22:48 -0800
Subject: [PATCH] Include a NUL byte in the message returned by
 wasm_trap_message().

---
 lib/c-api/src/wasm_c_api/trap.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/c-api/src/wasm_c_api/trap.rs b/lib/c-api/src/wasm_c_api/trap.rs
index 756b1c0e3..a18a2a80a 100644
--- a/lib/c-api/src/wasm_c_api/trap.rs
+++ b/lib/c-api/src/wasm_c_api/trap.rs
@@ -38,7 +38,9 @@ pub unsafe extern "C" fn wasm_trap_message(
     out: &mut wasm_byte_vec_t,
 ) {
     let message = trap.inner.message();
-    let byte_vec: wasm_byte_vec_t = message.into_bytes().into();
+    let mut byte_vec = message.into_bytes();
+    byte_vec.push(0); // append NUL
+    let byte_vec: wasm_byte_vec_t = byte_vec.into();
 
     out.size = byte_vec.size;
     out.data = byte_vec.data;