diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:04:37 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:04:37 +0100 |
commit | 6a2b53c22febcbc2041d760dccd795f388bc10c4 (patch) | |
tree | de97a08e2986472c6ce9a93fe92ca61d715edf2c /src/demuxers/demux_real.c | |
parent | 5be586e3025e72c1a1cef2a3ada6238486f7ed43 (diff) | |
parent | 10d79495d21c47a6c890d501d461b62cb46081e1 (diff) | |
download | xine-lib-6a2b53c22febcbc2041d760dccd795f388bc10c4.tar.gz xine-lib-6a2b53c22febcbc2041d760dccd795f388bc10c4.tar.bz2 |
Merge from 1.1.
--HG--
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/demuxers/demux_real.c')
-rw-r--r-- | src/demuxers/demux_real.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index d645215b0..64422b9ad 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -299,7 +299,7 @@ static mdpr_t *real_parse_mdpr(const char *data, const unsigned int size) goto fail; mdpr->type_specific_len=_X_BE_32(&data[34+mdpr->stream_name_size+mdpr->mime_type_size]); - if (size < 38 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_data) + if (size < 38 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_len) goto fail; mdpr->type_specific_data=xine_memdup(&data[38+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len); if (!mdpr->type_specific_data) |