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

jscript: Better handling of to_integer in String.substr.

This commit is contained in:
Jacek Caban 2012-05-03 10:41:36 +02:00 committed by Alexandre Julliard
parent 9b02d2d5a3
commit e26a3018e7
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/jscript/string.c
View File

@ -1366,6 +1366,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS
INT start=0, len;
DWORD length;
VARIANT v;
double d;
HRESULT hres;
TRACE("\n");
@ -1381,15 +1382,9 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS
return hres;
}
if(V_VT(&v) == VT_I4) {
start = V_I4(&v);
if(start < 0)
start = 0;
else if(start >= length)
start = length;
}else {
start = V_R8(&v) < 0.0 ? 0 : length;
}
d = num_val(&v);
if(d >= 0)
start = is_int32(d) ? min(length, d) : length;
}
if(arg_cnt(dp) >= 2) {
@ -1399,15 +1394,11 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS
return hres;
}
if(V_VT(&v) == VT_I4) {
len = V_I4(&v);
if(len < 0)
len = 0;
else if(len > length-start)
len = length-start;
}else {
len = V_R8(&v) < 0.0 ? 0 : length-start;
}
d = num_val(&v);
if(d >= 0.0)
len = is_int32(d) ? min(length-start, d) : length-start;
else
len = 0;
}else {
len = length-start;
}