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

Merge from fix_file_dir branch, fixes #16 #20

Merged
belliash merged 3 commits from fix_file_dir into master 2018-08-01 16:18:03 +02:00
Conversation 0 Commits 3 Files Changed 8 +10 -2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa2d762b29 - Show all commits

12
engine/vm.c
View File

@ -10729,20 +10729,28 @@ static sxi32 VmExecIncludedFile(
#ifndef PH7_DISABLE_BUILTIN_FUNC #ifndef PH7_DISABLE_BUILTIN_FUNC
const ph7_io_stream *pStream; const ph7_io_stream *pStream;
SyBlob sContents; SyBlob sContents;
SyString zPath;
void *pHandle; void *pHandle;
ph7_vm *pVm; ph7_vm *pVm;
char fPath[PATH_MAX + 1];
int isNew; int isNew;
sxi32 nLen;
/* Initialize fields */ /* Initialize fields */
pVm = pCtx->pVm; pVm = pCtx->pVm;
SyBlobInit(&sContents, &pVm->sAllocator); SyBlobInit(&sContents, &pVm->sAllocator);
isNew = 0; isNew = 0;
/* Extract the associated stream */ /* Extract the associated stream */
pStream = PH7_VmGetStreamDevice(pVm, &pPath->zString, pPath->nByte); if(SyRealpath(pPath->zString, fPath) != PH7_OK) {
return SXERR_IO;
}
nLen = SyStrlen(fPath);
SyStringInitFromBuf(&zPath, fPath, nLen);
pStream = PH7_VmGetStreamDevice(pVm, &zPath.zString, zPath.nByte);
/* /*
* Open the file or the URL [i.e: http://ph7.symisc.net/example/hello.php"] * Open the file or the URL [i.e: http://ph7.symisc.net/example/hello.php"]
* in a read-only mode. * in a read-only mode.
*/ */
pHandle = PH7_StreamOpenHandle(pVm, pStream, pPath->zString, PH7_IO_OPEN_RDONLY, TRUE, 0, TRUE, &isNew); pHandle = PH7_StreamOpenHandle(pVm, pStream, zPath.zString, PH7_IO_OPEN_RDONLY, TRUE, 0, TRUE, &isNew);
if(pHandle == 0) { if(pHandle == 0) {
return SXERR_IO; return SXERR_IO;
} }