Skip to content

src: guard against overflow in ParseArrayIndex() (v4.x) #8409

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

Closed
bnoordhuis wants to merge 3 commits into from
Closed

src: guard against overflow in ParseArrayIndex() (v4.x) #8409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31ea3a5
src: move ParseArrayIndex() to src/node_buffer.cc
bnoordhuis Jun 30, 2016
6e62d9f
src: guard against overflow in ParseArrayIndex()
bnoordhuis Jun 30, 2016
785b91e
src: suppress coverity message
cjihrig Jul 7, 2016
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
Next Next commit
src: move ParseArrayIndex() to src/node_buffer.cc 
It's not used anywhere else so move it out of src/node_internals.h.

PR-URL: #7497
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@bnoordhuis
bnoordhuis committed Oct 19, 2016
commit 31ea3a5da13a073320eba0a1fea6c0aa451f3c21
19 changes: 19 additions & 0 deletions src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,25 @@ void CallbackInfo::WeakCallback(Isolate* isolate, Local<Object> object) {
}


// Parse index for external array data.
inline MUST_USE_RESULT bool ParseArrayIndex(Local<Value> arg,
size_t def,
size_t* ret) {
if (arg->IsUndefined()) {
*ret = def;
return true;
}

int64_t tmp_i = arg->IntegerValue();

if (tmp_i < 0)
return false;

*ret = static_cast<size_t>(tmp_i);
return true;
}


// Buffer methods

bool HasInstance(Local<Value> val) {
Expand Down
18 changes: 0 additions & 18 deletions src/node_internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,24 +160,6 @@ inline bool IsBigEndian() {
return GetEndianness() == kBigEndian;
}

// parse index for external array data
inline MUST_USE_RESULT bool ParseArrayIndex(v8::Local<v8::Value> arg,
size_t def,
size_t* ret) {
if (arg->IsUndefined()) {
*ret = def;
return true;
}

int32_t tmp_i = arg->Int32Value();

if (tmp_i < 0)
return false;

*ret = static_cast<size_t>(tmp_i);
return true;
}

void ThrowError(v8::Isolate* isolate, const char* errmsg);
void ThrowTypeError(v8::Isolate* isolate, const char* errmsg);
void ThrowRangeError(v8::Isolate* isolate, const char* errmsg);
Expand Down