summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2016-04-08 10:04:48 -0700
committerThe Android Automerger <android-build@google.com>2016-04-21 19:09:57 -0700
commit2b6f22dc64d456471a1dc6df09d515771d1427c8 (patch)
tree34f4cd60b24fe97ba6694f9bc7b044a4bfa75be0 /media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
parent918eeaa29d99d257282fafec931b4bda0e3bae12 (diff)
downloadframeworks_av-2b6f22dc64d456471a1dc6df09d515771d1427c8.zip
frameworks_av-2b6f22dc64d456471a1dc6df09d515771d1427c8.tar.gz
frameworks_av-2b6f22dc64d456471a1dc6df09d515771d1427c8.tar.bz2
h264dec: check for overflows when calculating allocation size.
Bug: 27855419 Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd
Diffstat (limited to 'media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c')
-rw-r--r--media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
index a816871..0ac480f 100644
--- a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
+++ b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
@@ -101,7 +101,7 @@ u32 h264bsdInit(storage_t *pStorage, u32 noOutputReordering)
* specific NEON optimized "memset" for clearing the structure */
size = (sizeof(macroblockLayer_t) + 63) & ~0x3F;
- pStorage->mbLayer = (macroblockLayer_t*)H264SwDecMalloc(size);
+ pStorage->mbLayer = (macroblockLayer_t*)H264SwDecMalloc(size, 1);
if (!pStorage->mbLayer)
return HANTRO_NOK;