diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-02-03 19:04:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 01:06:09 +0100 |
| commit | 49dd89f9027f3def12e170bb7d986d37812eedba (patch) | |
| tree | ae83139fed0828175a089eb32062bcb70c669828 | |
| parent | bdc4abd694a3234ef76d1f41a06e940d8fc9c0ed (diff) | |
| download | ffmpeg-49dd89f9027f3def12e170bb7d986d37812eedba.tar.gz | |
avformat/mpc8: fix broken pointer math
This could overflow and crash at least on 32 bit systems.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b737a2c52857b214be246ff615c6293730033cfa)
Conflicts:
libavformat/mpc8.c
| -rw-r--r-- | libavformat/mpc8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 916639fc52..56db8076e5 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -91,7 +91,7 @@ static int mpc8_probe(AVProbeData *p) size = bs_get_v(&bs); if (size < 2) return 0; - if (bs + size - 2 >= bs_end) + if (size >= bs_end - bs + 2) return AVPROBE_SCORE_MAX / 4 - 1; //seems to be valid MPC but no header yet if (header_found) { if (size < 11 || size > 28) |