git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dface53
)
avcodec/pictordec: Fix logic error
author
Michael Niedermayer
<michael@niedermayer.cc>
Tue, 7 Feb 2017 14:49:09 +0000
(15:49 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Tue, 7 Feb 2017 20:32:08 +0000
(21:32 +0100)
Fixes: 559/clusterfuzz-testcase-
6424225917173760
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/pictordec.c
patch
|
blob
|
history
diff --git
a/libavcodec/pictordec.c
b/libavcodec/pictordec.c
index
ff6eb7f
..
0cfc785
100644
(file)
--- a/
libavcodec/pictordec.c
+++ b/
libavcodec/pictordec.c
@@
-142,7
+142,7
@@
static int decode_frame(AVCodecContext *avctx,
if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
return -1;
- if (s->width != avctx->width
&&
s->height != avctx->height) {
+ if (s->width != avctx->width
||
s->height != avctx->height) {
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;