[FFmpeg-cvslog] aacdec: reorder multiuplications to make code safer against too large input values .
Michael Niedermayer
git at videolan.org
Thu Oct 25 14:00:28 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 25 13:42:02 2012 +0200| [da4e4d65f456f170e75865807d21a8b5ed5ea4d7] | committer: Michael Niedermayer
aacdec: reorder multiuplications to make code safer against too large input values.
Fixes CID700697
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da4e4d65f456f170e75865807d21a8b5ed5ea4d7
---
libavcodec/aacdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index f180d78..44869c5 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -1242,7 +1242,7 @@ static void decode_mid_side_stereo(ChannelElement *cpe, GetBitContext *gb,
for (idx = 0; idx < cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb; idx++)
cpe->ms_mask[idx] = get_bits1(gb);
} else if (ms_present == 2) {
- memset(cpe->ms_mask, 1, cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb * sizeof(cpe->ms_mask[0]));
+ memset(cpe->ms_mask, 1, sizeof(cpe->ms_mask[0]) * cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb);
}
}
More information about the ffmpeg-cvslog
mailing list