From b2a15f73ceac2d89c1f7b92254c5b0f3cb3d4bc7 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Tue, 1 Feb 2011 01:57:23 +0100
Subject: [PATCH] remove an extra LocalFree() call for pOldDacls, it is not
 allocated on heap

---
 sql/mysql_install_db.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index d901b3cc11a..ffa78cb89b8 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.cc
@@ -424,9 +424,10 @@ static int set_directory_permissions(const char *dir, const char *os_user)
     SetSecurityInfo(hDir,SE_FILE_OBJECT,DACL_SECURITY_INFORMATION,NULL, NULL,
       pNewDACL, NULL);
   }
-  LocalFree(pNewDACL); 
-  LocalFree(pSD);
-  LocalFree(pOldDACL); 
+  if(pSD != NULL) 
+    LocalFree((HLOCAL) pSD); 
+  if(pNewDACL != NULL) 
+    LocalFree((HLOCAL) pNewDACL);
   CloseHandle(hDir); 
   return 0;
 }