Skip to content

fix data url test #2580

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

Merged
KhafraDev merged 1 commit into from
Jan 3, 2024
Merged

fix data url test #2580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions lib/fetch/dataURL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,14 +604,18 @@ function isHTTPWhiteSpace (char) {
* @param {boolean} [trailing=true]
*/
function removeHTTPWhitespace (str, leading = true, trailing = true) {
let i = 0; let j = str.length
let lead = 0
let trail = str.length - 1

if (leading) {
while (j > i && isHTTPWhiteSpace(str.charCodeAt(i))) --i
while (lead < str.length && isHTTPWhiteSpace(str.charCodeAt(lead))) lead++
}

if (trailing) {
while (j > i && isHTTPWhiteSpace(str.charCodeAt(j - 1))) --j
while (trail > 0 && isHTTPWhiteSpace(str.charCodeAt(trail))) trail--
}
return i === 0 && j === str.length ? str : str.substring(i, j)

return lead === 0 && trail === str.length - 1 ? str : str.slice(lead, trail + 1)
}

/**
Expand All @@ -630,14 +634,18 @@ function isASCIIWhitespace (char) {
* @param {boolean} [trailing=true]
*/
function removeASCIIWhitespace (str, leading = true, trailing = true) {
let i = 0; let j = str.length
let lead = 0
let trail = str.length - 1

if (leading) {
while (j > i && isASCIIWhitespace(str.charCodeAt(i))) --i
Copy link
Member Author

@KhafraDev KhafraDev Jan 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so unless str.length was 0 j > i would always be true... and we're decrementing from i, which means if isASCIIWhitespace(...) was true, i would be negative? Not sure why I didn't realize this before.

Copy link
Member Author

@KhafraDev KhafraDev Jan 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also using i and j instead of lead and trail shouldn't have landed

while (lead < str.length && isASCIIWhitespace(str.charCodeAt(lead))) lead++
}

if (trailing) {
while (j > i && isASCIIWhitespace(str.charCodeAt(j - 1))) --j
while (trail > 0 && isASCIIWhitespace(str.charCodeAt(trail))) trail--
}
return i === 0 && j === str.length ? str : str.substring(i, j)

return lead === 0 && trail === str.length - 1 ? str : str.slice(lead, trail + 1)
}

module.exports = {
Expand Down