diff options
Diffstat (limited to 'lib/libc/regex')
| -rw-r--r-- | lib/libc/regex/engine.c | 4 | ||||
| -rw-r--r-- | lib/libc/regex/regcomp.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c index 261956bec96..2fdf63a0ee1 100644 --- a/lib/libc/regex/engine.c +++ b/lib/libc/regex/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.23 2016/05/26 05:46:44 martijn Exp $ */ +/* $OpenBSD: engine.c,v 1.24 2016/09/21 04:38:56 guenther Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 Henry Spencer. @@ -156,7 +156,7 @@ matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], if (g->must != NULL) { for (dp = start; dp < stop; dp++) if (*dp == g->must[0] && stop - dp >= g->mlen && - memcmp(dp, g->must, (size_t)g->mlen) == 0) + memcmp(dp, g->must, g->mlen) == 0) break; if (dp == stop) /* we didn't find g->must */ return(REG_NOMATCH); diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index e455a571c68..d848a492614 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: regcomp.c,v 1.28 2015/12/28 22:08:18 mmcc Exp $ */ +/* $OpenBSD: regcomp.c,v 1.29 2016/09/21 04:38:56 guenther Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 Henry Spencer. * Copyright (c) 1992, 1993, 1994 @@ -1294,8 +1294,7 @@ dupl(struct parse *p, return(ret); if (!enlarge(p, p->ssize + len)) /* this many unexpected additions */ return(ret); - (void) memcpy((char *)(p->strip + p->slen), - (char *)(p->strip + start), (size_t)len*sizeof(sop)); + (void) memcpy(p->strip + p->slen, p->strip + start, len * sizeof(sop)); p->slen += len; return(ret); } |