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

jscript: Better handling of to_integer result in String.charAt.

Browse Source
This commit is contained in:
Jacek Caban 2012-05-03 10:40:13 +02:00 committed by Alexandre Julliard
parent 3ee7438a5f
commit 0143201eac
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/jscript/string.c
View File

@ -303,19 +303,15 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS
if(arg_cnt(dp)) { if(arg_cnt(dp)) {
VARIANT num; VARIANT num;
double d;
hres = to_integer(ctx, get_arg(dp, 0), ei, &num); hres = to_integer(ctx, get_arg(dp, 0), ei, &num);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;
} }
d = num_val(&num);
if(V_VT(&num) == VT_I4) { pos = is_int32(d) ? d : -1;
pos = V_I4(&num);
}else {
WARN("pos = %lf\n", V_R8(&num));
pos = -1;
}
} }
if(!retv) { if(!retv) {

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

@ -308,6 +308,8 @@ tmp = "abc".charAt(0,2);
ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp);
tmp = "abc".charAt(NaN); tmp = "abc".charAt(NaN);
ok(tmp === "a", "'abc',charAt(NaN) = " + tmp); ok(tmp === "a", "'abc',charAt(NaN) = " + tmp);
tmp = "abc".charAt(bigInt);
ok(tmp === "", "'abc',charAt(bigInt) = " + tmp);
tmp = "abc".charCodeAt(0); tmp = "abc".charCodeAt(0);
ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp); ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp);