brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from etix/hotfix

Browse Source 
Fix a crash with pasv invalid responses
This commit is contained in:
Julien Laffaye 2016-02-08 20:19:59 +01:00
commit fc06ecffd6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ftp.go
View File

@ -191,12 +191,16 @@ func (c *ServerConn) pasv() (port int, err error) {
start := strings.Index(line, "(") start := strings.Index(line, "(")
end := strings.LastIndex(line, ")") end := strings.LastIndex(line, ")")
if start == -1 || end == -1 { if start == -1 || end == -1 {
err = errors.New("Invalid PASV response format") return 0, errors.New("Invalid PASV response format")
return
} }
// We have to split the response string // We have to split the response string
pasvData := strings.Split(line[start+1:end], ",") pasvData := strings.Split(line[start+1:end], ",")
if len(pasvData) < 6 {
return 0, errors.New("Invalid PASV response format")
}
// Let's compute the port number // Let's compute the port number
portPart1, err1 := strconv.Atoi(pasvData[4]) portPart1, err1 := strconv.Atoi(pasvData[4])
if err1 != nil { if err1 != nil {