CryptoPkg/CrtLibSupport: add secure_getenv() stub function

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / SysCall / RuntimeMemAllocation.c

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
index f615ae8f903c3efabff99831b6bf3eb17dd047ee..463f2bf8557bfb0036bc0467d9f9b55b24cd7684 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
@@ -2,7 +2,7 @@
   Light-weight Memory Management Routines for OpenSSL-based Crypto\r
   Library at Runtime Phase.\r
 \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -13,9 +13,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <OpenSslSupport.h>\r
+#include <CrtLibSupport.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
 #include <Guid/EventGroup.h>\r
 \r
 //----------------------------------------------------------------\r
@@ -38,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define RT_PAGE_FREE                0x00000000\r
 #define RT_PAGE_USED                0x00000001\r
 \r
-#define MIN_REQUIRED_BLOCKS         24\r
+#define MIN_REQUIRED_BLOCKS         600\r
 \r
 //\r
 // Memory Page Table\r
@@ -64,7 +65,7 @@ RT_MEMORY_PAGE_TABLE  *mRTPageTable = NULL;
 //\r
 // Event for Runtime Address Conversion.\r
 //\r
-EFI_EVENT             mVirtualAddressChangeEvent;\r
+STATIC EFI_EVENT      mVirtualAddressChangeEvent;\r
 \r
 \r
 /**\r
@@ -204,7 +205,7 @@ LookupFreeMemRegion (
   }\r
 \r
   //\r
-  // No availabe region for object allocation!\r
+  // No available region for object allocation!\r
   //\r
   return (UINTN)(-1);\r
 }\r
@@ -282,7 +283,7 @@ RuntimeFreeMem (
   UINTN  StartOffset;\r
   UINTN  StartPageIndex;\r
 \r
-  StartOffset    = (UINTN) ((UINT8 *)Buffer - mRTPageTable->DataAreaBase);\r
+  StartOffset    = (UINTN)Buffer - (UINTN)mRTPageTable->DataAreaBase;\r
   StartPageIndex = RT_SIZE_TO_PAGES (mRTPageTable->Pages[RT_SIZE_TO_PAGES(StartOffset)].StartPageOffset);\r
 \r
   while (StartPageIndex < mRTPageTable->PageCount) {\r
@@ -385,7 +386,7 @@ RuntimeCryptLibConstructor (
 /* Allocates memory blocks */\r
 void *malloc (size_t size)\r
 {\r
-  return RuntimeAllocateMem ((UINTN)size);\r
+  return RuntimeAllocateMem ((UINTN) size);\r
 }\r
 \r
 /* Reallocate memory blocks */\r
@@ -396,10 +397,14 @@ void *realloc (void *ptr, size_t size)
   UINTN  StartPageIndex;\r
   UINTN  PageCount;\r
 \r
+  if (ptr == NULL) {\r
+    return malloc (size);\r
+  }\r
+\r
   //\r
   // Get Original Size of ptr\r
   //\r
-  StartOffset    = (UINTN) ((UINT8 *)ptr - mRTPageTable->DataAreaBase);\r
+  StartOffset    = (UINTN)ptr - (UINTN)mRTPageTable->DataAreaBase;\r
   StartPageIndex = RT_SIZE_TO_PAGES (mRTPageTable->Pages[RT_SIZE_TO_PAGES (StartOffset)].StartPageOffset);\r
   PageCount      = 0;\r
   while (StartPageIndex < mRTPageTable->PageCount) {\r
@@ -434,5 +439,11 @@ void *realloc (void *ptr, size_t size)
 /* Deallocates or frees a memory block */\r
 void free (void *ptr)\r
 {\r
-  RuntimeFreeMem (ptr);\r
+  //\r
+  // In Standard C, free() handles a null pointer argument transparently. This\r
+  // is not true of RuntimeFreeMem() below, so protect it.\r
+  //\r
+  if (ptr != NULL) {\r
+    RuntimeFreeMem (ptr);\r
+  }\r
 }\r