From owner-svn-src-user@FreeBSD.ORG  Wed Sep  7 13:26:20 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5EEB106564A;
	Wed,  7 Sep 2011 13:26:20 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A5B3B8FC23;
	Wed,  7 Sep 2011 13:26:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p87DQKt7040488;
	Wed, 7 Sep 2011 13:26:20 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p87DQKeR040485;
	Wed, 7 Sep 2011 13:26:20 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201109071326.p87DQKeR040485@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 7 Sep 2011 13:26:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225436 - in user/gabor/grep/trunk: . regex
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2011 13:26:20 -0000

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;						\