From 8810a86a2cfa05506efe8f4ff76900f04e3acd4d Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 10 Apr 2019 08:50:04 +0200 Subject: [PATCH] Fix for typoecasting callback to string. --- engine/memobj.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/memobj.c b/engine/memobj.c index 7c145cc..a814b4b 100644 --- a/engine/memobj.c +++ b/engine/memobj.c @@ -532,12 +532,14 @@ PH7_PRIVATE sxi32 PH7_MemObjToResource(ph7_value *pObj) { */ PH7_PRIVATE sxi32 PH7_MemObjToString(ph7_value *pObj) { sxi32 rc = SXRET_OK; - if((pObj->iFlags & MEMOBJ_STRING | MEMOBJ_CALL) == 0) { + if(pObj->iFlags & MEMOBJ_CALL) { + MemObjSetType(pObj, MEMOBJ_STRING); + } else if((pObj->iFlags & MEMOBJ_STRING) == 0) { /* Perform the conversion */ SyBlobReset(&pObj->sBlob); /* Reset the internal buffer */ rc = MemObjStringValue(&pObj->sBlob, &(*pObj), TRUE); + MemObjSetType(pObj, MEMOBJ_STRING); } - MemObjSetType(pObj, MEMOBJ_STRING); return rc; } /*