ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Better handling of to_integer result in Array.splice.

This commit is contained in:
Jacek Caban 2012-05-03 10:40:04 +02:00 committed by Alexandre Julliard
parent 096757c3dd
commit 3ee7438a5f
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/jscript/array.c
View File

@ -853,6 +853,8 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP
{ {
DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0;
jsdisp_t *ret_array = NULL, *jsthis; jsdisp_t *ret_array = NULL, *jsthis;
double d;
int n;
VARIANT v; VARIANT v;
HRESULT hres = S_OK; HRESULT hres = S_OK;
@ -867,14 +869,15 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP
hres = to_integer(ctx, get_arg(dp,0), ei, &v); hres = to_integer(ctx, get_arg(dp,0), ei, &v);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
d = num_val(&v);
if(V_VT(&v) == VT_I4) { if(is_int32(d)) {
if(V_I4(&v) >= 0) if((n = d) >= 0)
start = min(V_I4(&v), length); start = min(n, length);
else else
start = -V_I4(&v) > length ? 0 : length + V_I4(&v); start = -n > length ? 0 : length + n;
}else { }else {
start = V_R8(&v) < 0.0 ? 0 : length; start = d < 0.0 ? 0 : length;
} }
} }
@ -882,11 +885,12 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP
hres = to_integer(ctx, get_arg(dp,1), ei, &v); hres = to_integer(ctx, get_arg(dp,1), ei, &v);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
d = num_val(&v);
if(V_VT(&v) == VT_I4) { if(is_int32(d)) {
if(V_I4(&v) > 0) if((n = d) > 0)
delete_cnt = min(V_I4(&v), length-start); delete_cnt = min(n, length-start);
}else if(V_R8(&v) > 0.0) { }else if(d > 0.0) {
delete_cnt = length-start; delete_cnt = length-start;
} }

22
dlls/jscript/tests/api.js
View File

@ -18,6 +18,8 @@
var tmp, i; var tmp, i;
var bigInt = Math.pow(2,40);
ok(ScriptEngine() === "JScript", "ScriptEngine() = " + ScriptEngine()); ok(ScriptEngine() === "JScript", "ScriptEngine() = " + ScriptEngine());
ok(ScriptEngine(3) === "JScript", "ScriptEngine(3) = " + ScriptEngine(3)); ok(ScriptEngine(3) === "JScript", "ScriptEngine(3) = " + ScriptEngine(3));
ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajorVersion() !== ScriptEngineMajorVersion(2)"); ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajorVersion() !== ScriptEngineMajorVersion(2)");
@ -996,6 +998,26 @@ tmp = arr.splice();
ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString());
ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString());
arr = [1,2,3,4,5];
tmp = arr.splice(bigInt);
ok(tmp.toString() == "", "arr.splice(bigInt) returned " + tmp.toString());
ok(arr.toString() == "1,2,3,4,5", "arr.splice(bigInt) is " + arr.toString());
arr = [1,2,3,4,5];
tmp = arr.splice(-bigInt);
ok(tmp.toString() == "", "arr.splice(-bigInt) returned " + tmp.toString());
ok(arr.toString() == "1,2,3,4,5", "arr.splice(-bigInt) is " + arr.toString());
arr = [1,2,3,4,5];
tmp = arr.splice(2, bigInt);
ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString());
ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString());
arr = [1,2,3,4,5];
tmp = arr.splice(2, -bigInt);
ok(tmp.toString() == "", "arr.splice(2, bigInt) returned " + tmp.toString());
ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, bigInt) is " + arr.toString());
obj = new Object(); obj = new Object();
obj.length = 3; obj.length = 3;
obj[0] = 1; obj[0] = 1;