T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove trailing null bytes from trap messages.

Browse Source 
It appears there are two trailing null bytes at the end of the string.
This does not seem right. But it might be a good idea generally to remove
any null bytes that get into error messages.
This commit is contained in:
Austin Wise
2019-12-13 18:48:32 -08:00
parent e11056345a
commit df0f0e3c44
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/misc/dotnet/src/TrapException.cs
View File

@@ -1,6 +1,6 @@
using System; using System;
using System.Runtime.InteropServices;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Text;
namespace Wasmtime namespace Wasmtime
{ {
@@ -27,7 +27,13 @@ namespace Wasmtime
unsafe unsafe
{ {
Interop.wasm_trap_message(trap, out var bytes); Interop.wasm_trap_message(trap, out var bytes);
var message = Marshal.PtrToStringUTF8((IntPtr)bytes.data, (int)bytes.size - 1 /* remove null */); var byteSpan = new ReadOnlySpan<byte>(bytes.data, checked((int)bytes.size));
int indexOfNull = byteSpan.IndexOf((byte)0);
if (indexOfNull != -1)
byteSpan = byteSpan.Slice(0, indexOfNull);
var message = Encoding.UTF8.GetString(byteSpan);
Interop.wasm_byte_vec_delete(ref bytes); Interop.wasm_byte_vec_delete(ref bytes);
Interop.wasm_trap_delete(trap); Interop.wasm_trap_delete(trap);