1 files changed, 5 insertions, 0 deletions

diff --git a/src/v1/pa.c b/src/v1/pa.c
index 2acc44c..e58645e 100644
--- a/src/v1/pa.c
+++ b/src/v1/pa.c
@@ -1499,6 +1499,7 @@ static void pa_acl_list_elem_free(paAclLinkListElem_t  *list)
 {
   /* Clear the control bit indicating it is inactive and available for next use */
   list->ctrlBitMap &= ~PA_ACL_LINK_ELEM_ACTIVE_ENTRY;
+  memset(list, 0, sizeof(paAclLinkListElem_t));
   return;
 }
 
@@ -1660,9 +1661,13 @@ static paReturn_t pa_remove_entry(paAclLinkListInfo_t  *info, paHandleAcl_t aclH
 
   if (prev != NULL)
     prev->next = delNode->next;
+  else
+    info->head = next; /* update head to next link as it is head deletion */
   
   if (next != NULL)
     next->prev = prev;
+  else
+    info->tail = prev; /* update tail to prev link as it is tail deletion */
 
   /* now clear the delNode, free it by making as inactive */
   pa_acl_list_elem_free(delNode);