diff options
| author | Marco Nelissen <marcone@google.com> | 2016-04-08 10:04:48 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-04-21 19:09:57 -0700 |
| commit | 2b6f22dc64d456471a1dc6df09d515771d1427c8 (patch) | |
| tree | 34f4cd60b24fe97ba6694f9bc7b044a4bfa75be0 /media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c | |
| parent | 918eeaa29d99d257282fafec931b4bda0e3bae12 (diff) | |
| download | frameworks_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/TestBenchMultipleInstance.c')
| -rw-r--r-- | media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c b/media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c index 42170d3..9a386bb 100644 --- a/media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c +++ b/media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c @@ -413,9 +413,12 @@ void H264SwDecTrace(char *string) Function name: H264SwDecmalloc ------------------------------------------------------------------------------*/ -void* H264SwDecMalloc(u32 size) +void* H264SwDecMalloc(u32 size, u32 num) { - return malloc(size); + if (size > UINT32_MAX / num) { + return NULL; + } + return malloc(size * num); } /*------------------------------------------------------------------------------ |