summaryrefslogtreecommitdiff
path: root/libavcodec/indeo4.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-23 11:03:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-23 11:03:53 +0100
commitaae44fb4cdfab4fae4d981d2fe1fd708f1dcf9bb (patch)
tree9930723cd331e11f72370b0cdb9f8bcb8800699d /libavcodec/indeo4.c
parent1664edb99859d0a9dfb8dc046f6ed922db301f78 (diff)
indeo4: check ref_mb
Fix NULL deref Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
-rw-r--r--libavcodec/indeo4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index df80b1139e..1d280a0c53 100644
--- 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 */