[FFmpeg-cvslog] Fix termination of mov_ch_layouts_wav array lookup

Thierry Foucu git at videolan.org
Tue Mar 19 00:06:59 CET 2013


ffmpeg | branch: master | Thierry Foucu <tfoucu at gmail.com> | Mon Mar 18 14:00:23 2013 -0700| [823efd9286b376c27aca20547c4b5e27f7c920e6] | committer: Michael Niedermayer

Fix termination of mov_ch_layouts_wav array lookup

Problem found using ASAN.
In some case, the ff_mov_get_channel_layout_tag function will not find 0
as termination for lookup in the array mov_ch_layouts_wav.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=823efd9286b376c27aca20547c4b5e27f7c920e6
---

 libavformat/mov_chan.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index cf1f839..7078b4a 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -426,6 +426,7 @@ static const enum MovChannelLayoutTag mov_ch_layouts_wav[] = {
     MOV_CH_LAYOUT_MPEG_7_1_A,
     MOV_CH_LAYOUT_MPEG_7_1_C,
     MOV_CH_LAYOUT_SMPTE_DTV,
+    0,
 };
 
 static const struct {



More information about the ffmpeg-cvslog mailing list