oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/httpd/IcyMetaDataServer: pad the string with 15 spaces

Browse Source 
Fixes a buffer overflow due to the bad formula rounding the buffer
size up.  At the same time, remove the "+1" from the meta_length
calculation, which takes the padding into account and at the same time
implements proper rounding.
This commit is contained in:
Max Kellermann 2017-02-19 19:06:48 +01:00
parent 1bd00b8a9a
commit a73195b7cc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/httpd/IcyMetaDataServer.cxx
View File

@ -60,7 +60,11 @@ icy_server_metadata_string(const char *stream_title, const char* stream_url)
{ {
// The leading n is a placeholder for the length information // The leading n is a placeholder for the length information
auto icy_metadata = FormatString("nStreamTitle='%s';" auto icy_metadata = FormatString("nStreamTitle='%s';"
"StreamUrl='%s';", "StreamUrl='%s';"
/* pad 15 spaces just in case
the length needs to be
rounded up */
" ",
stream_title, stream_title,
stream_url); stream_url);
@ -68,7 +72,7 @@ icy_server_metadata_string(const char *stream_title, const char* stream_url)
meta_length--; // subtract placeholder meta_length--; // subtract placeholder
meta_length = meta_length / 16 + 1; meta_length = meta_length / 16;
icy_metadata[0] = meta_length; icy_metadata[0] = meta_length;