From owner-svn-src-all@FreeBSD.ORG  Tue Jan 11 00:58:49 2011
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 5769B1065697;
	Tue, 11 Jan 2011 00:58:49 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 465908FC24;
	Tue, 11 Jan 2011 00:58:49 +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 p0B0wnvt001158;
	Tue, 11 Jan 2011 00:58:49 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0B0wn9l001156;
	Tue, 11 Jan 2011 00:58:49 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201101110058.p0B0wn9l001156@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 11 Jan 2011 00:58:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217249 - stable/8/libexec/ftpd
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: Tue, 11 Jan 2011 00:58:49 -0000

Author: emaste
Date: Tue Jan 11 00:58:49 2011
New Revision: 217249
URL: http://svn.freebsd.org/changeset/base/217249

Log:
  MFC 216943, 216945:
  
    Handle failure from ftpd_popen in statfilecmd().
  
    Make format string a string literal.  (Discovered by clang.)

Modified:
  stable/8/libexec/ftpd/ftpd.c
Directory Properties:
  stable/8/libexec/ftpd/   (props changed)

Modified: stable/8/libexec/ftpd/ftpd.c
==============================================================================
--- stable/8/libexec/ftpd/ftpd.c	Tue Jan 11 00:29:17 2011	(r217248)
+++ stable/8/libexec/ftpd/ftpd.c	Tue Jan 11 00:58:49 2011	(r217249)
@@ -2133,7 +2133,7 @@ send_data(FILE *instr, FILE *outstr, siz
 				}
 			}
 			ENDXFER;
-			reply(226, msg);
+			reply(226, "%s", msg);
 			return (0);
 		}
 
@@ -2330,6 +2330,10 @@ statfilecmd(char *filename)
 	code = lstat(filename, &st) == 0 && S_ISDIR(st.st_mode) ? 212 : 213;
 	(void)snprintf(line, sizeof(line), _PATH_LS " -lgA %s", filename);
 	fin = ftpd_popen(line, "r");
+	if (fin == NULL) {
+		perror_reply(551, filename);
+		return;
+	}
 	lreply(code, "Status of %s:", filename);
 	atstart = 1;
 	while ((c = getc(fin)) != EOF) {