diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-25 00:02:29 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-25 00:02:29 +0000 |
| commit | cb82d7b686affd1d90e72b88acddf8d8d99ed972 (patch) | |
| tree | e9579b6adeda6f4f52c635114b62731c57a77bfd | |
| parent | f6fe1935082d9dc1c6f923e80f62c9e9c90d1169 (diff) | |
| download | xine-lib-cb82d7b686affd1d90e72b88acddf8d8d99ed972.tar.gz xine-lib-cb82d7b686affd1d90e72b88acddf8d8d99ed972.tar.bz2 | |
Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/input/libreal/rmff.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,6 +1,7 @@ xine-lib (1.1.18.1) 2010-??-?? * Oops. compat.c (for DXR3 support) was omitted. * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. + * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c index 6a2b761e1..82554a350 100644 --- a/src/input/libreal/rmff.c +++ b/src/input/libreal/rmff.c @@ -375,7 +375,7 @@ static rmff_mdpr_t *rmff_scan_mdpr(const char *data) mdpr->mime_type[mdpr->mime_type_size]=0; mdpr->type_specific_len=_X_BE_32(&data[42+mdpr->stream_name_size+mdpr->mime_type_size]); - if (mdpr->size < 46 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_data) + if (mdpr->size < 46 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_len) goto fail; mdpr->type_specific_data = malloc(mdpr->type_specific_len); if (!mdpr->type_specific_data) |