From 60d2048b6c836e963a1ee25541bfae9103327f7f Mon Sep 17 00:00:00 2001 From: Trevor Norris Date: Thu, 21 Jan 2016 14:00:59 -0700 Subject: [PATCH] buffer: properly retrieve binary length of needle 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: https://github.com/nodejs/node/pull/4803 Reviewed-By: James M Snell --- src/node_buffer.cc | 4 +++- test/parallel/test-buffer-indexof.js | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/node_buffer.cc b/src/node_buffer.cc index dca75a817b7414..988e41dbc9aa22 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -849,7 +849,9 @@ void IndexOfString(const FunctionCallbackInfo& args) { Local needle = args[1].As(); 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) { diff --git a/test/parallel/test-buffer-indexof.js b/test/parallel/test-buffer-indexof.js index 19f76fb0be2066..3cc085cecee1c3 100644 --- a/test/parallel/test-buffer-indexof.js +++ b/test/parallel/test-buffer-indexof.js @@ -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);