summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pechkin <mpech@cvs.openbsd.org>2002-01-30 18:01:47 +0000
committerMike Pechkin <mpech@cvs.openbsd.org>2002-01-30 18:01:47 +0000
commit43a72a93f62543ff47a1e40f5b7a3ba3bd1f9961 (patch)
tree9973cf50dbd544cefc2094473da05f0d3f164789
parent3f6f4cddbfbd8741fd5f41b841a59c16728bafc1 (diff)
Fix leak in `EPSV ALL`.
Since now ``ALL'' should be treated like CRLF, COMMA, etc. millert@ ok
-rw-r--r--libexec/ftpd/ftpcmd.y9
1 files changed, 3 insertions, 6 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index fdab995915a..58f862029e3 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpcmd.y,v 1.36 2002/01/30 17:14:29 mpech Exp $ */
+/* $OpenBSD: ftpcmd.y,v 1.37 2002/01/30 18:01:46 mpech Exp $ */
/* $NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $ */
/*
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
#else
-static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.36 2002/01/30 17:14:29 mpech Exp $";
+static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.37 2002/01/30 18:01:46 mpech Exp $";
#endif
#endif /* not lint */
@@ -113,9 +113,8 @@ char *fromname;
%token
A B C E F I
L N P R S T
- ALL
- SP CRLF COMMA
+ SP CRLF COMMA ALL
USER PASS ACCT REIN QUIT PORT
PASV TYPE STRU MODE RETR STOR
@@ -132,7 +131,6 @@ char *fromname;
LEXERR
%token <s> STRING
-%token <s> ALL
%token <i> NUMBER
%type <i> check_login check_login_epsvall octal_number byte_size
@@ -1330,7 +1328,6 @@ yylex()
}
if (strncasecmp(&cbuf[cpos], "ALL", 3) == 0
&& !isalnum(cbuf[cpos + 3])) {
- yylval.s = strdup("ALL");
cpos += 3;
return ALL;
}