1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buffer: fix UCS2 indexOf for odd buffer length

Browse Source 
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 <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
Anna Henningsen 2016-05-02 07:51:33 +02:00
parent 5defa0cbaa
commit 4d49bcb73e
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/node_buffer.cc
View File

@ -994,7 +994,9 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {
bool is_forward = args[4]->IsTrue(); bool is_forward = args[4]->IsTrue();
const char* haystack = ts_obj_data; 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 = const size_t needle_length =
StringBytes::Size(args.GetIsolate(), needle, enc); StringBytes::Size(args.GetIsolate(), needle, enc);

3
test/parallel/test-buffer-indexof.js
View File

@ -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('a'.repeat(4), 'utf8'), 0);
assert.strictEqual(Buffer.from('aaaa').indexOf('你好', 'ucs2'), -1); 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. // Find substrings in Utf8.
const lengths = [1, 3, 15]; // Single char, simple and complex. const lengths = [1, 3, 15]; // Single char, simple and complex.