From a1b24a29d50d6e060adf1ffd97d406bc5d71f290 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 5 Nov 2015 10:22:23 -0800 Subject: more overflow checking --- src/wasm-interpreter.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/wasm-interpreter.h') diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index 55eb2e269..586715b77 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -380,8 +380,9 @@ public: if (val > (double)UINT_MAX || val <= (double)-1) instance.externalInterface->trap(); return Flow(Literal(uint32_t(val))); } else { - if (val > (double)ULLONG_MAX || val <= (double)-1) instance.externalInterface->trap(); - return Flow(Literal(uint64_t(val))); + uint64_t converted = val; + if (converted < val - 1 || val <= (double)-1) instance.externalInterface->trap(); + return Flow(Literal(converted)); } } case ReinterpretFloat: return curr->type == i32 ? Flow(Literal(value.reinterpreti32())) : Flow(Literal(value.reinterpreti64())); -- cgit v1.2.3