Skip to content

src: fix build failure for clang 3.2; consolidate byte swapping code; fix buffer writes for unaligned ucs2 strings #7645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zbjornson wants to merge 2 commits into from
Closed

src: fix build failure for clang 3.2; consolidate byte swapping code; fix buffer writes for unaligned ucs2 strings #7645

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ba6c8
src: fix build for older clang
zbjornson Sep 22, 2016
2b69933
test: add test for unaligned ucs2 buffer write
zbjornson Sep 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: add test for unaligned ucs2 buffer write 
Between #3410 and #7645, bytes were swapped twice on bigendian
platforms if buffer was not two-byte aligned. See comment in #7645.
  • Loading branch information
@zbjornson
zbjornson committed Sep 30, 2016
commit 2b69933796a1b5f1c59cd206b75e3616624fea2c
6 changes: 6 additions & 0 deletions test/parallel/test-buffer-alloc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,12 @@ assert.strictEqual('<Buffer 81 a3 66 6f 6f a3 62 61 72>', x.inspect());
assert.strictEqual(b.toString(encoding), 'あいうえお');
});

['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach((encoding) => {
const b = Buffer.allocUnsafe(11);
b.write('あいうえお', 1, encoding);
assert.strictEqual(b.toString(encoding, 1), 'あいうえお');
});

{
// latin1 encoding should write only one byte per character.
const b = Buffer.from([0xde, 0xad, 0xbe, 0xef]);
Expand Down