Date: Wed, 7 Sep 2011 13:26:20 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225436 - in user/gabor/grep/trunk: . regex Message-ID: <201109071326.p87DQKeR040485@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Wed Sep 7 13:26:20 2011 New Revision: 225436 URL: http://svn.freebsd.org/changeset/base/225436 Log: - Fix some warnings Modified: user/gabor/grep/trunk/grep.c user/gabor/grep/trunk/regex/fastmatch.c Modified: user/gabor/grep/trunk/grep.c ============================================================================== --- user/gabor/grep/trunk/grep.c Wed Sep 7 13:01:26 2011 (r225435) +++ user/gabor/grep/trunk/grep.c Wed Sep 7 13:26:20 2011 (r225436) @@ -234,7 +234,7 @@ add_pattern(char *pat, size_t len) /* Check if we can do a shortcut */ if (len == 0) { matchall = true; - for (int i = 0; i < patterns; i++) { + for (unsigned int i = 0; i < patterns; i++) { free(pattern[i].pat); } pattern = grep_realloc(pattern, sizeof(struct pat)); Modified: user/gabor/grep/trunk/regex/fastmatch.c ============================================================================== --- user/gabor/grep/trunk/regex/fastmatch.c Wed Sep 7 13:01:26 2011 (r225435) +++ user/gabor/grep/trunk/regex/fastmatch.c Wed Sep 7 13:26:20 2011 (r225436) @@ -183,7 +183,9 @@ tre_fastfree(fastmatch_t *preg) size_t offset = pmatch[0].rm_so; \ int ret; \ \ - if ((len != (unsigned)-1) && (pmatch[0].rm_eo > len)) \ + if ((pmatch[0].rm_so < 0) || (pmatch[0].rm_eo < 0)) \ + return REG_NOMATCH; \ + if ((len != (unsigned)-1) && ((unsigned long)pmatch[0].rm_eo > len))\ return REG_NOMATCH; \ if ((long long)pmatch[0].rm_eo - pmatch[0].rm_so < 0) \ return REG_NOMATCH; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109071326.p87DQKeR040485>