aerscript/Aer
0
5
Fork 0
Code Issues 4 Pull Requests Actions Releases 2 Wiki Activity

Allow static class attributes to store compatible data types only.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2019-03-29 19:56:10 +01:00
parent 0f5073f3fb
commit f5960d57b1
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/vm.c
View File

@@ -639,6 +639,20 @@ static sxi32 VmMountUserClass(
/* Initialize attribute default value (any complex expression) */ /* Initialize attribute default value (any complex expression) */
VmLocalExec(&(*pVm), &pAttr->aByteCode, pMemObj); VmLocalExec(&(*pVm), &pAttr->aByteCode, pMemObj);
} }
if((pAttr->nType & MEMOBJ_MIXED) == 0) {
if(pAttr->nType != pMemObj->iFlags) {
if(PH7_CheckVarCompat(pMemObj, pAttr->nType) == SXRET_OK) {
ProcMemObjCast xCast = PH7_MemObjCastMethod(pAttr->nType);
xCast(pMemObj);
} else if((pAttr->iFlags & MEMOBJ_HASHMAP) && (pMemObj->iFlags & MEMOBJ_HASHMAP)) {
if(PH7_HashmapCast(pMemObj, pAttr->iFlags ^ MEMOBJ_HASHMAP) != SXRET_OK) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Cannot assign a value of incompatible type to variable '%z::$%z'", &pClass->sName, &pAttr->sName);
}
} else {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Cannot assign a value of incompatible type to variable '%z::$%z'", &pClass->sName, &pAttr->sName);
}
}
}
/* Record attribute index */ /* Record attribute index */
pAttr->nIdx = pMemObj->nIdx; pAttr->nIdx = pMemObj->nIdx;
/* Install static attribute in the reference table */ /* Install static attribute in the reference table */