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/input/input_dvd.c | |
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/input/input_dvd.c')
-rw-r--r-- | src/input/input_dvd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 58e7dbb8b..0e5078099 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -851,6 +851,9 @@ static off_t dvd_plugin_read (input_plugin_t *this_gen, void *buf_gen, off_t len /* dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; */ char *ch_buf = (char *)buf_gen; + if (len < 4) + return -1; + /* FIXME: Tricking the demux_mpeg_block plugin */ ch_buf[0] = 0; ch_buf[1] = 0; |