diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-11-27 20:21:41 -0800 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-11-27 20:21:41 -0800 |
| commit | ed152596231975d1d09598b8221f49a10c5aa0b6 (patch) | |
| tree | 4acb4146bf8428914be3061a6a2efb9c3c2b1fe2 /src | |
| parent | 427203874355abb4e1b1f97852a9fea2d4a5aa14 (diff) | |
| download | bun-ed152596231975d1d09598b8221f49a10c5aa0b6.tar.gz bun-ed152596231975d1d09598b8221f49a10c5aa0b6.tar.zst bun-ed152596231975d1d09598b8221f49a10c5aa0b6.zip | |
Fix Buffer.toString("latin1") and make Buffer.toString("utf16le") faster
Fixes #455
Fixes #1016
Diffstat (limited to '')
| -rw-r--r-- | src/bun.js/bindings/JSBuffer.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/bun.js/bindings/JSBuffer.cpp b/src/bun.js/bindings/JSBuffer.cpp index 8f9ce2dd2..b3e5f0b4e 100644 --- a/src/bun.js/bindings/JSBuffer.cpp +++ b/src/bun.js/bindings/JSBuffer.cpp @@ -1141,14 +1141,28 @@ static inline JSC::EncodedJSValue jsBufferPrototypeFunction_toStringBody(JSC::JS switch (encoding) { case WebCore::BufferEncodingType::latin1: { - ret = JSC::JSValue::encode(JSC::jsString(vm, WTF::StringImpl::create(reinterpret_cast<const UChar*>(castedThis->typedVector() + offset), length))); + LChar* data = nullptr; + auto str = String::createUninitialized(length, data); + memcpy(data, reinterpret_cast<const char*>(castedThis->typedVector() + offset), length); + ret = JSC::JSValue::encode(JSC::jsString(vm, WTFMove(str))); break; } + + case WebCore::BufferEncodingType::ucs2: + case WebCore::BufferEncodingType::utf16le: { + UChar* data = nullptr; + size_t u16length = length > 1 ? length / 2 : 1; + auto str = String::createUninitialized(u16length, data); + // always zero out the last byte of the string incase the buffer is not a multiple of 2 + data[u16length - 1] = 0; + memcpy(data, reinterpret_cast<const char*>(castedThis->typedVector() + offset), length); + ret = JSC::JSValue::encode(JSC::jsString(vm, WTFMove(str))); + break; + } + case WebCore::BufferEncodingType::buffer: case WebCore::BufferEncodingType::utf8: case WebCore::BufferEncodingType::ascii: - case WebCore::BufferEncodingType::ucs2: - case WebCore::BufferEncodingType::utf16le: case WebCore::BufferEncodingType::base64: case WebCore::BufferEncodingType::base64url: case WebCore::BufferEncodingType::hex: { |