generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavformat/ftp: Do not leak memory in routine ftp_features

Browse Source 
Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.

Should fix CID1231988 (RESOURCE_LEAK)

OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
This commit is contained in:
Alexander Strasser 2014-08-20 00:41:55 +02:00
parent f75baa6c9b
commit db85d11d9d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/ftp.c
View File

@ -183,6 +183,9 @@ static int ftp_send_command(FTPContext *s, const char *command,
{ {
int err; int err;
if (response)
*response = NULL;
if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0) if ((err = ffurl_write(s->conn_control, command, strlen(command))) < 0)
return err; return err;
if (!err) if (!err)
@ -444,12 +447,14 @@ static int ftp_features(FTPContext *s)
static const char *enable_utf8_command = "OPTS UTF8 ON\r\n"; static const char *enable_utf8_command = "OPTS UTF8 ON\r\n";
static const int feat_codes[] = {211, 0}; static const int feat_codes[] = {211, 0};
static const int opts_codes[] = {200, 451}; static const int opts_codes[] = {200, 451};
char *feat; char *feat = NULL;
if (ftp_send_command(s, feat_command, feat_codes, &feat) == 211) { if (ftp_send_command(s, feat_command, feat_codes, &feat) == 211) {
if (av_stristr(feat, "UTF8")) if (av_stristr(feat, "UTF8"))
ftp_send_command(s, enable_utf8_command, opts_codes, NULL); ftp_send_command(s, enable_utf8_command, opts_codes, NULL);
} }
av_freep(&feat);
return 0; return 0;
} }