Skip to content

More test updates #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vmx wants to merge 5 commits into
base: master
Choose a base branch
from
Open

More test updates #190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8c39e7
Update tests
vmx Mar 2, 2018
c04cf6b
Error message of `concat` changed
vmx Mar 2, 2018
8b3ab08
Update Buffer.includes()
vmx Mar 2, 2018
58d0df6
Adapt to Buffer.indexOf()/lastIndexOf() changes
vmx Mar 2, 2018
af62dc9
Merge branch 'master' into more-test-updates
dcousens Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adapt to Buffer.indexOf()/lastIndexOf() changes
  • Loading branch information
@vmx
vmx committed Mar 2, 2018
commit 58d0df6e2eb9004b028db851ab19912c9e7d8fd5
11 changes: 8 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,10 @@ function bidirectionalIndexOf (buffer, val, byteOffset, encoding, dir) {
byteOffset = +byteOffset // Coerce to Number.
if (numberIsNaN(byteOffset)) {
// byteOffset: it it's undefined, null, NaN, "foo", etc, search whole buffer
byteOffset = dir ? 0 : (buffer.length - 1)
// In Node.js the default value for lastindexOf is buffer.length -1. Using
// buffer.length instead leads to the same results, but makes the code
// simpler
byteOffset = dir ? 0 : buffer.length
}

// If the offset is greater than the length of the buffer, it will fail,
Expand All @@ -707,7 +710,7 @@ function bidirectionalIndexOf (buffer, val, byteOffset, encoding, dir) {
if (byteOffset < 0) byteOffset = buffer.length + byteOffset
if (byteOffset >= buffer.length) {
if (dir) offsetGreaterLength = true
else byteOffset = buffer.length - 1
byteOffset = buffer.length
} else if (byteOffset < 0) {
if (dir) byteOffset = 0
else offsetGreaterLength = true
Expand All @@ -716,6 +719,8 @@ function bidirectionalIndexOf (buffer, val, byteOffset, encoding, dir) {
// Normalize val
if (typeof val === 'string') {
val = Buffer.from(val, encoding)
} else if (isInstance(val, Uint8Array)) {
val = Buffer.from(val, encoding)
}

// Special case: looking for empty string/buffer always passes
Expand Down Expand Up @@ -753,7 +758,7 @@ function arrayIndexOf (arr, val, byteOffset, encoding, dir) {
encoding = String(encoding).toLowerCase()
if (encoding === 'ucs2' || encoding === 'ucs-2' ||
encoding === 'utf16le' || encoding === 'utf-16le') {
if (arr.length < 2 || val.length < 2) {
if (arr.length < 2 || val.length < 2 || arr.length % 2 !== 0) {
return -1
}
indexSize = 2
Expand Down
Loading