Commit daf771db authored by Michael Smith's avatar Michael Smith

Patch from gtgbr@gmx.net to make ICECAST_VERSION_STRING safe to contain any

content.

svn path=/icecast/trunk/icecast/; revision=10617
parent ab1994ab
......@@ -331,7 +331,7 @@ static int process_vorbis_headers (ogg_state_t *ogg_info, ogg_codec_t *codec)
vorbis_comment_add_tag (&vc, "artist", ogg_info->artist);
if (ogg_info->title)
vorbis_comment_add_tag (&vc, "title", ogg_info->title);
vorbis_comment_add (&vc, "server=" ICECAST_VERSION_STRING);
vorbis_comment_add_tag (&vc, "server", ICECAST_VERSION_STRING);
vorbis_commentheader_out (&vc, &header);
ogg_stream_packetin (&source_vorbis->new_os, &header);
......
......@@ -77,7 +77,7 @@ static void _fatal_error(char *perr)
static void _print_usage(void)
{
printf(ICECAST_VERSION_STRING "\n\n");
printf("%s\n\n", ICECAST_VERSION_STRING);
printf("usage: icecast [-b -v] -c <file>\n");
printf("options:\n");
printf("\t-c <file>\tSpecify configuration file\n");
......@@ -518,7 +518,7 @@ int main(int argc, char **argv)
return 1;
}
INFO0 (ICECAST_VERSION_STRING " server started");
INFO1 ("%s server started", ICECAST_VERSION_STRING);
/* REM 3D Graphics */
......
......@@ -209,11 +209,12 @@ static void *start_relay_stream (void *arg)
* we don't send in this header then relay will not have mp3 metadata.
*/
sock_write(streamsock, "GET %s HTTP/1.0\r\n"
"User-Agent: " ICECAST_VERSION_STRING "\r\n"
"User-Agent: %s\r\n"
"%s"
"%s"
"\r\n",
relay->mount,
ICECAST_VERSION_STRING,
relay->mp3metadata?"Icy-MetaData: 1\r\n":"",
auth_header);
free (auth_header);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment