From 452db10284fce6a062d9fa313ed8b4b5fb33e9db Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Fri, 10 Dec 2021 19:57:33 +0000 Subject: [PATCH] refactor: wasm_memory_get_string --- runtime/include/wasm_memory.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runtime/include/wasm_memory.h b/runtime/include/wasm_memory.h index d5b5cdb8..4114977c 100644 --- a/runtime/include/wasm_memory.h +++ b/runtime/include/wasm_memory.h @@ -283,10 +283,11 @@ wasm_memory_get_string(struct wasm_memory *self, uint32_t offset, uint32_t size) { assert(offset + (sizeof(char) * size) <= self->size); - for (uint32_t i = 0; i < size; i++) { - if (self->buffer[offset + i] == '\0') return (char *)&self->buffer[offset]; + if (strnlen((const char *)&self->buffer[offset], size) < size) { + return (char *)&self->buffer[offset]; + } else { + return NULL; } - return NULL; } /**