diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:01:24 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:01:24 +0100 |
| commit | e15fd68c5dc4089690b5d3086776c3851e504bb7 (patch) | |
| tree | 2c75274dee02b07463c9164efdf6888e1a9c75dc /media/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c | |
| parent | 185e2110a53feb7720d91b6f8366ad27402f21cc (diff) | |
| parent | 26c5fa31d17a638bf314de6e12e86bb8a86db44b (diff) | |
| download | frameworks_av-e15fd68c5dc4089690b5d3086776c3851e504bb7.zip frameworks_av-e15fd68c5dc4089690b5d3086776c3851e504bb7.tar.gz frameworks_av-e15fd68c5dc4089690b5d3086776c3851e504bb7.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0
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); } /*------------------------------------------------------------------------------ |