videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge remote-tracking branch 'lukaszmluki/master' 

* lukaszmluki/master:
  ftp: fix using uninitialized value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-04 13:56:01 +02:00
parent 2192f89368 7faafe606f
commit 372e00793f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/ftp.c
View File

@ -265,7 +265,7 @@ static int ftp_auth(FTPContext *s)
static int ftp_passive_mode(FTPContext *s)
{
char *res = NULL, *start, *end;
char *res = NULL, *start = NULL, *end = NULL;
int i;
const char *command = "PASV\r\n";
const int pasv_codes[] = {227, 501, 0}; /* 501 is incorrect code */
@ -273,8 +273,7 @@ static int ftp_passive_mode(FTPContext *s)
if (ftp_send_command(s, command, pasv_codes, &res) != 227 || !res)
goto fail;
start = NULL;
for (i = 0; i < strlen(res); ++i) {
for (i = 0; res[i]; ++i) {
if (res[i] == '(') {
start = res + i + 1;
} else if (res[i] == ')') {