Commit 49198d2

Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 49198d2
Browse files
ronagaduh95
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: #62711Fixes: #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
constsize_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
constvoid* 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+
constbuf=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)