aerscript
/
Aer
0
6
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Always make an array copy. Fixes #48.
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2019-04-20 07:19:35 +02:00
parent e794ffd97b
commit d819820798
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/hashmap.c
View File

@ -1008,12 +1008,6 @@ PH7_PRIVATE sxi32 PH7_HashmapDup(ph7_hashmap *pSrc, ph7_hashmap *pDest) {
ph7_value sKey, *pVal;
sxi32 rc;
sxu32 n;
if(pSrc == pDest) {
/* Same map. This can easily happen since hashmaps are passed by reference.
* Unlike the zend engine.
*/
return SXRET_OK;
}
/* Point to the first inserted entry in the source */
pEntry = pSrc->pFirst;
/* Perform the duplication */

20
engine/memobj.c
View File

@ -880,23 +880,27 @@ PH7_PRIVATE sxi32 PH7_MemObjStringFormat(ph7_value *pObj, const char *zFormat, v
*/
PH7_PRIVATE sxi32 PH7_MemObjStore(ph7_value *pSrc, ph7_value *pDest) {
ph7_class_instance *pObj = 0;
ph7_hashmap *pMap = 0;
ph7_hashmap *pSrcMap = 0;
sxi32 rc;
if(pSrc->x.pOther) {
if(pSrc->iFlags & MEMOBJ_HASHMAP) {
/* Increment reference count */
((ph7_hashmap *)pSrc->x.pOther)->iRef++;
/* Dump source hashmap */
pSrcMap = (ph7_hashmap *)pSrc->x.pOther;
} else if(pSrc->iFlags & MEMOBJ_OBJ) {
/* Increment reference count */
((ph7_class_instance *)pSrc->x.pOther)->iRef++;
}
}
if(pDest->iFlags & MEMOBJ_HASHMAP) {
pMap = (ph7_hashmap *)pDest->x.pOther;
} else if(pDest->iFlags & MEMOBJ_OBJ) {
if(pDest->iFlags & MEMOBJ_OBJ) {
pObj = (ph7_class_instance *)pDest->x.pOther;
}
SyMemcpy((const void *) & (*pSrc), &(*pDest), sizeof(ph7_value) - (sizeof(ph7_vm *) + sizeof(SyBlob) + sizeof(sxu32)));
if(pSrcMap) {
ph7_hashmap *pMap;
pMap = PH7_NewHashmap(&(*pDest->pVm), 0, 0);
PH7_HashmapDup(pSrcMap, pMap);
pDest->x.pOther = pMap;
}
rc = SXRET_OK;
if(SyBlobLength(&pSrc->sBlob) > 0) {
SyBlobReset(&pDest->sBlob);
@ -906,9 +910,7 @@ PH7_PRIVATE sxi32 PH7_MemObjStore(ph7_value *pSrc, ph7_value *pDest) {
SyBlobRelease(&pDest->sBlob);
}
}
if(pMap) {
PH7_HashmapUnref(pMap);
} else if(pObj) {
if(pObj) {
PH7_ClassInstanceUnref(pObj);
}
return rc;