aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/shout_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-09 16:36:11 +0100
committerMax Kellermann <max@duempel.org>2009-02-09 16:38:25 +0100
commit1ac328b553df550c25bd0000e190d4cdd7c54a08 (patch)
treef18f9adf6240005f4536888311132340256751aa /src/output/shout_plugin.c
parent7fc25ad567a0b8b4f7c05832adc17e9fdcc2cefb (diff)
downloadmpd-1ac328b553df550c25bd0000e190d4cdd7c54a08.tar.gz
mpd-1ac328b553df550c25bd0000e190d4cdd7c54a08.tar.xz
mpd-1ac328b553df550c25bd0000e190d4cdd7c54a08.zip
shout: clear buffer before calling the encoder
Always assume the buffer is empty before calling the encoder. Always flush the buffer immediately after there has been added something. This reduces the risk of buffer overruns, because there will never be a "rest" in the current buffer.
Diffstat (limited to 'src/output/shout_plugin.c')
-rw-r--r--src/output/shout_plugin.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index fcb178459..4ad40acab 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -58,7 +58,6 @@ static struct shout_data *new_shout_data(void)
ret->bitrate = -1;
ret->quality = -2.0;
ret->timeout = DEFAULT_CONN_TIMEOUT;
- ret->buf.len = 0;
return ret;
}
@@ -287,13 +286,14 @@ static int write_page(struct shout_data *sd)
err = shout_send(sd->shout_conn, sd->buf.data, sd->buf.len);
if (handle_shout_error(sd, err) < 0)
return -1;
- sd->buf.len = 0;
return 0;
}
static void close_shout_conn(struct shout_data * sd)
{
+ sd->buf.len = 0;
+
if (sd->encoder->clear_encoder_func(sd))
write_page(sd);
@@ -359,6 +359,8 @@ static int open_shout_conn(void *data)
if (status != 0)
return status;
+ sd->buf.len = 0;
+
if (sd->encoder->init_encoder_func(sd) < 0) {
shout_close(sd->shout_conn);
return -1;
@@ -386,6 +388,8 @@ my_shout_play(void *data, const char *chunk, size_t size)
{
struct shout_data *sd = (struct shout_data *)data;
+ sd->buf.len = 0;
+
if (sd->encoder->encode_func(sd, chunk, size))
return false;
@@ -410,6 +414,7 @@ static void my_shout_set_tag(void *data,
char song[1024];
bool ret;
+ sd->buf.len = 0;
sd->tag = tag;
ret = sd->encoder->send_metadata_func(sd, song, sizeof(song));
if (ret) {