aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-04-03 12:57:58 +0000
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-04-03 15:17:59 +0200
commit8c5140df2b53e3d4ff02aa607ce41abd64d204d8 (patch)
tree6d457943477bc20b66cba5982c1b1e95c14539f9
parent3be6a8e1eb97d2bdcb0b1b1cd6cd0fc081c40114 (diff)
downloadffmpeg-8c5140df2b53e3d4ff02aa607ce41abd64d204d8.tar.gz
smacker: fix off by one error
Regression since a93b572ae4f517ce0c35cf085167c318e9215908. Fixes #2426. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit e3cc92a623a6ece42816c7a692c8815688a99ab0)
-rw-r--r--libavformat/smacker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 80e2fa694e..b2c442e2d8 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -263,7 +263,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
} else if(t & 0x40){ /* copy with offset */
off = avio_r8(s->pb);
j = (t & 0x3F) + 1;
- if (off + j > 0xff) {
+ if (off + j - 1 > 0xff) {
av_log(s, AV_LOG_ERROR,
"Invalid palette update, offset=%d length=%d extends beyond palette size\n",
off, j);