Commit b07a5e9b authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/smacker: check for format mismatch more completely

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f6e83322950_9769_wetlogo.smk
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 632fdec9
...@@ -662,7 +662,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, ...@@ -662,7 +662,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "channels mismatch\n"); av_log(avctx, AV_LOG_ERROR, "channels mismatch\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (bits && avctx->sample_fmt == AV_SAMPLE_FMT_U8) { if (bits == (avctx->sample_fmt == AV_SAMPLE_FMT_U8)) {
av_log(avctx, AV_LOG_ERROR, "sample format mismatch\n"); av_log(avctx, AV_LOG_ERROR, "sample format mismatch\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment