SecurityPkg: Clear LocalAuthSession content after use.

[mirror_edk2.git] / NetworkPkg / HttpUtilitiesDxe / HttpUtilitiesProtocol.c

diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
index 8c29f20adfe2abd5f73d69391bfb6ff72a0a616b..739d3b753cddd5ca469ed461ca619d8183e0c03e 100644 (file)
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
@@ -2,6 +2,7 @@
   Implementation of EFI_HTTP_PROTOCOL protocol interfaces.\r
 \r
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<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
@@ -122,8 +123,8 @@ HttpUtilitiesBuild (
       //\r
       // Check whether each SeedHeaderFields member is in DeleteList\r
       //\r
-      if (IsValidHttpHeader( DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {\r
-        Status = SetFieldNameAndValue (\r
+      if (HttpIsValidHttpHeader( DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {\r
+        Status = HttpSetFieldNameAndValue (\r
                    &TempHeaderFields[TempFieldCount], \r
                    SeedHeaderFields[Index].FieldName, \r
                    SeedHeaderFields[Index].FieldValue\r
@@ -149,7 +150,7 @@ HttpUtilitiesBuild (
   }\r
 \r
   for (Index = 0; Index < TempFieldCount; Index++) {\r
-    Status = SetFieldNameAndValue (\r
+    Status = HttpSetFieldNameAndValue (\r
                &NewHeaderFields[Index], \r
                TempHeaderFields[Index].FieldName, \r
                TempHeaderFields[Index].FieldValue\r
@@ -162,9 +163,9 @@ HttpUtilitiesBuild (
   NewFieldCount = TempFieldCount;\r
 \r
   for (Index = 0; Index < AppendCount; Index++) {\r
-    HttpHeader = FindHttpHeader (NewHeaderFields, NewFieldCount, AppendList[Index]->FieldName);\r
+    HttpHeader = HttpFindHeader (NewFieldCount, NewHeaderFields, AppendList[Index]->FieldName);\r
     if (HttpHeader != NULL) {\r
-      Status = SetFieldNameAndValue (\r
+      Status = HttpSetFieldNameAndValue (\r
                  HttpHeader, \r
                  AppendList[Index]->FieldName, \r
                  AppendList[Index]->FieldValue\r
@@ -173,7 +174,7 @@ HttpUtilitiesBuild (
         goto ON_EXIT;\r
       }\r
     } else {\r
-      Status = SetFieldNameAndValue (\r
+      Status = HttpSetFieldNameAndValue (\r
                  &NewHeaderFields[NewFieldCount], \r
                  AppendList[Index]->FieldName, \r
                  AppendList[Index]->FieldValue\r
@@ -251,15 +252,15 @@ HttpUtilitiesBuild (
   //\r
 ON_EXIT:\r
   if (SeedHeaderFields != NULL) {\r
-    FreeHeaderFields(SeedHeaderFields, SeedFieldCount);\r
+    HttpFreeHeaderFields(SeedHeaderFields, SeedFieldCount);\r
   }\r
   \r
   if (TempHeaderFields != NULL) {\r
-    FreeHeaderFields(TempHeaderFields, TempFieldCount);\r
+    HttpFreeHeaderFields(TempHeaderFields, TempFieldCount);\r
   }\r
 \r
   if (NewHeaderFields != NULL) {\r
-    FreeHeaderFields(NewHeaderFields, NewFieldCount);\r
+    HttpFreeHeaderFields(NewHeaderFields, NewFieldCount);\r
   }\r
   \r
   return Status;\r
@@ -307,7 +308,6 @@ HttpUtilitiesParse (
   \r
   Status          = EFI_SUCCESS;\r
   TempHttpMessage = NULL;\r
-  *FieldCount     = 0;\r
   Token           = NULL;\r
   NextToken       = NULL;\r
   FieldName       = NULL;\r
@@ -328,11 +328,12 @@ HttpUtilitiesParse (
   //\r
   // Get header number\r
   //\r
+  *FieldCount = 0;\r
   Token = TempHttpMessage;\r
   while (TRUE) {\r
     FieldName     = NULL;\r
     FieldValue    = NULL;\r
-    NextToken = GetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
+    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
     Token     = NextToken;\r
     if (FieldName == NULL || FieldValue == NULL) {\r
       break;\r
@@ -365,16 +366,16 @@ HttpUtilitiesParse (
   while (Index < *FieldCount) {\r
     FieldName     = NULL;\r
     FieldValue    = NULL;\r
-    NextToken = GetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
+    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);\r
     Token     = NextToken;\r
     if (FieldName == NULL || FieldValue == NULL) {\r
       break;\r
     }\r
 \r
-    Status = SetFieldNameAndValue (&(*HeaderFields)[Index], FieldName, FieldValue);\r
+    Status = HttpSetFieldNameAndValue (&(*HeaderFields)[Index], FieldName, FieldValue);\r
     if (EFI_ERROR (Status)) {\r
       *FieldCount = 0;\r
-      FreeHeaderFields (*HeaderFields, Index);\r
+      HttpFreeHeaderFields (*HeaderFields, Index);\r
       goto ON_EXIT;\r
     }\r
     \r