OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1664edb
)
indeo4: check ref_mb
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 23 Mar 2012 10:03:53 +0000
(11:03 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 23 Mar 2012 10:03:53 +0000
(11:03 +0100)
Fix NULL deref
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c
patch
|
blob
|
history
diff --git
a/libavcodec/indeo4.c
b/libavcodec/indeo4.c
index
df80b11
..
1d280a0
100644
(file)
--- a/
libavcodec/indeo4.c
+++ b/
libavcodec/indeo4.c
@@
-517,7
+517,7
@@
static int decode_mb_info(IVI4DecContext *ctx, IVIBandDesc *band,
}
}
} else {
- if (band->inherit_mv) {
+ if (band->inherit_mv
&& ref_mb
) {
mb->type = ref_mb->type; /* copy mb_type from corresponding reference mb */
} else if (ctx->frame_type == FRAMETYPE_INTRA) {
mb->type = 0; /* mb_type is always INTRA for intra-frames */