Skip to content

Commit

Permalink
buffer: properly retrieve binary length of needle
Browse files Browse the repository at this point in the history
If the needle contains an extended latin-1 character then using
String::Utf8Length() will be too large and the search will return early.
Instead use String::Length() when encoding is BINARY.

PR-URL: #4803
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
trevnorris authored and rvagg committed Feb 9, 2016
1 parent 4c67d74 commit 60d2048
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/node_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,9 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {
Local<String> needle = args[1].As<String>();
const char* haystack = ts_obj_data;
const size_t haystack_length = ts_obj_length;
const size_t needle_length = needle->Utf8Length();
// Extended latin-1 characters are 2 bytes in Utf8.
const size_t needle_length =
enc == BINARY ? needle->Length() : needle->Utf8Length();


if (needle_length == 0 || haystack_length == 0) {
Expand Down
9 changes: 9 additions & 0 deletions test/parallel/test-buffer-indexof.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ assert.equal(
assert.equal(
Buffer(b.toString('binary'), 'binary')
.indexOf(Buffer('d', 'binary'), 0, 'binary'), 3);
assert.equal(
Buffer('aa\u00e8aa', 'binary')
.indexOf('\u00e8', 'binary'), 2);
assert.equal(
Buffer('\u00e8', 'binary')
.indexOf('\u00e8', 'binary'), 0);
assert.equal(
Buffer('\u00e8', 'binary')
.indexOf(Buffer('\u00e8', 'binary'), 'binary'), 0);

// test optional offset with passed encoding
assert.equal(new Buffer('aaaa0').indexOf('30', 'hex'), 4);
Expand Down

0 comments on commit 60d2048

Please sign in to comment.