Skip to content

Revert the earlier TypedArray change as it may lead to integer overflow. #2350

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
merged 1 commit into from
Jan 11, 2017
Merged

Revert the earlier TypedArray change as it may lead to integer overflow. #2350

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
12 changes: 1 addition & 11 deletions lib/Runtime/Library/TypedArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,6 @@ namespace Js
Var TypedArrayBase::CreateNewInstance(Arguments& args, ScriptContext* scriptContext, uint32 elementSize, PFNCreateTypedArray pfnCreateTypedArray)
{
uint32 byteLength = 0;
uint32 newByteLength = 0;
int32 offset = 0;
int32 mappedLength = -1;
uint32 elementCount = 0;
Expand Down Expand Up @@ -509,16 +508,7 @@ namespace Js

if (args.Info.Count > 3 && !JavascriptOperators::IsUndefinedObject(args[3]))
{
mappedLength = ArrayBuffer::ToIndex(args[3], JSERR_InvalidTypedArrayLength, scriptContext, ArrayBuffer::MaxArrayBufferLength / elementSize, false);
newByteLength = mappedLength * elementSize;

if (offset + newByteLength > byteLength)
{
JavascriptError::ThrowRangeError(
scriptContext, JSERR_InvalidTypedArrayLength);
}

byteLength = newByteLength;
mappedLength = ArrayBuffer::ToIndex(args[3], JSERR_InvalidTypedArrayLength, scriptContext, (byteLength - offset) / elementSize, false);
}
else
{
Expand Down