Skip to content

buffer: fix lastIndexOf and indexOf in various edge cases #6511

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
addaleax wants to merge 5 commits into from
Closed

buffer: fix lastIndexOf and indexOf in various edge cases #6511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd7adab
buffer: fix needle length misestimation for UCS2
addaleax May 2, 2016
ed38520
buffer: fix UCS2 indexOf for odd buffer length
addaleax May 2, 2016
8ec2062
src: fix FindFirstCharacter argument alignment
addaleax May 3, 2016
4220cb9
buffer: fix lastIndexOf crash for overlong needle
addaleax May 2, 2016
b8c7a01
buffer: fix lastIndexOf index underflow issue
addaleax May 3, 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
Next Next commit
buffer: fix UCS2 indexOf for odd buffer length 
Fix `buffer.indexOf` for the case that the haystack has odd length
and the needle is not found in it. `StringSearch()` would return
the length of the buffer in multiples of `sizeof(uint16_t)`, but
checking that against `haystack_length` would not work if the latter
one was odd.
  • Loading branch information
@addaleax
addaleax committed May 3, 2016
commit ed3852093dbe0f654493970156e8abc01f8c89a4
4 changes: 3 additions & 1 deletion src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,9 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {
bool is_forward = args[4]->IsTrue();

const char* haystack = ts_obj_data;
const size_t haystack_length = ts_obj_length;
// Round down to the nearest multiple of 2 in case of UCS2.
const size_t haystack_length = (enc == UCS2) ?
ts_obj_length &~ 1 : ts_obj_length; // NOLINT(whitespace/operators)

const size_t needle_length =
StringBytes::Size(args.GetIsolate(), needle, enc);
Expand Down
3 changes: 3 additions & 0 deletions test/parallel/test-buffer-indexof.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ assert.strictEqual(Buffer.from('aaaa').indexOf('a'.repeat(4), 'ucs2'), -1);
assert.strictEqual(Buffer.from('aaaa').indexOf('a'.repeat(4), 'utf8'), 0);
assert.strictEqual(Buffer.from('aaaa').indexOf('你好', 'ucs2'), -1);

// Haystack has odd length, but the needle is UCS2.
assert.strictEqual(Buffer.from('aaaaa').indexOf('b', 'ucs2'), -1);

{
// Find substrings in Utf8.
const lengths = [1, 3, 15]; // Single char, simple and complex.
Expand Down