From 4396de5e383b44a75a878f14bd190aa7afe50b22 Mon Sep 17 00:00:00 2001
From: yar <yar@FreeBSD.org>
Date: Mon, 5 Aug 2002 14:26:40 +0000
Subject: Spot places where "pathname" hasn't been checked for NULL.  The
 "pathname" rule may return NULL on a glob(3) error.

Obtained from:	OpenBSD
MFC after:	1 week
---
 libexec/ftpd/ftpcmd.y | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libexec')

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 2284f02..0f48140 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -516,7 +516,7 @@ cmd
 		}
 	| RNTO check_login_ro SP pathname CRLF
 		{
-			if ($2) {
+			if ($2 && $4 != NULL) {
 				if (fromname) {
 					renamecmd(fromname, $4);
 					free(fromname);
@@ -525,7 +525,8 @@ cmd
 					reply(503, "Bad sequence of commands.");
 				}
 			}
-			free($4);
+			if ($4 != NULL)
+				free($4);
 		}
 	| ABOR check_login CRLF
 		{
@@ -609,7 +610,7 @@ cmd
 		{
 			char p[64], *q;
 
-			if ($4) {
+			if ($4 && $6) {
 				q = MD5File($6, p);
 				if (q != NULL)
 					reply(200, "MD5(%s) = %s", $6, p);
-- 
cgit v1.1