From 039b877ef01f0faee3bff159044399bd76bb58ac Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Sat, 23 Apr 2016 20:45:09 +0000 Subject: [PATCH] regex: prevent two improbable signed integer overflows. In matcher() we used an integer to index nsub of type size_t. In print() we used an integer to index nstates of type sopno, typedef'd long. In both cases the indexes never take negative values. Match the types to avoid any error. MFC after: 5 days --- lib/libc/regex/engine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c index 436370d0f6a..77baa7e606c 100644 --- a/lib/libc/regex/engine.c +++ b/lib/libc/regex/engine.c @@ -154,7 +154,7 @@ matcher(struct re_guts *g, int eflags) { const char *endp; - int i; + size_t i; struct match mv; struct match *m = &mv; const char *dp = NULL; @@ -1108,7 +1108,7 @@ print(struct match *m, FILE *d) { struct re_guts *g = m->g; - int i; + sopno i; int first = 1; if (!(m->eflags®_TRACE))