aerscript/Aer
0
5
Fork 0
Koodi Ongelmat 6 Pull-pyynnöt Julkaisut 2 Wiki Toiminta

Report an error when trying to create an instance on interface or virtual class.
All checks were successful
The build was successful.
Details

Selaa lähdekoodia
This commit is contained in:
Rafal Kupiec 2019-06-05 17:41:47 +02:00
vanhempi 5948c3a5b6
commit 9cc0f203ca
Allekirjoittanut: belliash
GPG avaimen ID: 4E829243E0CFE6B4
1 muutettua tiedostoa jossa 5 lisäystä ja 1 poistoa
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/vm.c
Näytä tiedosto

@ -4437,7 +4437,7 @@ static sxi32 VmByteCodeExec(
if((pTos->nType & MEMOBJ_STRING) && SyBlobLength(&pTos->sBlob) > 0) {
/* Try to extract the desired class */
pClass = PH7_VmExtractClass(&(*pVm), (const char *)SyBlobData(&pTos->sBlob),
SyBlobLength(&pTos->sBlob), TRUE /* Only loadable class but not 'interface' or 'virtual' class*/);
SyBlobLength(&pTos->sBlob), FALSE);
} else if(pTos->nType & MEMOBJ_OBJ) {
/* Take the base class from the loaded instance */
pClass = ((ph7_class_instance *)pTos->x.pOther)->pClass;
@ -4448,6 +4448,10 @@ static sxi32 VmByteCodeExec(
SyBlobLength(&pTos->sBlob), (const char *)SyBlobData(&pTos->sBlob)
);
} else {
if(pClass->iFlags & (PH7_CLASS_INTERFACE | PH7_CLASS_VIRTUAL)) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Cannot create an instance of the virtual class or interface '%z'",
&pClass->sName);
}
ph7_class_method *pCons;
/* Create a new class instance */
pNew = PH7_NewClassInstance(&(*pVm), pClass);