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
Next Next commit
buffer: fix needle length misestimation for UCS2 
Use `StringBytes::Size` to determine the needle string length
instead of assuming latin-1 or UTF-8.

Previously, `Buffer.indexOf` could fail with an assertion failure
when the needle's byte length, but not its character count,
exceeded the haystack's byte length.
  • Loading branch information
@addaleax
addaleax committed May 3, 2016
commit cd7adabc46465ed525d3d2a071241a6c437e95b3
4 changes: 2 additions & 2 deletions src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,9 +995,9 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {

const char* haystack = ts_obj_data;
const size_t haystack_length = ts_obj_length;
// Extended latin-1 characters are 2 bytes in Utf8.

const size_t needle_length =
enc == BINARY ? needle->Length() : needle->Utf8Length();
StringBytes::Size(args.GetIsolate(), needle, enc);

if (needle_length == 0 || haystack_length == 0) {
return args.GetReturnValue().Set(-1);
Expand Down
6 changes: 6 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 @@ -222,6 +222,12 @@ var allCharsBufferUcs2 = Buffer.from(allCharsString, 'ucs2');
assert.equal(-1, allCharsBufferUtf8.indexOf('notfound'));
assert.equal(-1, allCharsBufferUcs2.indexOf('notfound'));

// Needle is longer than haystack, but only because it's encoded as UTF-16
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);

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