}
+static njs_int_t
+njs_buffer_range_arg(njs_vm_t *vm, const njs_value_t *value, uint64_t *num)
+{
+ if (!njs_is_defined(value)) {
+ return NJS_OK;
+ }
+
+ return njs_value_to_index(vm, njs_value_arg(value), num);
+}
+
+
static njs_int_t
njs_buffer_array_range(njs_vm_t *vm, njs_typed_array_t *array,
- const njs_value_t *start, const njs_value_t *end, const char *name,
+ uint64_t num_start, uint64_t num_end, const char *name,
uint8_t **out_start, uint8_t **out_end)
{
- uint64_t num_start, num_end;
- njs_int_t ret;
njs_array_buffer_t *buffer;
- num_start = 0;
-
if (njs_slow_path(njs_is_detached_buffer(array->buffer))) {
njs_type_error(vm, "detached buffer");
return NJS_ERROR;
}
- if (njs_is_defined(start)) {
- ret = njs_value_to_index(vm, njs_value_arg(start), &num_start);
- if (njs_slow_path(ret != NJS_OK)) {
- return ret;
- }
- }
-
if (num_start > array->byte_length) {
njs_range_error(vm, "\"%sStart\" is out of range: %L", name, num_start);
return NJS_ERROR;
}
- num_end = array->byte_length;
-
- if (njs_is_defined(end)) {
- ret = njs_value_to_index(vm, njs_value_arg(end), &num_end);
- if (njs_slow_path(ret != NJS_OK)) {
- return ret;
- }
+ if (num_end == UINT64_MAX) {
+ num_end = array->byte_length;
}
if (num_end > array->byte_length) {
{
size_t size, src_size, trg_size;
uint8_t *src, *src_end, *trg, *trg_end;
+ uint64_t num_target_start, num_target_end, num_source_start,
+ num_source_end;
njs_int_t ret;
njs_typed_array_t *source, *target;
return NJS_ERROR;
}
- ret = njs_buffer_array_range(vm, target, target_start, target_end, "target",
- &trg, &trg_end);
+ num_target_start = 0;
+ num_target_end = UINT64_MAX;
+ num_source_start = 0;
+ num_source_end = UINT64_MAX;
+
+ ret = njs_buffer_range_arg(vm, target_start, &num_target_start);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
+ ret = njs_buffer_range_arg(vm, target_end, &num_target_end);
if (njs_slow_path(ret != NJS_OK)) {
return ret;
}
- ret = njs_buffer_array_range(vm, source, source_start, source_end, "source",
- &src, &src_end);
+ ret = njs_buffer_range_arg(vm, source_start, &num_source_start);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
+ ret = njs_buffer_range_arg(vm, source_end, &num_source_end);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
+ ret = njs_buffer_array_range(vm, target, num_target_start, num_target_end,
+ "target", &trg, &trg_end);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
+ ret = njs_buffer_array_range(vm, source, num_source_start, num_source_end,
+ "source", &src, &src_end);
if (njs_slow_path(ret != NJS_OK)) {
return ret;
}
{
size_t size;
uint8_t *src, *src_end, *trg, *trg_end;
+ uint64_t num_target_start, num_source_start, num_source_end;
njs_int_t ret;
njs_value_t *val1, *val2;
njs_typed_array_t *source, *target;
return NJS_ERROR;
}
- ret = njs_buffer_array_range(vm, target, njs_arg(args, nargs, 2),
- &njs_value_undefined, "target", &trg,
- &trg_end);
+ num_target_start = 0;
+ num_source_start = 0;
+ num_source_end = UINT64_MAX;
+
+ ret = njs_buffer_range_arg(vm, njs_arg(args, nargs, 2), &num_target_start);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
+ ret = njs_buffer_range_arg(vm, njs_arg(args, nargs, 3), &num_source_start);
if (njs_slow_path(ret != NJS_OK)) {
return ret;
}
- ret = njs_buffer_array_range(vm, source, njs_arg(args, nargs, 3),
- njs_arg(args, nargs, 4), "source", &src,
- &src_end);
+ ret = njs_buffer_range_arg(vm, njs_arg(args, nargs, 4), &num_source_end);
if (njs_slow_path(ret != NJS_OK)) {
return ret;
}
return NJS_ERROR;
}
+ ret = njs_buffer_array_range(vm, target, num_target_start, UINT64_MAX,
+ "target", &trg, &trg_end);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
+ ret = njs_buffer_array_range(vm, source, num_source_start, num_source_end,
+ "source", &src, &src_end);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
+ }
+
size = njs_min(trg_end - trg, src_end - src);
if (!njs_memory_overlaps(trg, size, src, size)) {
}
-static JSValue
-qjs_buffer_array_range(JSContext *ctx, njs_str_t *array, JSValueConst start,
- JSValueConst end, const char *name)
+static int
+qjs_buffer_range_arg(JSContext *ctx, JSValueConst value, int64_t *num)
{
- int64_t num_start, num_end;
+ if (JS_IsUndefined(value)) {
+ return 0;
+ }
- num_start = 0;
+ return JS_ToInt64(ctx, num, value);
+}
- if (!JS_IsUndefined(start)) {
- if (JS_ToInt64(ctx, &num_start, start)) {
- return JS_EXCEPTION;
- }
- }
+static JSValue
+qjs_buffer_array_range(JSContext *ctx, njs_str_t *array, int64_t num_start,
+ int64_t num_end, const char *name)
+{
if (num_start < 0 || (size_t) num_start > array->length) {
return JS_ThrowRangeError(ctx, "\"%sStart\" is out of range: %" PRId64,
name, num_start);
}
- num_end = array->length;
-
- if (!JS_IsUndefined(end)) {
- if (JS_ToInt64(ctx, &num_end, end)) {
- return JS_EXCEPTION;
- }
+ if (num_end == INT64_MAX) {
+ num_end = array->length;
}
if (num_end < 0 || (size_t) num_end > array->length) {
int rc;
size_t size;
JSValue ret;
+ int64_t num_source_start, num_source_end, num_target_start,
+ num_target_end;
njs_str_t src, target;
+ num_source_start = 0;
+ num_source_end = INT64_MAX;
+ num_target_start = 0;
+ num_target_end = INT64_MAX;
+
+ if (qjs_buffer_range_arg(ctx, source_start, &num_source_start)) {
+ return JS_EXCEPTION;
+ }
+
+ if (qjs_buffer_range_arg(ctx, source_end, &num_source_end)) {
+ return JS_EXCEPTION;
+ }
+
+ if (qjs_buffer_range_arg(ctx, target_start, &num_target_start)) {
+ return JS_EXCEPTION;
+ }
+
+ if (qjs_buffer_range_arg(ctx, target_end, &num_target_end)) {
+ return JS_EXCEPTION;
+ }
+
ret = qjs_typed_array_data(ctx, val1, &src);
if (JS_IsException(ret)) {
return ret;
return ret;
}
- ret = qjs_buffer_array_range(ctx, &src, source_start, source_end, "source");
+ ret = qjs_buffer_array_range(ctx, &src, num_source_start, num_source_end,
+ "source");
if (JS_IsException(ret)) {
return ret;
}
- ret = qjs_buffer_array_range(ctx, &target, target_start, target_end,
- "target");
+ ret = qjs_buffer_array_range(ctx, &target, num_target_start,
+ num_target_end, "target");
if (JS_IsException(ret)) {
return ret;
}
{
size_t size;
JSValue ret;
+ int64_t num_target_start, num_source_start, num_source_end;
njs_str_t src, target;
+ num_target_start = 0;
+ num_source_start = 0;
+ num_source_end = INT64_MAX;
+
+ if (qjs_buffer_range_arg(ctx, argv[1], &num_target_start)) {
+ return JS_EXCEPTION;
+ }
+
+ if (qjs_buffer_range_arg(ctx, argv[2], &num_source_start)) {
+ return JS_EXCEPTION;
+ }
+
+ if (qjs_buffer_range_arg(ctx, argv[3], &num_source_end)) {
+ return JS_EXCEPTION;
+ }
+
ret = qjs_typed_array_data(ctx, this_val, &src);
if (JS_IsException(ret)) {
return ret;
return ret;
}
- ret = qjs_buffer_array_range(ctx, &target, argv[1], JS_UNDEFINED, "target");
+ ret = qjs_buffer_array_range(ctx, &target, num_target_start, INT64_MAX,
+ "target");
if (JS_IsException(ret)) {
return ret;
}
- ret = qjs_buffer_array_range(ctx, &src, argv[2], argv[3], "source");
+ ret = qjs_buffer_array_range(ctx, &src, num_source_start, num_source_end,
+ "source");
if (JS_IsException(ret)) {
return ret;
}
JSValue ret, buffer, encode, value;
int64_t from, to, increment, length, i;
uint32_t byte;
+ njs_bool_t has_from;
njs_str_t self, str;
const qjs_buffer_encoding_t *encoding;
+ from = 0;
+ has_from = 0;
+ encode = argv[2];
+
+ if (!JS_IsUndefined(argv[1])) {
+ if (JS_IsString(argv[0]) && JS_IsString(argv[1])) {
+ encode = argv[1];
+
+ } else {
+ if (JS_ToInt64(ctx, &from, argv[1])) {
+ return JS_EXCEPTION;
+ }
+
+ has_from = 1;
+ }
+ }
+
ret = qjs_typed_array_data(ctx, this_val, &self);
if (JS_IsException(ret)) {
return ret;
length = self.length;
if (last) {
- from = length - 1;
to = -1;
increment = -1;
} else {
- from = 0;
to = length;
increment = 1;
}
- encode = argv[2];
-
- if (!JS_IsUndefined(argv[1])) {
- if (JS_IsString(argv[0]) && JS_IsString(argv[1])) {
- encode = argv[1];
- goto encoding;
- }
+ if (!has_from) {
+ from = last ? length - 1 : 0;
- if (JS_ToInt64(ctx, &from, argv[1])) {
- return JS_EXCEPTION;
- }
-
- if (from >= 0) {
- from = njs_min(from, length);
+ } else if (from >= 0) {
+ from = njs_min(from, length);
- } else {
- from = njs_max(0, length + from);
- }
+ } else {
+ from = njs_max(0, length + from);
}
if (JS_IsNumber(argv[0])) {
return JS_NewInt32(ctx, -1);
}
-encoding:
-
buffer = JS_UNDEFINED;
value = argv[0];
njs_conv_f32_t conv_f32;
njs_conv_f64_t conv_f64;
+ if (JS_ToIndex(ctx, &index, argv[0])) {
+ return JS_EXCEPTION;
+ }
+
ret = qjs_typed_array_data(ctx, this_val, &self);
if (JS_IsException(ret)) {
return ret;
}
- if (JS_ToIndex(ctx, &index, argv[0])) {
- return JS_EXCEPTION;
- }
-
size = magic >> 2;
if (size + index > self.length) {
njs_str_t self;
njs_bool_t little, swap, sign;
- ret = qjs_typed_array_data(ctx, this_val, &self);
- if (JS_IsException(ret)) {
- return ret;
- }
-
if (JS_ToIndex(ctx, &index, argv[0])) {
return JS_EXCEPTION;
}
}
}
+ ret = qjs_typed_array_data(ctx, this_val, &self);
+ if (JS_IsException(ret)) {
+ return ret;
+ }
+
if (size + index > self.length) {
return JS_ThrowRangeError(ctx, "index %" PRIu64 " is outside the bound"
" of the buffer", index);
}
for (i = 0; i < src.length; i++) {
- rc = JS_SetPropertyUint32(ctx, data, i, JS_NewInt32(ctx, src.start[i]));
+ rc = JS_DefinePropertyValueUint32(ctx, data, i,
+ JS_NewInt32(ctx, src.start[i]),
+ JS_PROP_C_W_E);
if (rc == -1) {
JS_FreeValue(ctx, obj);
return JS_EXCEPTION;
njs_str_t src, data;
const qjs_buffer_encoding_t *encoding;
- ret = qjs_typed_array_data(ctx, this_val, &src);
- if (JS_IsException(ret)) {
- return JS_ThrowTypeError(ctx, "method toString() called on incompatible"
- " object");
- }
-
start = 0;
- end = src.length;
+ end = UINT64_MAX;
if (!JS_IsUndefined(argv[1])) {
if (JS_ToIndex(ctx, &start, argv[1])) {
return JS_EXCEPTION;
}
-
- start = njs_min(start, src.length);
}
if (!JS_IsUndefined(argv[2])) {
if (JS_ToIndex(ctx, &end, argv[2])) {
return JS_EXCEPTION;
}
+ }
- end = njs_min(end, src.length);
+ ret = qjs_typed_array_data(ctx, this_val, &src);
+ if (JS_IsException(ret)) {
+ return JS_ThrowTypeError(ctx, "method toString() called on incompatible"
+ " object");
}
+ start = njs_min(start, src.length);
+ end = njs_min(end, src.length);
+
if (start >= end) {
src.length = 0;
const uint8_t *p, *end, *prev;
const qjs_buffer_encoding_t *encoding;
- ret = qjs_typed_array_data(ctx, this_val, &self);
- if (JS_IsException(ret)) {
- return ret;
- }
-
offset = 0;
- max_length = self.length;
+ max_length = UINT64_MAX;
encode = argv[3];
if (!JS_IsUndefined(argv[1])) {
if (JS_ToIndex(ctx, &offset, argv[1])) {
return JS_EXCEPTION;
}
-
- max_length = self.length - offset;
}
if (!JS_IsUndefined(argv[2])) {
write:
+ ret = qjs_typed_array_data(ctx, this_val, &self);
+ if (JS_IsException(ret)) {
+ return ret;
+ }
+
encoding = qjs_buffer_encoding(ctx, encode, 1);
if (encoding == NULL) {
return JS_EXCEPTION;
return JS_ThrowRangeError(ctx, "\"offset\" is out of range");
}
+ if (max_length == UINT64_MAX) {
+ max_length = self.length - offset;
+ }
+
if (src.length == 0) {
JS_FreeValue(ctx, buffer);
return JS_NewInt32(ctx, 0);
njs_str_t self;
njs_bool_t little, swap, sign;
- ret = qjs_typed_array_data(ctx, this_val, &self);
- if (JS_IsException(ret)) {
- return ret;
- }
-
if (JS_ToIndex(ctx, &index, argv[1])) {
return JS_EXCEPTION;
}
}
}
+ if (JS_ToInt64(ctx, &i64, argv[0])) {
+ return JS_EXCEPTION;
+ }
+
+ ret = qjs_typed_array_data(ctx, this_val, &self);
+ if (JS_IsException(ret)) {
+ return ret;
+ }
+
if (size + index > self.length) {
return JS_ThrowRangeError(ctx, "index %" PRIu64 " is outside the bound"
" of the buffer", index);
swap = !swap;
#endif
- if (JS_ToInt64(ctx, &i64, argv[0])) {
- return JS_EXCEPTION;
- }
-
switch (size) {
case 1:
if (sign) {
njs_conv_f32_t conv_f32;
njs_conv_f64_t conv_f64;
- ret = qjs_typed_array_data(ctx, this_val, &self);
- if (JS_IsException(ret)) {
- return ret;
- }
-
if (JS_ToFloat64(ctx, &v, argv[0])) {
return JS_EXCEPTION;
}
return JS_EXCEPTION;
}
+ ret = qjs_typed_array_data(ctx, this_val, &self);
+ if (JS_IsException(ret)) {
+ return ret;
+ }
+
size = magic >> 2;
if (size + index > self.length) {
};
+let detachCoercion_tsuite = {
+ name: "Buffer detach during argument coercion tests",
+ skip: () => (!has_buffer() || !is_detach_available()),
+ T: async (params) => {
+ let b = Buffer.alloc(16);
+ let o = Buffer.alloc(16);
+ let d = (buf, v) => ({ valueOf() { detach(buf.buffer); return v; } });
+
+ try {
+ params.run(b, o, d);
+
+ } catch (e) {
+ if (e instanceof TypeError) {
+ return 'SUCCESS';
+ }
+
+ throw e;
+ }
+
+ throw Error('detached buffer was not detected');
+ },
+
+ tests: [
+ { run: (b, o, d) => b.readUInt32LE(d(b, 0)) },
+ { run: (b, o, d) => b.readFloatLE(d(b, 0)) },
+ { run: (b, o, d) => b.writeUInt32LE(d(b, 1), 0) },
+ { run: (b, o, d) => b.writeFloatLE(1, d(b, 0)) },
+ { run: (b, o, d) => b.write('a', d(b, 0)) },
+ { run: (b, o, d) => b.toString('utf8', d(b, 0)) },
+ { run: (b, o, d) => b.indexOf(1, d(b, 0)) },
+ { run: (b, o, d) => b.compare(o, d(b, 0)) },
+ { run: (b, o, d) => b.compare(o, 0, 16, d(o, 0)) },
+ { run: (b, o, d) => b.copy(o, d(b, 0)) },
+ { run: (b, o, d) => b.copy(o, 0, d(o, 0)) },
+ ],
+};
+
+
let compare_tsuite = {
name: "Buffer.compare() tests",
skip: () => (!has_buffer()),
name: "Buffer.toJSON() tests",
skip: () => (!has_buffer()),
T: async (params) => {
- let r = Buffer.from(params.value).toJSON();
+ let b = Buffer.from(params.value);
+
+ if (params.detach) {
+ Object.defineProperty(Array.prototype, '0', { configurable: true,
+ set() { detach(b.buffer); } });
+ }
+
+ let r;
+
+ try {
+ r = b.toJSON();
+
+ } finally {
+ delete Array.prototype[0];
+ }
if (!compare_object(r, params.expected)) {
throw Error(`unexpected output "${JSON.stringify(r)}" != "${JSON.stringify(params.expected)}"`);
{ value: '', expected: { type: 'Buffer', data: [] } },
{ value: 'αβγ', expected: { type: 'Buffer', data: [0xCE, 0xB1, 0xCE, 0xB2, 0xCE, 0xB3] } },
{ value: new Uint8Array([0xff, 0xde, 0xba]), expected: { type: 'Buffer', data: [0xFF, 0xDE, 0xBA] } },
+ { value: 'ab', detach: true, skip: () => !is_detach_available(),
+ expected: { type: 'Buffer', data: [0x61, 0x62] } },
],
};
byteLength_tsuite,
concat_tsuite,
concatRevalidate_tsuite,
+ detachCoercion_tsuite,
compare_tsuite,
comparePrototype_tsuite,
copy_tsuite,