Merge pull request #358 from Andrew12138-w/master

Fix a bug where null pointers were not judged
2023-04-19 10:14:14 +08:00
parent 010055dda3 53f7e6e1c5
commit 00d7f769a2
1 changed files with 8 additions and 6 deletions
--- a/platform/vendor_bsp/nxp/MIMXRT1052/components/mem_manager/mem_manager.c
+++ b/platform/vendor_bsp/nxp/MIMXRT1052/components/mem_manager/mem_manager.c
@@ -412,16 +412,18 @@ uint16_t MEM_BufferGetSize(void *buffer) /* IN: Block of memory to get size*/

    uint32_t regPrimask = DisableGlobalIRQ();

+    if(buffer==NULL)
+    {
+        EnableGlobalIRQ(regPrimask);
+        return 0;
+    }
    pBlock      = (block_list_header_t *)buffer - 1;
    pParentPool = (mem_pool_structure_t *)pBlock->pParentPool;

-    if (buffer != NULL)
-    {
-        EnableGlobalIRQ(regPrimask);
-        return pParentPool->blockSize;
-    }
    EnableGlobalIRQ(regPrimask);
-    return 0;
+    return pParentPool->blockSize;
+    
+    
 }

 /*!