mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-30 17:00:23 +02:00
Code Activity

(scm_make_regexp): Use SCM_VALIDATE_INT_COPY on flag

Browse source 
arguments, previously type was not checked.
This commit is contained in:
Kevin Ryde 2004-07-27 22:54:29 +00:00
parent 858d2470d3
commit df081058b9
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libguile/regex-posix.c
View file

@ -184,7 +184,7 @@ SCM_DEFINE (scm_make_regexp, "make-regexp", 1, 0, 1,
{ {
SCM flag; SCM flag;
regex_t *rx; regex_t *rx;
int status, cflags; int status, cflags, argnum;
SCM_VALIDATE_STRING (1, pat); SCM_VALIDATE_STRING (1, pat);
SCM_VALIDATE_REST_ARGUMENT (flags); SCM_VALIDATE_REST_ARGUMENT (flags);
@ -194,13 +194,17 @@ SCM_DEFINE (scm_make_regexp, "make-regexp", 1, 0, 1,
turn off REG_EXTENDED flag (on by default). */ turn off REG_EXTENDED flag (on by default). */
cflags = REG_EXTENDED; cflags = REG_EXTENDED;
flag = flags; flag = flags;
argnum = 2;
while (!SCM_NULLP (flag)) while (!SCM_NULLP (flag))
{ {
if (SCM_INUM (SCM_CAR (flag)) == REG_BASIC) int f;
SCM_VALIDATE_INT_COPY (argnum, SCM_CAR (flag), f);
if (f == REG_BASIC)
cflags &= ~REG_EXTENDED; cflags &= ~REG_EXTENDED;
else else
cflags |= SCM_INUM (SCM_CAR (flag)); cflags |= f;
flag = SCM_CDR (flag); flag = SCM_CDR (flag);
argnum++;
} }
rx = SCM_MUST_MALLOC_TYPE (regex_t); rx = SCM_MUST_MALLOC_TYPE (regex_t);