From owner-svn-src-projects@FreeBSD.ORG  Tue Dec  9 21:10:09 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B63911065670;
	Tue,  9 Dec 2008 21:10:09 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A64018FC12;
	Tue,  9 Dec 2008 21:10:09 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9LA9CY001854;
	Tue, 9 Dec 2008 21:10:09 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB9LA9dt001853;
	Tue, 9 Dec 2008 21:10:09 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200812092110.mB9LA9dt001853@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Tue, 9 Dec 2008 21:10:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185811 - projects/csup_cvsmode/contrib/csup
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2008 21:10:09 -0000

Author: lulf
Date: Tue Dec  9 21:10:09 2008
New Revision: 185811
URL: http://svn.freebsd.org/changeset/base/185811

Log:
  - Check return value of the encoded keyword before using it.
  
  Pointed out by:	Christian Weisgerber <naddy -at- mips.inka.de>

Modified:
  projects/csup_cvsmode/contrib/csup/rcsfile.c

Modified: projects/csup_cvsmode/contrib/csup/rcsfile.c
==============================================================================
--- projects/csup_cvsmode/contrib/csup/rcsfile.c	Tue Dec  9 21:09:05 2008	(r185810)
+++ projects/csup_cvsmode/contrib/csup/rcsfile.c	Tue Dec  9 21:10:09 2008	(r185811)
@@ -232,6 +232,7 @@ rcsfile_send_details(struct rcsfile *rf,
 {
 	struct delta *d;
 	struct tag *t;
+	const char *keyword;
 	int error;
 
 	assert(rf != NULL);
@@ -264,10 +265,13 @@ rcsfile_send_details(struct rcsfile *rf,
 		return(error);
 	/* Write expand. */
 	if (rf->expand != EXPAND_DEFAULT) {
-		error = proto_printf(wr, "E %s\n",
-		    keyword_encode_expand(rf->expand));
-		if (error)
-			return(error);
+		keyword = keyword_encode_expand(rf->expand);
+		if (keyword != NULL) {
+			error = proto_printf(wr, "E %s\n",
+			    keyword_encode_expand(rf->expand));
+			if (error)
+				return(error);
+		}
 	}
 
 	/* Write tags to server. */