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

vbscript: Don't allow OP_dim on already initialized arrays.

This commit is contained in:
Jacek Caban 2013-11-22 16:48:33 +01:00 committed by Alexandre Julliard
parent d222521989
commit 1c1a261122
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/vbscript/interp.c
View File

@ -984,6 +984,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx)
{
const BSTR ident = ctx->instr->arg1.bstr;
const unsigned array_id = ctx->instr->arg2.uint;
const array_desc_t *array_desc;
ref_t ref;
HRESULT hres;
@ -1007,15 +1008,16 @@ static HRESULT interp_dim(exec_ctx_t *ctx)
return E_FAIL;
}
if(!ctx->arrays[array_id]) {
const array_desc_t *array_desc;
if(ctx->arrays[array_id]) {
FIXME("Array already initialized\n");
return E_FAIL;
}
array_desc = ctx->func->array_descs + array_id;
if(array_desc->dim_cnt) {
ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds);
if(!ctx->arrays[array_id])
return E_OUTOFMEMORY;
}
array_desc = ctx->func->array_descs + array_id;
if(array_desc->dim_cnt) {
ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds);
if(!ctx->arrays[array_id])
return E_OUTOFMEMORY;
}
V_VT(ref.u.v) = VT_ARRAY|VT_BYREF|VT_VARIANT;