aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-24 21:05:33 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-24 22:23:53 +0100
commit513a3494396d0a20233273b3cadcb5ee86485d5c (patch)
tree877ccf190247f04d287983b8360726e422c0fa3f
parent5d81616be332cca99304d0b747c2c8e2d719f349 (diff)
downloadffmpeg-513a3494396d0a20233273b3cadcb5ee86485d5c.tar.gz
avcodec/vp56: Fix sign typo
Fixes: 664/clusterfuzz-testcase-4917047475568640 The change to fate is due to a truncated last frames which is now detected as damaged. Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/vp5.c2
-rw-r--r--libavcodec/vp6.c2
-rw-r--r--tests/ref/fate/vp52
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index aba177c89f..54db620bde 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -180,7 +180,7 @@ static int vp5_parse_coeff(VP56Context *s)
int b, i, cg, idx, ctx, ctx_last;
int pt = 0; /* plane type (0 for Y, 1 for U or V) */
- if (c->end >= c->buffer && c->bits >= 0) {
+ if (c->end <= c->buffer && c->bits >= 0) {
av_log(s->avctx, AV_LOG_ERROR, "End of AC stream reached in vp5_parse_coeff\n");
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 7f0a9b7d5d..662126ca70 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -450,7 +450,7 @@ static int vp6_parse_coeff(VP56Context *s)
int b, i, cg, idx, ctx;
int pt = 0; /* plane type (0 for Y, 1 for U or V) */
- if (c->end >= c->buffer && c->bits >= 0) {
+ if (c->end <= c->buffer && c->bits >= 0) {
av_log(s->avctx, AV_LOG_ERROR, "End of AC stream reached in vp6_parse_coeff\n");
return AVERROR_INVALIDDATA;
}
diff --git a/tests/ref/fate/vp5 b/tests/ref/fate/vp5
index 2116fb9b81..da510fc995 100644
--- a/tests/ref/fate/vp5
+++ b/tests/ref/fate/vp5
@@ -249,4 +249,4 @@
0, 243, 243, 1, 233472, 0x6f530ac6
0, 244, 244, 1, 233472, 0x94f7466c
0, 245, 245, 1, 233472, 0xa8c1d365
-0, 246, 246, 1, 233472, 0xedcff050
+0, 246, 246, 1, 233472, 0x8843293b