aerscript/Aer
0
5
派生 0
代码 工单 6 合并请求 版本发布 2 百科 动态

Make a use of PH7_MemObjSafeStore().
所有检测均成功
The build was successful.
详情

浏览代码
这个提交包含在：
Rafal Kupiec 2019-04-03 06:37:35 +02:00
父节点 fb50d8de25
当前提交 8133c3dd6f
签署人:: belliash
GPG 密钥 ID: 4E829243E0CFE6B4
共有 1 个文件被更改，包括 4 次插入 和 32 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

36
engine/vm.c
查看文件

@ -2698,22 +2698,8 @@ static sxi32 VmByteCodeExec(
pObj = (ph7_value *)SySetAt(&pVm->aMemObj, nIdx);
if(pObj) {
/* Perform the store operation */
if(pObj->iFlags == pTos->iFlags) {
PH7_MemObjStore(pTos, pObj);
} else if(pObj->iFlags & MEMOBJ_MIXED) {
PH7_MemObjStore(pTos, pObj);
pObj->iFlags |= MEMOBJ_MIXED;
} else if(PH7_CheckVarCompat(pTos, pObj->iFlags) == SXRET_OK) {
ProcMemObjCast xCast = PH7_MemObjCastMethod(pObj->iFlags);
xCast(pTos);
PH7_MemObjStore(pTos, pObj);
} else if((pObj->iFlags & MEMOBJ_HASHMAP) && (pTos->iFlags & MEMOBJ_HASHMAP)) {
if(PH7_HashmapCast(pTos, pObj->iFlags ^ MEMOBJ_HASHMAP) != SXRET_OK) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Cannot assign a value of incompatible type to variable '$%z'", &sName);
}
PH7_MemObjStore(pTos, pObj);
} else {
rc = PH7_MemObjSafeStore(pTos, pObj);
if(rc != SXRET_OK) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Cannot assign a value of incompatible type to variable '$%z'", &sName);
}
@ -2746,22 +2732,8 @@ static sxi32 VmByteCodeExec(
PH7_MemObjRelease(&pTos[1]);
}
/* Perform the store operation */
if(pObj->iFlags == pTos->iFlags) {
PH7_MemObjStore(pTos, pObj);
} else if(pObj->iFlags & MEMOBJ_MIXED) {
PH7_MemObjStore(pTos, pObj);
pObj->iFlags |= MEMOBJ_MIXED;
} else if(PH7_CheckVarCompat(pTos, pObj->iFlags) == SXRET_OK) {
ProcMemObjCast xCast = PH7_MemObjCastMethod(pObj->iFlags);
xCast(pTos);
PH7_MemObjStore(pTos, pObj);
} else if((pObj->iFlags & MEMOBJ_HASHMAP) && (pTos->iFlags & MEMOBJ_HASHMAP)) {
if(PH7_HashmapCast(pTos, pObj->iFlags ^ MEMOBJ_HASHMAP) != SXRET_OK) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Cannot assign a value of incompatible type to variable '$%z'", &sName);
}
PH7_MemObjStore(pTos, pObj);
} else {
rc = PH7_MemObjSafeStore(pTos, pObj);
if(rc != SXRET_OK) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Cannot assign a value of incompatible type to variable '$%z'", &sName);
}