diff options
| author | Ray Essick <essick@google.com> | 2020-08-04 20:12:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-08-04 20:12:06 +0000 |
| commit | 6c83c697034a480ca5bdef65dfcebe05fce3a7e3 (patch) | |
| tree | a751ae6a641ee3c12fa49bac6fe793e06d4da2ea | |
| parent | 2b1c8d36926704a90f0d2ce0060f10f3bb9a0a3e (diff) | |
| parent | d187d0147b8eece92f85edae3fec95e64eeb1e3b (diff) | |
| download | platform_external_libmpeg2-6c83c697034a480ca5bdef65dfcebe05fce3a7e3.tar.gz platform_external_libmpeg2-6c83c697034a480ca5bdef65dfcebe05fce3a7e3.tar.bz2 platform_external_libmpeg2-6c83c697034a480ca5bdef65dfcebe05fce3a7e3.zip | |
Merge "Replace memalign with posix_memalign"
| -rw-r--r-- | fuzzer/mpeg2_dec_fuzzer.cpp | 14 | ||||
| -rw-r--r-- | test/decoder/main.c | 10 |
2 files changed, 16 insertions, 8 deletions
diff --git a/fuzzer/mpeg2_dec_fuzzer.cpp b/fuzzer/mpeg2_dec_fuzzer.cpp index e0923bc..1492c02 100644 --- a/fuzzer/mpeg2_dec_fuzzer.cpp +++ b/fuzzer/mpeg2_dec_fuzzer.cpp @@ -18,7 +18,6 @@ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore */ -#include <malloc.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> @@ -155,8 +154,11 @@ void Codec::createCodec() { iv_mem_rec_t *ps_mem_rec = (iv_mem_rec_t *)mMemRecords; for (i = 0; i < numMemRecords; i++) { - ps_mem_rec->pv_base = - memalign(ps_mem_rec->u4_mem_alignment, ps_mem_rec->u4_mem_size); + if (0 != posix_memalign(&ps_mem_rec->pv_base, ps_mem_rec->u4_mem_alignment, + ps_mem_rec->u4_mem_size)) { + return; + } + if (ps_mem_rec->pv_base == NULL) { return; } @@ -318,7 +320,11 @@ void Codec::allocFrame() { mOutBufHandle.u4_num_bufs = num_bufs; for (int i = 0; i < num_bufs; i++) { mOutBufHandle.u4_min_out_buf_size[i] = sizes[i]; - mOutBufHandle.pu1_bufs[i] = (UWORD8 *)memalign(16, sizes[i]); + void *buf = NULL; + if (0 != posix_memalign(&buf, 16, sizes[i])) { + return; + } + mOutBufHandle.pu1_bufs[i] = (UWORD8 *)buf; } } diff --git a/test/decoder/main.c b/test/decoder/main.c index 9502dec..0a249ac 100644 --- a/test/decoder/main.c +++ b/test/decoder/main.c @@ -44,9 +44,6 @@ #include <signal.h> #endif -#ifndef IOS -#include <malloc.h> -#endif #ifdef IOS_DISPLAY #include "cast_types.h" #else @@ -453,7 +450,12 @@ void app_aligned_free(void *pv_buf) #if (!defined(IOS)) && (!defined(_WIN32)) void* app_aligned_malloc(WORD32 alignment, WORD32 size) { - return memalign(alignment, size); + void *buf = NULL; + if (0 != posix_memalign(&buf, alignment, size)) + { + return NULL; + } + return buf; } void app_aligned_free(void *pv_buf) |