diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-05 23:40:10 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-05 23:40:10 +0000 |
| commit | 85f173cd5b12d5a53a94a2616c498cdae68fec2a (patch) | |
| tree | 655dbc4dcb7e2950bde6492c66e2572d53873c6e /src/spu_dec | |
| parent | 92d532f070f578c4f7f0df3daadf05497be1ed10 (diff) | |
| parent | 5347abe5764b0a0ff3ef1d357ce9934a425758fa (diff) | |
| download | xine-lib-85f173cd5b12d5a53a94a2616c498cdae68fec2a.tar.gz xine-lib-85f173cd5b12d5a53a94a2616c498cdae68fec2a.tar.bz2 | |
Merge security fixes from 1.1.
--HG--
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'src/spu_dec')
| -rw-r--r-- | src/spu_dec/sputext_demuxer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/spu_dec/sputext_demuxer.c b/src/spu_dec/sputext_demuxer.c index fe259381c..20c0499da 100644 --- a/src/spu_dec/sputext_demuxer.c +++ b/src/spu_dec/sputext_demuxer.c @@ -149,7 +149,7 @@ static char *read_line_from_input(demux_sputext_t *this, char *line, off_t len) char *s; int linelen; - if ((len - this->buflen) > 512) { + if ((len - this->buflen) > 512 && len < SUB_BUFSIZE) { if((nread = this->input->read(this->input, &this->buf[this->buflen], len - this->buflen)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "read failed.\n"); |