From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/mlpdec: Use 64bit for channel layout
Date: Mon, 21 Mar 2022 00:30:53 +0100
Message-ID: <20220320233056.18169-2-michael@niedermayer.cc> (raw)
In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc>
Fixes: shift exponent 33 is too large for 32-bit type 'int'
Fixes: 45645/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-5651350182035456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/mlpdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index c51e0fbed7..2f5de9254a 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -207,7 +207,7 @@ static enum AVChannel thd_channel_layout_extract_channel(uint64_t channel_layout
return AV_CHAN_NONE;
for (i = 0; i < FF_ARRAY_ELEMS(thd_channel_order); i++)
- if (channel_layout & (1 << thd_channel_order[i]) && !index--)
+ if (channel_layout & (1LL << thd_channel_order[i]) && !index--)
return thd_channel_order[i];
return AV_CHAN_NONE;
}
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-03-20 23:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-20 23:30 [FFmpeg-devel] [PATCH 1/5] avformat/hls: Check target_duration Michael Niedermayer
2022-03-20 23:30 ` Michael Niedermayer [this message]
2022-03-20 23:34 ` [FFmpeg-devel] [PATCH 2/5] avcodec/mlpdec: Use 64bit for channel layout James Almer
2022-03-20 23:53 ` Michael Niedermayer
2022-03-20 23:30 ` [FFmpeg-devel] [PATCH 3/5] avformat/asfdec_f: Check packet_frag_timestamp Michael Niedermayer
2022-06-09 18:53 ` Michael Niedermayer
2022-03-20 23:30 ` [FFmpeg-devel] [PATCH 4/5] avformat/bfi: Check offsets better Michael Niedermayer
2022-06-09 18:53 ` Michael Niedermayer
2022-03-20 23:30 ` [FFmpeg-devel] [PATCH 5/5] avformat/aviobuf: Check buf_size in ffio_ensure_seekback() Michael Niedermayer
2022-06-09 18:54 ` Michael Niedermayer
2022-03-21 1:40 ` [FFmpeg-devel] [PATCH 1/5] avformat/hls: Check target_duration Steven Liu
2022-03-21 7:30 ` Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220320233056.18169-2-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git