diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 14:10:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 14:10:09 +0100 |
| commit | aef816f957eec100da42bcbf65e3bfe86df679fa (patch) | |
| tree | 15bdbdde9fa060b95e64be2c628ed17efbb15530 /libavutil/lzo.c | |
| parent | e4e4add0e3ba7d8ca8ed9135288da910270d2ea3 (diff) | |
| parent | ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6 (diff) | |
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
Conflicts:
libavformat/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lzo.c')
| -rw-r--r-- | libavutil/lzo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/lzo.c b/libavutil/lzo.c index c723257212..221a66b9ab 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -110,9 +110,8 @@ static inline void copy(LZOContext *c, int cnt) */ static inline void copy_backptr(LZOContext *c, int back, int cnt) { - register const uint8_t *src = &c->out[-back]; register uint8_t *dst = c->out; - if (src < c->out_start || src > dst) { + if (dst - c->out_start < back) { c->error |= AV_LZO_INVALID_BACKPTR; return; } |