CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2024-11-05 08:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed segfault on parser objection

Browse Source
This commit is contained in:
CPunch 2020-10-28 18:29:50 -05:00
parent 2e1b745624
commit 8e71cab642
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cobj.c
View File

@ -23,6 +23,9 @@ CObj *cosmoO_allocateObject(CState *state, size_t sz, CObjType type) {
obj->next = state->objects; obj->next = state->objects;
state->objects = obj; state->objects = obj;
#ifdef GC_DEBUG
printf("allocated %p with OBJ_TYPE %d\n", obj, type);
#endif
return obj; return obj;
} }

7
src/cparse.c
View File

@ -995,14 +995,13 @@ CObjFunction* cosmoP_compileString(CState *state, const char *source) {
popLocals(&parser, -1); // needed to close over the values popLocals(&parser, -1); // needed to close over the values
if (parser.hadError) { // free the function too if (parser.hadError) { // we don't free the function, the state already has a reference to it in it's linked list of objects!
cosmoO_freeObject(state, (CObj*)parser.compiler->function);
endCompiler(&parser, 0); endCompiler(&parser, 0);
freeParseState(&parser); freeParseState(&parser);
// the VM still expects a result on the stack TODO: push the error string to the stack // the VM still expects a result on the stack TODO: push the error string to the stack
cosmoV_pushValue(state, cosmoV_newNil()); cosmoV_pushValue(state, cosmoV_newNil());
cosmoM_unfreezeGC(state); cosmoM_unfreezeGC(state);
return NULL; return NULL;
} }
@ -1012,6 +1011,6 @@ CObjFunction* cosmoP_compileString(CState *state, const char *source) {
endCompiler(&parser, 0); endCompiler(&parser, 0);
freeParseState(&parser); freeParseState(&parser);
cosmoM_unfreezeGC(state); cosmoM_unfreezeGC(state);
return resFunc; return resFunc;
} }