mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

* alist.c (scm_sloppy_assq, scm_sloppy_assv, scm_sloppy_assoc):

Browse source 
Don't crash when passed an improper list terminated by a
non-immediate value.
This commit is contained in:
Jim Blandy 1996-10-15 21:56:27 +00:00
parent fcd69146b1
commit cf18adf033
1 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libguile/alist.c
View file

@ -76,15 +76,12 @@ scm_sloppy_assq(x, alist)
SCM x; SCM x;
SCM alist; SCM alist;
{ {
SCM tmp;
for(;SCM_NIMP(alist);alist = SCM_CDR(alist)) for (; SCM_NIMP (alist) && SCM_CONSP (alist); alist = SCM_CDR (alist))
{ {
if (SCM_CONSP(alist)) SCM tmp = SCM_CAR(alist);
{ if (SCM_NIMP (tmp) && SCM_CONSP (tmp) && (SCM_CAR (tmp)==x))
tmp = SCM_CAR(alist); return tmp;
if (SCM_NIMP (tmp) && SCM_CONSP (tmp) && (SCM_CAR (tmp)==x))
return tmp;
}
} }
return SCM_BOOL_F; return SCM_BOOL_F;
} }
@ -98,17 +95,13 @@ scm_sloppy_assv(x, alist)
SCM x; SCM x;
SCM alist; SCM alist;
{ {
SCM tmp; for (; SCM_NIMP (alist) && SCM_CONSP (alist); alist = SCM_CDR (alist))
for(;SCM_NIMP(alist);alist = SCM_CDR(alist))
{ {
if (SCM_CONSP(alist)) SCM tmp = SCM_CAR(alist);
{ if (SCM_NIMP (tmp)
tmp = SCM_CAR(alist); && SCM_CONSP (tmp)
if ( SCM_NIMP (tmp) && SCM_NFALSEP (scm_eqv_p (SCM_CAR (tmp), x)))
&& SCM_CONSP (tmp) return tmp;
&& SCM_NFALSEP (scm_eqv_p (SCM_CAR (tmp), x)))
return tmp;
}
} }
return SCM_BOOL_F; return SCM_BOOL_F;
} }
@ -121,17 +114,13 @@ scm_sloppy_assoc(x, alist)
SCM x; SCM x;
SCM alist; SCM alist;
{ {
SCM tmp; for (; SCM_NIMP (alist) && SCM_CONSP (alist); alist = SCM_CDR (alist))
for(;SCM_NIMP(alist);alist = SCM_CDR(alist))
{ {
if (SCM_CONSP(alist)) SCM tmp = SCM_CAR(alist);
{ if (SCM_NIMP (tmp)
tmp = SCM_CAR(alist); && SCM_CONSP (tmp)
if ( SCM_NIMP (tmp) && SCM_NFALSEP (scm_equal_p (SCM_CAR (tmp), x)))
&& SCM_CONSP (tmp) return tmp;
&& SCM_NFALSEP (scm_equal_p (SCM_CAR (tmp), x)))
return tmp;
}
} }
return SCM_BOOL_F; return SCM_BOOL_F;
} }