Date: Tue, 11 Jan 2011 00:58:49 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r217249 - stable/8/libexec/ftpd Message-ID: <201101110058.p0B0wn9l001156@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101110058.p0B0wn9l001156>