From owner-svn-src-all@FreeBSD.ORG  Wed Sep 16 19:53:30 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 700D5106566B;
	Wed, 16 Sep 2009 19:53:30 +0000 (UTC)
	(envelope-from sepotvin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F46F8FC12;
	Wed, 16 Sep 2009 19:53:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8GJrUZT034401;
	Wed, 16 Sep 2009 19:53:30 GMT
	(envelope-from sepotvin@svn.freebsd.org)
Received: (from sepotvin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8GJrU5H034400;
	Wed, 16 Sep 2009 19:53:30 GMT
	(envelope-from sepotvin@svn.freebsd.org)
Message-Id: <200909161953.n8GJrU5H034400@svn.freebsd.org>
From: "Stephane E. Potvin" <sepotvin@FreeBSD.org>
Date: Wed, 16 Sep 2009 19:53:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197259 - head/gnu/usr.bin/patch
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2009 19:53:30 -0000

Author: sepotvin
Date: Wed Sep 16 19:53:29 2009
New Revision: 197259
URL: http://svn.freebsd.org/changeset/base/197259

Log:
  The buffer returned by fgenln is not a "C" string and might not be NUL
  terminated. Make sure that it is before using it.
  
  Reviewed by:	marck@
  MFC after:	3 days

Modified:
  head/gnu/usr.bin/patch/common.h
  head/gnu/usr.bin/patch/pch.c

Modified: head/gnu/usr.bin/patch/common.h
==============================================================================
--- head/gnu/usr.bin/patch/common.h	Wed Sep 16 14:47:50 2009	(r197258)
+++ head/gnu/usr.bin/patch/common.h	Wed Sep 16 19:53:29 2009	(r197259)
@@ -34,6 +34,7 @@
 #define Strcpy (void)strcpy
 #define Strcat (void)strcat
 #define Strlcpy (void)strlcpy
+#define Strncpy (void)strncpy
 #define Strlcat (void)strlcat
 
 /* NeXT declares malloc and realloc incompatibly from us in some of

Modified: head/gnu/usr.bin/patch/pch.c
==============================================================================
--- head/gnu/usr.bin/patch/pch.c	Wed Sep 16 14:47:50 2009	(r197258)
+++ head/gnu/usr.bin/patch/pch.c	Wed Sep 16 19:53:29 2009	(r197259)
@@ -1176,7 +1176,8 @@ pgets(bool do_indent)
 					indent++;
 			}
 		}
-		Strlcpy(buf, line, len + 1 - skipped);
+		Strncpy(buf, line, len - skipped);
+		buf[len - skipped] = '\0';
 	}
 	return len;
 }