From 71aa533038e82442ada3181cf5a34eea7def7ee0 Mon Sep 17 00:00:00 2001 From: sijchen Date: Fri, 12 Feb 2016 15:22:22 -0800 Subject: [PATCH] move the printing of MEMORY_CHECK part to more reasonable --- codec/common/src/memory_align.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/codec/common/src/memory_align.cpp b/codec/common/src/memory_align.cpp index fb4208f3..90efb74a 100644 --- a/codec/common/src/memory_align.cpp +++ b/codec/common/src/memory_align.cpp @@ -70,6 +70,9 @@ void* WelsMalloc (const uint32_t kuiSize, const char* kpTag, const uint32_t kiAl const uint32_t kiPayloadSize = kuiSize; uint8_t* pBuf = (uint8_t*) malloc (kiActualRequestedSize); + if (NULL == pBuf) + return NULL; + #ifdef MEMORY_CHECK if (fpMemChkPoint == NULL) { fpMemChkPoint = fopen ("./enc_mem_check_point.txt", "at+"); @@ -87,10 +90,6 @@ void* WelsMalloc (const uint32_t kuiSize, const char* kpTag, const uint32_t kiAl } #endif uint8_t* pAlignedBuffer; - - if (NULL == pBuf) - return NULL; - pAlignedBuffer = pBuf + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt; pAlignedBuffer -= ((uintptr_t) pAlignedBuffer & kiAlignedBytes); * ((void**) (pAlignedBuffer - kiSizeOfVoidPointer)) = pBuf;