virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

lavf/ftp: properly read an empty path

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Mariusz Szczepańczyk 2015-08-09 02:38:11 +02:00 committed by Michael Niedermayer
parent bc93053161
commit ee44cb3c81
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/ftp.c
View File

@ -354,10 +354,7 @@ static int ftp_current_dir(FTPContext *s)
if (!end) if (!end)
goto fail; goto fail;
if (end > res && end[-1] == '/') { *end = '\0';
end[-1] = '\0';
} else
*end = '\0';
s->path = av_strdup(start); s->path = av_strdup(start);
av_free(res); av_free(res);
@ -605,9 +602,8 @@ static int ftp_connect(URLContext *h, const char *url)
{ {
char proto[10], path[MAX_URL_SIZE], credencials[MAX_URL_SIZE], hostname[MAX_URL_SIZE]; char proto[10], path[MAX_URL_SIZE], credencials[MAX_URL_SIZE], hostname[MAX_URL_SIZE];
const char *tok_user = NULL, *tok_pass = NULL; const char *tok_user = NULL, *tok_pass = NULL;
char *end = NULL; char *end = NULL, *newpath = NULL;
int err; int err;
size_t pathlen;
FTPContext *s = h->priv_data; FTPContext *s = h->priv_data;
s->state = DISCONNECTED; s->state = DISCONNECTED;
@ -642,10 +638,12 @@ static int ftp_connect(URLContext *h, const char *url)
if ((err = ftp_current_dir(s)) < 0) if ((err = ftp_current_dir(s)) < 0)
return err; return err;
pathlen = strlen(s->path) + strlen(path) + 1;
if ((err = av_reallocp(&s->path, pathlen)) < 0) newpath = av_append_path_component(s->path, path);
return err; if (!newpath)
av_strlcat(s->path + strlen(s->path), path, pathlen); return AVERROR(ENOMEM);
av_free(s->path);
s->path = newpath;
return 0; return 0;
} }