diff options
| author |  Zilin Zhu <zhuzilinallen@gmail.com>
| 2022-08-28 21:19:53 +0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-08-28 06:19:53 -0700 |
| commit | ce90e0c372f3e92b2a163d24018132aa2ce2ee6b (patch) | |
| tree | c9c89bfed4f50838aa84361fe858afa79ca9259a /src | |
| parent | 296fb41e920736041c6c1dec38f1d8c355a402a1 (diff) | |
| download | bun-ce90e0c372f3e92b2a163d24018132aa2ce2ee6b.tar.gz bun-ce90e0c372f3e92b2a163d24018132aa2ce2ee6b.tar.zst bun-ce90e0c372f3e92b2a163d24018132aa2ce2ee6b.zip | |
support pass null as NULL ptr (#1160)
Diffstat (limited to 'src')
| -rw-r--r-- | src/bun.js/api/FFI.h | 6 | ||||
| -rw-r--r-- | src/bun.js/ffi.exports.js | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/bun.js/api/FFI.h b/src/bun.js/api/FFI.h index d7776dd23..bbe13bb5a 100644 --- a/src/bun.js/api/FFI.h +++ b/src/bun.js/api/FFI.h @@ -148,11 +148,17 @@ static bool JSVALUE_IS_NUMBER(EncodedJSValue val) { static void* JSVALUE_TO_PTR(EncodedJSValue val) { // must be a double + if (val.asInt64 == TagValueNull) + return 0; return (void*)(val.asInt64 - DoubleEncodeOffset); } static EncodedJSValue PTR_TO_JSVALUE(void* ptr) { EncodedJSValue val; + if (ptr == 0) { + val.asInt64 = TagValueNull; + return val; + } val.asInt64 = (int64_t)ptr + DoubleEncodeOffset; return val; } diff --git a/src/bun.js/ffi.exports.js b/src/bun.js/ffi.exports.js index f149cc0a9..52dd6d0d4 100644 --- a/src/bun.js/ffi.exports.js +++ b/src/bun.js/ffi.exports.js @@ -175,7 +175,7 @@ ffiWrappers[FFIType.cstring] = ffiWrappers[FFIType.pointer] = function pointer( ) { if (typeof val === "number") return val; if (!val) { - return 0; + return null; } if (ArrayBuffer.isView(val) || val instanceof ArrayBuffer) { |