diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix possible memory leak.

Browse Source
This commit is contained in:
Vítor Santos Costa II 2010-04-09 17:02:24 +01:00
parent 8efec0b26e
commit b6f704fc7a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
C/index.c
View File

@ -3343,6 +3343,9 @@ compile_index(struct intermediates *cint)
} else if (ap->PredFlags & UDIPredFlag) { } else if (ap->PredFlags & UDIPredFlag) {
UInt lbl = new_label(cint); UInt lbl = new_label(cint);
Yap_emit(user_switch_op, Unsigned(ap), Unsigned(&(ap->cs.p_code.ExpandCode)), cint); Yap_emit(user_switch_op, Unsigned(ap), Unsigned(&(ap->cs.p_code.ExpandCode)), cint);
#if USE_SYSTEM_MALLOC
Yap_FreeCodeSpace((ADDR)cls);
#endif
return lbl; return lbl;
} else { } else {
/* prepare basic data structures */ /* prepare basic data structures */
@ -3404,6 +3407,7 @@ Yap_PredIsIndexable(PredEntry *ap, UInt NSlots, yamop *next_pc)
cint.expand_block = NULL; cint.expand_block = NULL;
Yap_ErrorMessage = NULL; Yap_ErrorMessage = NULL;
if (compile_index(&cint) == (UInt)FAILCODE) { if (compile_index(&cint) == (UInt)FAILCODE) {
Yap_ReleaseCMem(&cint);
return FAILCODE; return FAILCODE;
} }
#ifdef DEBUG #ifdef DEBUG
@ -3418,14 +3422,17 @@ Yap_PredIsIndexable(PredEntry *ap, UInt NSlots, yamop *next_pc)
if (cint.CodeStart) { if (cint.CodeStart) {
if ((indx_out = Yap_assemble(ASSEMBLING_INDEX, TermNil, ap, FALSE, &cint)) == NULL) { if ((indx_out = Yap_assemble(ASSEMBLING_INDEX, TermNil, ap, FALSE, &cint)) == NULL) {
if (!Yap_growheap(FALSE, Yap_Error_Size, NULL)) { if (!Yap_growheap(FALSE, Yap_Error_Size, NULL)) {
Yap_ReleaseCMem(&cint);
Yap_Error(OUT_OF_HEAP_ERROR, TermNil, Yap_ErrorMessage); Yap_Error(OUT_OF_HEAP_ERROR, TermNil, Yap_ErrorMessage);
return NULL; return NULL;
} }
goto restart_index; goto restart_index;
} }
} else { } else {
Yap_ReleaseCMem(&cint);
return NULL; return NULL;
} }
Yap_ReleaseCMem(&cint);
if (ap->PredFlags & LogUpdatePredFlag) { if (ap->PredFlags & LogUpdatePredFlag) {
LogUpdIndex *cl = ClauseCodeToLogUpdIndex(indx_out); LogUpdIndex *cl = ClauseCodeToLogUpdIndex(indx_out);
cl->ClFlags |= SwitchRootMask; cl->ClFlags |= SwitchRootMask;
@ -4591,6 +4598,7 @@ ExpandIndex(PredEntry *ap, int ExtraArgs, yamop *nextop) {
P = FAILCODE; P = FAILCODE;
recover_ecls_block(expand_clauses); recover_ecls_block(expand_clauses);
} }
Yap_ReleaseCMem(&cint);
return FAILCODE; return FAILCODE;
} }
if (*labp == FAILCODE) { if (*labp == FAILCODE) {
@ -4598,6 +4606,7 @@ ExpandIndex(PredEntry *ap, int ExtraArgs, yamop *nextop) {
P = FAILCODE; P = FAILCODE;
recover_ecls_block(expand_clauses); recover_ecls_block(expand_clauses);
} }
Yap_ReleaseCMem(&cint);
return FAILCODE; return FAILCODE;
} }
#ifdef DEBUG #ifdef DEBUG
@ -4613,6 +4622,7 @@ ExpandIndex(PredEntry *ap, int ExtraArgs, yamop *nextop) {
if ((indx_out = Yap_assemble(ASSEMBLING_EINDEX, TermNil, ap, FALSE, &cint)) == NULL) { if ((indx_out = Yap_assemble(ASSEMBLING_EINDEX, TermNil, ap, FALSE, &cint)) == NULL) {
if (!Yap_growheap(FALSE, Yap_Error_Size, NULL)) { if (!Yap_growheap(FALSE, Yap_Error_Size, NULL)) {
Yap_Error(OUT_OF_HEAP_ERROR, TermNil, Yap_ErrorMessage); Yap_Error(OUT_OF_HEAP_ERROR, TermNil, Yap_ErrorMessage);
Yap_ReleaseCMem(&cint);
return FAILCODE; return FAILCODE;
} }
goto restart_index; goto restart_index;
@ -4623,6 +4633,7 @@ ExpandIndex(PredEntry *ap, int ExtraArgs, yamop *nextop) {
P = *labp; P = *labp;
recover_ecls_block(expand_clauses); recover_ecls_block(expand_clauses);
} }
Yap_ReleaseCMem(&cint);
return *labp; return *labp;
} }
if (indx_out == NULL) { if (indx_out == NULL) {
@ -4630,8 +4641,10 @@ ExpandIndex(PredEntry *ap, int ExtraArgs, yamop *nextop) {
P = FAILCODE; P = FAILCODE;
recover_ecls_block(expand_clauses); recover_ecls_block(expand_clauses);
} }
Yap_ReleaseCMem(&cint);
return FAILCODE; return FAILCODE;
} }
Yap_ReleaseCMem(&cint);
*labp = indx_out; *labp = indx_out;
if (ap->PredFlags & LogUpdatePredFlag) { if (ap->PredFlags & LogUpdatePredFlag) {
/* add to head of current code children */ /* add to head of current code children */