Skip to content
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

ensure we are not leaking buffer details from iconv-lite-umd for #79275 #100541

Closed
wants to merge 1 commit into from
Closed

ensure we are not leaking buffer details from iconv-lite-umd for #79275 #100541

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
9 changes: 7 additions & 2 deletions src/vs/base/node/encoding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ export async function toEncodeReadable(readable: Readable<string>, encoding: str
}
}

const leftovers = encoder.end();
// Use Uint8Array type to ensure we are not
// leaking existence of Buffer shim from iconv-lite-umd
const leftovers: Uint8Array | undefined = encoder.end();
if (leftovers && leftovers.length > 0) {
return VSBuffer.wrap(leftovers);
}
Expand All @@ -170,7 +172,10 @@ export async function toEncodeReadable(readable: Readable<string>, encoding: str

bytesRead += chunk.length;

return VSBuffer.wrap(encoder.write(chunk));
// Use Uint8Array to ensure we are not leaking
// existence of Buffer shim from iconv-lite-umd
const encodedChunk: Uint8Array = encoder.write(chunk);
return VSBuffer.wrap(encodedChunk);
}
};
}
Expand Down