lukechilds
/
node
mirror of https://github.com/lukechilds/node.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

src: rename CHECK_NOT_OOB() macro 

Rename CHECK_NOT_OOB() to THROW_AND_RETURN_IF_OOB() because the old name
suggests it asserts and aborts when it is really a control flow macro.

PR-URL: https://github.com/nodejs/node/pull/8784
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
v6
Ben Noordhuis 8 years ago
parent
495d688e06
commit
c991d6465c
1 changed files with 16 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      src/node_buffer.cc

31
src/node_buffer.cc
View File

@ -18,7 +18,7 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#define CHECK_NOT_OOB(r) \ #define THROW_AND_RETURN_IF_OOB(r) \
do { \ do { \
if (!(r)) return env->ThrowRangeError("out of range index"); \ if (!(r)) return env->ThrowRangeError("out of range index"); \
} while (0) } while (0)
@ -43,10 +43,10 @@
#define SLICE_START_END(start_arg, end_arg, end_max) \ #define SLICE_START_END(start_arg, end_arg, end_max) \
size_t start; \ size_t start; \
size_t end; \ size_t end; \
CHECK_NOT_OOB(ParseArrayIndex(start_arg, 0, &start)); \ THROW_AND_RETURN_IF_OOB(ParseArrayIndex(start_arg, 0, &start)); \
CHECK_NOT_OOB(ParseArrayIndex(end_arg, end_max, &end)); \ THROW_AND_RETURN_IF_OOB(ParseArrayIndex(end_arg, end_max, &end)); \
if (end < start) end = start; \ if (end < start) end = start; \
CHECK_NOT_OOB(end <= end_max); \ THROW_AND_RETURN_IF_OOB(end <= end_max); \
size_t length = end - start; size_t length = end - start;
#define BUFFER_MALLOC(length) \ #define BUFFER_MALLOC(length) \
@ -578,9 +578,9 @@ void Copy(const FunctionCallbackInfo<Value> &args) {
size_t source_start; size_t source_start;
size_t source_end; size_t source_end;
CHECK_NOT_OOB(ParseArrayIndex(args[1], 0, &target_start)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[1], 0, &target_start));
CHECK_NOT_OOB(ParseArrayIndex(args[2], 0, &source_start)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[2], 0, &source_start));
CHECK_NOT_OOB(ParseArrayIndex(args[3], ts_obj_length, &source_end)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[3], ts_obj_length, &source_end));
// Copy 0 bytes; we're done // Copy 0 bytes; we're done
if (target_start >= target_length || source_start >= source_end) if (target_start >= target_length || source_start >= source_end)
@ -709,11 +709,12 @@ void StringWrite(const FunctionCallbackInfo<Value>& args) {
size_t offset; size_t offset;
size_t max_length; size_t max_length;
CHECK_NOT_OOB(ParseArrayIndex(args[1], 0, &offset)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[1], 0, &offset));
if (offset > ts_obj_length) if (offset > ts_obj_length)
return env->ThrowRangeError("Offset is out of bounds"); return env->ThrowRangeError("Offset is out of bounds");
CHECK_NOT_OOB(ParseArrayIndex(args[2], ts_obj_length - offset, &max_length)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[2], ts_obj_length - offset,
&max_length));
max_length = MIN(ts_obj_length - offset, max_length); max_length = MIN(ts_obj_length - offset, max_length);
@ -838,8 +839,8 @@ void WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
size_t memcpy_num = sizeof(T); size_t memcpy_num = sizeof(T);
if (should_assert) { if (should_assert) {
CHECK_NOT_OOB(offset + memcpy_num >= memcpy_num); THROW_AND_RETURN_IF_OOB(offset + memcpy_num >= memcpy_num);
CHECK_NOT_OOB(offset + memcpy_num <= ts_obj_length); THROW_AND_RETURN_IF_OOB(offset + memcpy_num <= ts_obj_length);
} }
if (offset + memcpy_num > ts_obj_length) if (offset + memcpy_num > ts_obj_length)
@ -915,10 +916,10 @@ void CompareOffset(const FunctionCallbackInfo<Value> &args) {
size_t source_end; size_t source_end;
size_t target_end; size_t target_end;
CHECK_NOT_OOB(ParseArrayIndex(args[2], 0, &target_start)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[2], 0, &target_start));
CHECK_NOT_OOB(ParseArrayIndex(args[3], 0, &source_start)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[3], 0, &source_start));
CHECK_NOT_OOB(ParseArrayIndex(args[4], target_length, &target_end)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[4], target_length, &target_end));
CHECK_NOT_OOB(ParseArrayIndex(args[5], ts_obj_length, &source_end)); THROW_AND_RETURN_IF_OOB(ParseArrayIndex(args[5], ts_obj_length, &source_end));
if (source_start > ts_obj_length) if (source_start > ts_obj_length)
return env->ThrowRangeError("out of range index"); return env->ThrowRangeError("out of range index");

Write Preview
Loading…
Cancel
Save