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

fix overflow when copying terms with attributes

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@430 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2002-04-06 03:54:18 +00:00
parent 8d579bb35d
commit bd654f1e18
4 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
C/attvar.c
View File

@@ -158,26 +158,7 @@ AttVarToTerm(CELL *orig)
static int
TermToAttVar(Term attvar, Term to)
{
int i = 0;
int open = FALSE;
while (IsPairTerm(attvar)) {
Term t = HeadOfTerm(attvar);
if (!IsVarTerm(t)) {
if (open) {
attvar_record *attv = (attvar_record *)VarOfTerm(Deref(to));
if (!PutAtt(attv, i, t))
return(FALSE);
} else {
if (!BuildNewAttVar(to, i, t))
return(FALSE);
open = TRUE;
}
}
i++;
attvar = TailOfTerm(attvar);
}
return(TRUE);
return(BuildNewAttVar(to, -1, attvar));
}
static void
@@ -369,11 +350,13 @@ BuildNewAttVar(Term t, Int i, Term tatt)
attvar_record *attv = (attvar_record *)ReadTimedVar(DelayedVars);
if (H0 - (CELL *)attv < 1024+(2*NUM_OF_ATTS)) {
ARG1 = t;
ARG2 = tatt;
H[0] = t;
H[1] = tatt;
H += 2;
growglobal();
t = ARG1;
tatt = ARG2;
H -= 2;
t = H[0];
tatt = H[1];
}
time = InitVarTime();
RESET_VARIABLE(&(attv->Value));
@@ -386,7 +369,22 @@ BuildNewAttVar(Term t, Int i, Term tatt)
attv->NS = UpdateTimedVar(AttsMutableList, (CELL)&(attv->Done));
Bind((CELL *)t,(CELL)attv);
UpdateTimedVar(DelayedVars,(CELL)(attv->Atts+2*j));
return(PutAtt(attv, i, tatt));
/* if i < 0 then we have the list of arguments */
if (i < 0) {
Int j = 0;
while (IsPairTerm(tatt)) {
Term t = HeadOfTerm(tatt);
/* I need to do this because BuildNewAttVar may shift the stacks */
if (!IsVarTerm(t)) {
attv->Atts[2*j+1] = t;
}
j++;
tatt = TailOfTerm(tatt);
}
return(TRUE);
} else {
return(PutAtt(attv, i, tatt));
}
}
static Int