Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54b0ae0d authored by Deckard Autoverifier's avatar Deckard Autoverifier Committed by Android Git Automerger
Browse files

am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the... 

am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
parents c57d9ff3 3bfc65a3

media/libstagefright/codecs/aacenc/src/memalign.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,11 @@ 








#include	"memalign.h"

#include	"memalign.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);

		pMemop->Set(CodecID, tmp, 0, size + alignment);





		mem_ptr =

		mem_ptr =

			(unsigned char *) ((unsigned int) (tmp + alignment - 1) &

			(unsigned char *) ((intptr_t) (tmp + alignment - 1) &

					(~((unsigned int) (alignment - 1))));

					(~((intptr_t) (alignment - 1))));





		if (mem_ptr == tmp)

		if (mem_ptr == tmp)

			mem_ptr += alignment;

			mem_ptr += alignment;