[FFmpeg-cvslog] bmv: fix apparent sign error in the frame_off check
Michael Niedermayer
git at videolan.org
Sat Jun 9 21:05:16 CEST 2012
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 2 04:06:16 2012 +0200| [9c13d232a4ba858b3082127d9b332f0dd5595ace] | committer: Michael Niedermayer
bmv: fix apparent sign error in the frame_off check
Fixes part of Ticket1373
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit debbcfae6010f027a0334d70d0dbb7ddd912ad5a)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c13d232a4ba858b3082127d9b332f0dd5595ace
---
libavcodec/bmv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c
index 9740b11..35923a2 100644
--- a/libavcodec/bmv.c
+++ b/libavcodec/bmv.c
@@ -143,7 +143,7 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame,
switch (mode) {
case 1:
if (forward) {
- if (dst - frame + SCREEN_WIDE < frame_off ||
+ if (dst - frame + SCREEN_WIDE < -frame_off ||
frame_end - dst < frame_off + len)
return -1;
for (i = 0; i < len; i++)
@@ -151,7 +151,7 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame,
dst += len;
} else {
dst -= len;
- if (dst - frame + SCREEN_WIDE < frame_off ||
+ if (dst - frame + SCREEN_WIDE < -frame_off ||
frame_end - dst < frame_off + len)
return -1;
for (i = len - 1; i >= 0; i--)
More information about the ffmpeg-cvslog
mailing list