FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

buffer: fix end parameter bugs in indexOf/lastIndexOf · nodejs/node@49198d2 · GitHub

/ node Public

Commit 49198d2

Browse files
ronag
authored and
aduh95
committed
buffer: fix end parameter bugs in indexOf/lastIndexOf
- Fix FastIndexOfNumber parameter order mismatch (end_i64 and is_forward were swapped vs the JS call site and slow path) - Clamp negative end values to 0 to prevent size_t overflow in IndexOfString, IndexOfBuffer, and IndexOfNumberImpl - Clamp empty needle result to search_end Signed-off-by: Robert Nagy <ronagy@icloud.com> Assisted-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> PR-URL: #62711 Fixes: #62873 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 9f5bf55 commit 49198d2

2 files changed

Lines changed: 50 additions & 11 deletions

File tree

‎src/node_buffer.cc‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -995,8 +995,8 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {
995995
if (!StringBytes::Size(isolate, needle, enc).To(&needle_length)) return;
996996

997997
// search_end is the exclusive upper bound of the search range.
998-
size_t search_end = static_cast<size_t>(
999-
std::min(end_i64, static_cast<int64_t>(haystack_length)));
998+
size_t search_end = static_cast<size_t>(std::min(
999+
std::max(end_i64, int64_t{0}), static_cast<int64_t>(haystack_length)));
10001000
if (enc == UCS2) search_end &= ~static_cast<size_t>(1);
10011001

10021002
int64_t opt_offset = IndexOfOffset(haystack_length,
@@ -1005,8 +1005,10 @@ void IndexOfString(const FunctionCallbackInfo<Value>& args) {
10051005
is_forward);
10061006

10071007
if (needle_length == 0) {
1008-
// Match String#indexOf() and String#lastIndexOf() behavior.
1009-
args.GetReturnValue().Set(static_cast<double>(opt_offset));
1008+
// Match String#indexOf() and String#lastIndexOf() behavior,
1009+
// but clamp to search_end.
1010+
int64_t clamped = std::min(opt_offset, static_cast<int64_t>(search_end));
1011+
args.GetReturnValue().Set(static_cast<double>(clamped));
10101012
return;
10111013
}
10121014

@@ -1120,8 +1122,8 @@ void IndexOfBuffer(const FunctionCallbackInfo<Value>& args) {
11201122
const size_t needle_length = needle_contents.length();
11211123

11221124
// search_end is the exclusive upper bound of the search range.
1123-
size_t search_end = static_cast<size_t>(
1124-
std::min(end_i64, static_cast<int64_t>(haystack_length)));
1125+
size_t search_end = static_cast<size_t>(std::min(
1126+
std::max(end_i64, int64_t{0}), static_cast<int64_t>(haystack_length)));
11251127
if (enc == UCS2) search_end &= ~static_cast<size_t>(1);
11261128

11271129
int64_t opt_offset = IndexOfOffset(haystack_length,
@@ -1130,8 +1132,10 @@ void IndexOfBuffer(const FunctionCallbackInfo<Value>& args) {
11301132
is_forward);
11311133

11321134
if (needle_length == 0) {
1133-
// Match String#indexOf() and String#lastIndexOf() behavior.
1134-
args.GetReturnValue().Set(static_cast<double>(opt_offset));
1135+
// Match String#indexOf() and String#lastIndexOf() behavior,
1136+
// but clamp to search_end.
1137+
int64_t clamped = std::min(opt_offset, static_cast<int64_t>(search_end));
1138+
args.GetReturnValue().Set(static_cast<double>(clamped));
11351139
return;
11361140
}
11371141

@@ -1196,8 +1200,8 @@ int32_t IndexOfNumberImpl(Local<Value> buffer_obj,
11961200
}
11971201
size_t offset = static_cast<size_t>(opt_offset);
11981202
// search_end is the exclusive upper bound of the search range.
1199-
size_t search_end = static_cast<size_t>(
1200-
std::min(end_i64, static_cast<int64_t>(buffer_length)));
1203+
size_t search_end = static_cast<size_t>(std::min(
1204+
std::max(end_i64, int64_t{0}), static_cast<int64_t>(buffer_length)));
12011205

12021206
const void* ptr;
12031207
if (is_forward) {
@@ -1234,8 +1238,8 @@ int32_t FastIndexOfNumber(Local<Value>,
12341238
Local<Value> buffer_obj,
12351239
uint32_t needle,
12361240
int64_t offset_i64,
1237-
int64_t end_i64,
12381241
bool is_forward,
1242+
int64_t end_i64,
12391243
// NOLINTNEXTLINE(runtime/references)
12401244
FastApiCallbackOptions& options) {
12411245
HandleScope scope(options.isolate);

‎test/parallel/test-buffer-indexof.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,3 +691,38 @@ assert.strictEqual(reallyLong.lastIndexOf(pattern), 0);
691691

692692
assert.strictEqual(buf.includes('c'), true);
693693
}
694+
695+
{
696+
const buf = Buffer.from('abcabc');
697+
698+
// Negative end should be treated as 0 (no match possible).
699+
assert.strictEqual(buf.indexOf('a', 0, -1), -1);
700+
assert.strictEqual(buf.indexOf('a', 0, -100), -1);
701+
assert.strictEqual(buf.indexOf(0x61, 0, -1), -1);
702+
assert.strictEqual(buf.lastIndexOf('a', 5, -1), -1);
703+
assert.strictEqual(buf.lastIndexOf(0x61, 5, -1), -1);
704+
assert.strictEqual(buf.includes('a', 0, -1), false);
705+
assert.strictEqual(buf.indexOf(Buffer.from('a'), 0, -1), -1);
706+
assert.strictEqual(buf.lastIndexOf(Buffer.from('a'), 5, -1), -1);
707+
708+
// End = 0 means empty search range.
709+
assert.strictEqual(buf.indexOf('a', 0, 0), -1);
710+
assert.strictEqual(buf.indexOf(0x61, 0, 0), -1);
711+
assert.strictEqual(buf.lastIndexOf('a', 5, 0), -1);
712+
assert.strictEqual(buf.lastIndexOf(0x61, 5, 0), -1);
713+
714+
// End greater than buffer length should be clamped.
715+
assert.strictEqual(buf.indexOf('c', 0, 100), 2);
716+
assert.strictEqual(buf.indexOf(0x63, 0, 100), 2);
717+
assert.strictEqual(buf.lastIndexOf('c', 5, 100), 5);
718+
assert.strictEqual(buf.lastIndexOf(0x63, 5, 100), 5);
719+
assert.strictEqual(buf.indexOf(Buffer.from('c'), 0, 100), 2);
720+
721+
// Empty needle with end parameter should clamp to search_end.
722+
assert.strictEqual(buf.indexOf('', 0, 3), 0);
723+
assert.strictEqual(buf.indexOf('', 5, 3), 3);
724+
assert.strictEqual(buf.indexOf(Buffer.from(''), 5, 3), 3);
725+
assert.strictEqual(buf.indexOf('', 0, 0), 0);
726+
assert.strictEqual(buf.lastIndexOf('', 5, 3), 3);
727+
assert.strictEqual(buf.lastIndexOf(Buffer.from(''), 5, 3), 3);
728+
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL