Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stagefright amrwbenc: Make the mem_malloc function 64-bit safe

Browse Source 
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
This commit is contained in:
Martin Storsjo
2010-12-22 22:09:51 +01:00
parent b4cee0f871
commit 656bb978b3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/libstagefright/codecs/amrwbenc/src/mem_align.c
View File

@@ -23,6 +23,11 @@
#include "mem_align.h"
#ifdef _MSC_VER
#include <stddef.h>
#else
#include <stdint.h>
#endif
/*****************************************************************************
*
@@ -66,8 +71,8 @@ mem_malloc(VO_MEM_OPERATOR *pMemop, unsigned int size, unsigned char alignment,
pMemop->Set(CodecID, tmp, 0, size + alignment);
mem_ptr =
(unsigned char *) ((unsigned int) (tmp + alignment - 1) &
(~((unsigned int) (alignment - 1))));
(unsigned char *) ((intptr_t) (tmp + alignment - 1) &
(~((intptr_t) (alignment - 1))));
if (mem_ptr == tmp)
mem_ptr += alignment;