From 4d49bcb73edb12992a0a01c10c9d961a59b6fee4 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 2 May 2016 07:51:33 +0200 Subject: [PATCH] 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. PR-URL: https://github.com/nodejs/node/pull/6511 Reviewed-By: James M Snell Reviewed-By: Trevor Norris --- src/node_buffer.cc | 4 +++- test/parallel/test-buffer-indexof.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 30618719d2..44020d91a1 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -994,7 +994,9 @@ void IndexOfString(const FunctionCallbackInfo& 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); diff --git a/test/parallel/test-buffer-indexof.js b/test/parallel/test-buffer-indexof.js index 0aeb066f21..0cdce9cf25 100644 --- a/test/parallel/test-buffer-indexof.js +++ b/test/parallel/test-buffer-indexof.js @@ -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.