github_mirrors/quickjs
3
0
Fork 1
mirror of https://github.com/bellard/quickjs.git synced 2025-11-15 10:12:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed argument evaluation order in Date constructor and Date.UTC()

Browse Source
This commit is contained in:
Fabrice Bellard
2025-10-13 14:11:47 +02:00
parent 0d4cd2d051
commit 7fb994c45d
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -63,4 +63,4 @@ Test262o: 0/11262 errors, 463 excluded
Test262o commit: 7da91bceb9ce7613f87db47ddd1292a2dda58b42 (es5-tests branch) Test262o commit: 7da91bceb9ce7613f87db47ddd1292a2dda58b42 (es5-tests branch)
Test262: Test262:
Result: 67/83149 errors, 1645 excluded, 5538 skipped Result: 63/83149 errors, 1645 excluded, 5538 skipped

36
quickjs.c
View File

@@ -53236,6 +53236,21 @@ static double set_date_fields(double fields[minimum_length(7)], int is_local) {
return time_clip(tv); return time_clip(tv);
} }
static double set_date_fields_checked(double fields[minimum_length(7)], int is_local)
{
int i;
double a;
for(i = 0; i < 7; i++) {
a = fields[i];
if (!isfinite(a))
return NAN;
fields[i] = trunc(a);
if (i == 0 && fields[0] >= 0 && fields[0] < 100)
fields[0] += 1900;
}
return set_date_fields(fields, is_local);
}
static JSValue get_date_field(JSContext *ctx, JSValueConst this_val, static JSValue get_date_field(JSContext *ctx, JSValueConst this_val,
int argc, JSValueConst *argv, int magic) int argc, JSValueConst *argv, int magic)
{ {
@@ -53421,7 +53436,7 @@ static JSValue js_date_constructor(JSContext *ctx, JSValueConst new_target,
// Date(y, mon, d, h, m, s, ms) // Date(y, mon, d, h, m, s, ms)
JSValue rv; JSValue rv;
int i, n; int i, n;
double a, val; double val;
if (JS_IsUndefined(new_target)) { if (JS_IsUndefined(new_target)) {
/* invoked as function */ /* invoked as function */
@@ -53459,15 +53474,10 @@ static JSValue js_date_constructor(JSContext *ctx, JSValueConst new_target,
if (n > 7) if (n > 7)
n = 7; n = 7;
for(i = 0; i < n; i++) { for(i = 0; i < n; i++) {
if (JS_ToFloat64(ctx, &a, argv[i])) if (JS_ToFloat64(ctx, &fields[i], argv[i]))
return JS_EXCEPTION; return JS_EXCEPTION;
if (!isfinite(a))
break;
fields[i] = trunc(a);
if (i == 0 && fields[0] >= 0 && fields[0] < 100)
fields[0] += 1900;
} }
val = (i == n) ? set_date_fields(fields, 1) : NAN; val = set_date_fields_checked(fields, 1);
} }
has_val: has_val:
#if 0 #if 0
@@ -53497,7 +53507,6 @@ static JSValue js_Date_UTC(JSContext *ctx, JSValueConst this_val,
// UTC(y, mon, d, h, m, s, ms) // UTC(y, mon, d, h, m, s, ms)
double fields[] = { 0, 0, 1, 0, 0, 0, 0 }; double fields[] = { 0, 0, 1, 0, 0, 0, 0 };
int i, n; int i, n;
double a;
n = argc; n = argc;
if (n == 0) if (n == 0)
@@ -53505,15 +53514,10 @@ static JSValue js_Date_UTC(JSContext *ctx, JSValueConst this_val,
if (n > 7) if (n > 7)
n = 7; n = 7;
for(i = 0; i < n; i++) { for(i = 0; i < n; i++) {
if (JS_ToFloat64(ctx, &a, argv[i])) if (JS_ToFloat64(ctx, &fields[i], argv[i]))
return JS_EXCEPTION; return JS_EXCEPTION;
if (!isfinite(a))
return JS_NAN;
fields[i] = trunc(a);
if (i == 0 && fields[0] >= 0 && fields[0] < 100)
fields[0] += 1900;
} }
return JS_NewFloat64(ctx, set_date_fields(fields, 0)); return JS_NewFloat64(ctx, set_date_fields_checked(fields, 0));
} }
/* Date string parsing */ /* Date string parsing */

4
test262_errors.txt
View File

@@ -7,10 +7,6 @@ test262/test/annexB/language/expressions/assignmenttargettype/callexpression.js:
test262/test/annexB/language/expressions/assignmenttargettype/cover-callexpression-and-asyncarrowhead.js:20: SyntaxError: invalid assignment left-hand side test262/test/annexB/language/expressions/assignmenttargettype/cover-callexpression-and-asyncarrowhead.js:20: SyntaxError: invalid assignment left-hand side
test262/test/language/identifier-resolution/assign-to-global-undefined.js:20: strict mode: expected error test262/test/language/identifier-resolution/assign-to-global-undefined.js:20: strict mode: expected error
test262/test/language/module-code/top-level-await/rejection-order.js:20: TypeError: $DONE() not called test262/test/language/module-code/top-level-await/rejection-order.js:20: TypeError: $DONE() not called
test262/test/staging/sm/Date/UTC-convert-all-arguments.js:13: Test262Error: index 1: expected 42, got Error: didn't throw Expected SameValue(«Error: didn't throw», «42») to be true
test262/test/staging/sm/Date/UTC-convert-all-arguments.js:13: strict mode: Test262Error: index 1: expected 42, got Error: didn't throw Expected SameValue(«Error: didn't throw», «42») to be true
test262/test/staging/sm/Date/constructor-convert-all-arguments.js:13: Test262Error: index undefined: expected 42, got Error: didn't throw Expected SameValue(«Error: didn't throw», «42») to be true
test262/test/staging/sm/Date/constructor-convert-all-arguments.js:13: strict mode: Test262Error: index undefined: expected 42, got Error: didn't throw Expected SameValue(«Error: didn't throw», «42») to be true
test262/test/staging/sm/Date/two-digit-years.js:26: Test262Error: Expected SameValue(«915177600000», «NaN») to be true test262/test/staging/sm/Date/two-digit-years.js:26: Test262Error: Expected SameValue(«915177600000», «NaN») to be true
test262/test/staging/sm/Date/two-digit-years.js:26: strict mode: Test262Error: Expected SameValue(«915177600000», «NaN») to be true test262/test/staging/sm/Date/two-digit-years.js:26: strict mode: Test262Error: Expected SameValue(«915177600000», «NaN») to be true
test262/test/staging/sm/Function/arguments-parameter-shadowing.js:14: Test262Error: Expected SameValue(«true», «false») to be true test262/test/staging/sm/Function/arguments-parameter-shadowing.js:14: Test262Error: Expected SameValue(«true», «false») to be true