1
0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-12-04 14:46:31 -05:00

Revert bogus change that introduced a memory leak

This commit is contained in:
Moritz Grimm 2017-09-20 12:55:16 +02:00
parent 454cb5eac3
commit 85abb3958c

View File

@ -94,7 +94,7 @@ _build_reencode_cmd(const char *extension, const char *filename,
{ {
cfg_decoder_t decoder; cfg_decoder_t decoder;
cfg_encoder_t encoder; cfg_encoder_t encoder;
char *artist, *album, *title, *songinfo; char *artist, *album, *title, *songinfo, *tmp;
char *filename_quoted; char *filename_quoted;
char *custom_songinfo; char *custom_songinfo;
struct util_dict dicts[6]; struct util_dict dicts[6];
@ -116,10 +116,21 @@ _build_reencode_cmd(const char *extension, const char *filename,
return (NULL); return (NULL);
} }
artist = util_shellquote(util_utf82char(mdata_get_artist(md))); tmp = util_utf82char(mdata_get_artist(md));
album = util_shellquote(util_utf82char(mdata_get_album(md))); artist = util_shellquote(tmp);
title = util_shellquote(util_utf82char(mdata_get_title(md))); xfree(tmp);
songinfo = util_shellquote(util_utf82char(mdata_get_songinfo(md)));
tmp = util_utf82char(mdata_get_album(md));
album = util_shellquote(tmp);
xfree(tmp);
tmp = util_utf82char(mdata_get_title(md));
title = util_shellquote(tmp);
xfree(tmp);
tmp = util_utf82char(mdata_get_songinfo(md));
songinfo = util_shellquote(tmp);
xfree(tmp);
filename_quoted = util_shellquote(filename); filename_quoted = util_shellquote(filename);