summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_slave.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-05 14:50:58 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-05 14:50:58 +0000
commit5347abe5764b0a0ff3ef1d357ce9934a425758fa (patch)
tree16114922f1fe3862535ef1898da393648522d48b /src/demuxers/demux_slave.c
parent0907a74b5fa7b8b439f1f8f5db239c7586bfb12d (diff)
parent8f725b5644ac910294fbe28929ddc98cd1d2ad38 (diff)
downloadxine-lib-5347abe5764b0a0ff3ef1d357ce9934a425758fa.tar.gz
xine-lib-5347abe5764b0a0ff3ef1d357ce9934a425758fa.tar.bz2
Merge security fixes.
Diffstat (limited to 'src/demuxers/demux_slave.c')
-rw-r--r--src/demuxers/demux_slave.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index 28a89a973..abb4d01e5 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -90,10 +90,11 @@ static int demux_slave_next (demux_slave_t *this) {
/* fill the scratch buffer */
n = this->input->read(this->input, &this->scratch[this->scratch_used],
SCRATCH_SIZE - this->scratch_used);
- this->scratch_used += n;
+ if (n > 0)
+ this->scratch_used += n;
this->scratch[this->scratch_used] = '\0';
- if( !n ) {
+ if (n <= 0) {
lprintf("connection closed\n");
this->status = DEMUX_FINISHED;
return 0;