From f8717c285e0203bbf3a01aa92bff23682cf38529 Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Sat, 23 Mar 2024 13:19:04 +0100 Subject: Fix endianness handling in `js_dataview_getValue` / `js_dataview_setValue` --- lib/quickjs/quickjs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/quickjs/quickjs.c b/lib/quickjs/quickjs.c index ca892728..1fb0f824 100644 --- a/lib/quickjs/quickjs.c +++ b/lib/quickjs/quickjs.c @@ -55269,7 +55269,8 @@ static JSValue js_dataview_getValue(JSContext *ctx, { JSTypedArray *ta; JSArrayBuffer *abuf; - int is_swap, size; + BOOL littleEndian, is_swap; + int size; uint8_t *ptr; uint32_t v; uint64_t pos; @@ -55280,9 +55281,8 @@ static JSValue js_dataview_getValue(JSContext *ctx, size = 1 << typed_array_size_log2(class_id); if (JS_ToIndex(ctx, &pos, argv[0])) return JS_EXCEPTION; - is_swap = TRUE; - if (argc > 1) - is_swap = !JS_ToBool(ctx, argv[1]); + littleEndian = argc > 1 && JS_ToBool(ctx, argv[1]); + is_swap = littleEndian ^ !is_be(); abuf = ta->buffer->u.array_buffer; if (abuf->detached) return JS_ThrowTypeErrorDetachedArrayBuffer(ctx); @@ -55367,7 +55367,8 @@ static JSValue js_dataview_setValue(JSContext *ctx, { JSTypedArray *ta; JSArrayBuffer *abuf; - int is_swap, size; + BOOL littleEndian, is_swap; + int size; uint8_t *ptr; uint64_t v64; uint32_t v; @@ -55406,9 +55407,8 @@ static JSValue js_dataview_setValue(JSContext *ctx, v64 = u.u64; } } - is_swap = TRUE; - if (argc > 2) - is_swap = !JS_ToBool(ctx, argv[2]); + littleEndian = argc > 2 && JS_ToBool(ctx, argv[2]); + is_swap = littleEndian ^ !is_be(); abuf = ta->buffer->u.array_buffer; if (abuf->detached) return JS_ThrowTypeErrorDetachedArrayBuffer(ctx); -- cgit 1.4.1-2-gfad0