move to SAFE_FREE()

(This used to be commit 60e907b7e8e1c008463a88ed2b076344278986ef)

1 files changed, 33 insertions, 35 deletions

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 424e705755..1c840d84ca 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -700,7 +700,7 @@ char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
 			maxlen += nbytes + 20 * (acl_d->count - i);
 
 			if ((text = Realloc(oldtext, maxlen)) == NULL) {
-				free(oldtext);
+				SAFE_FREE(oldtext);
 				errno = ENOMEM;
 				return NULL;
 			}
@@ -928,9 +928,7 @@ int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
 
 	ret = acl(name, SETACL, acl_count, acl_p);
 
-	if (acl_buf) {
-		free(acl_buf);
-	}
+	SAFE_FREE(acl_buf);
 
 	return ret;
 }
@@ -966,13 +964,13 @@ int sys_acl_delete_def_file(const char *path)
 
 int sys_acl_free_text(char *text)
 {
-	free(text);
+	SAFE_FREE(text);
 	return 0;
 }
 
 int sys_acl_free_acl(SMB_ACL_T acl_d) 
 {
-	free(acl_d);
+	SAFE_FREE(acl_d);
 	return 0;
 }
 
@@ -1047,7 +1045,7 @@ SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
 		return NULL;
 	}
 	if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
-		free(a);
+		SAFE_FREE(a);
 		return NULL;
 	}
 	a->next = -1;
@@ -1064,7 +1062,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 		return NULL;
 	}
 	if ((a->aclp = acl_get_fd(fd)) == NULL) {
-		free(a);
+		SAFE_FREE(a);
 		return NULL;
 	}
 	a->next = -1;
@@ -1355,7 +1353,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 	rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
 	if(rc == -1) {
 		DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
-		free(file_acl);
+		SAFE_FREE(file_acl);
 		return(NULL);
 	}
 
@@ -1375,7 +1373,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 
 	acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
 	if(acl_entry_link->entryp == NULL) {
-		free(file_acl);
+		SAFE_FREE(file_acl);
 		errno = ENOMEM;
 		DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
 		return(NULL);
@@ -1412,7 +1410,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 											malloc(sizeof(struct acl_entry_link));
 
 				if(acl_entry_link->nextp == NULL) {
-					free(file_acl);
+					SAFE_FREE(file_acl);
 					errno = ENOMEM;
 					DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
 					return(NULL);
@@ -1422,7 +1420,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 				acl_entry_link = acl_entry_link->nextp;
 				acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
 				if(acl_entry_link->entryp == NULL) {
-					free(file_acl);
+					SAFE_FREE(file_acl);
 					errno = ENOMEM;
 					DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
 					return(NULL);
@@ -1481,7 +1479,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 		if(acl_entry_link_head->count != 0) {
 			acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof(struct acl_entry_link));
 			if(acl_entry_link->nextp == NULL) {
-				free(file_acl);
+				SAFE_FREE(file_acl);
 				errno = ENOMEM;
 				DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
 				return(NULL);
@@ -1491,7 +1489,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 			acl_entry_link = acl_entry_link->nextp;
 			acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
 			if(acl_entry_link->entryp == NULL) {
-				free(file_acl);
+				SAFE_FREE(file_acl);
 				errno = ENOMEM;
 				DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
 				return(NULL);
@@ -1535,7 +1533,7 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 	}
 
 	acl_entry_link_head->count = 0;
-	free(file_acl);
+	SAFE_FREE(file_acl);
 
 	return(acl_entry_link_head);
 }
@@ -1569,7 +1567,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 	rc = fstatacl(fd,0,file_acl,BUFSIZ);
 	if(rc == -1) {
 		DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
-		free(file_acl);
+		SAFE_FREE(file_acl);
 		return(NULL);
 	}
 
@@ -1585,7 +1583,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 
 	acl_entry_link_head = acl_entry_link = sys_acl_init(0);
 	if(acl_entry_link_head == NULL){
-		free(file_acl);
+		SAFE_FREE(file_acl);
 		return(NULL);
 	}
 
@@ -1594,7 +1592,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 	if(acl_entry_link->entryp == NULL) {
 		errno = ENOMEM;
 		DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
-		free(file_acl);
+		SAFE_FREE(file_acl);
 		return(NULL);
 	}
 
@@ -1630,7 +1628,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 				if(acl_entry_link->nextp == NULL) {
 					errno = ENOMEM;
 					DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
-					free(file_acl);
+					SAFE_FREE(file_acl);
 					return(NULL);
 				}
 				acl_entry_link->nextp->prevp = acl_entry_link;
@@ -1639,7 +1637,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 				if(acl_entry_link->entryp == NULL) {
 					errno = ENOMEM;
 					DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
-					free(file_acl);
+					SAFE_FREE(file_acl);
 					return(NULL);
 				}
 
@@ -1698,7 +1696,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 			if(acl_entry_link->nextp == NULL) {
 				errno = ENOMEM;
 				DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
-				free(file_acl);
+				SAFE_FREE(file_acl);
 				return(NULL);
 			}
 
@@ -1707,7 +1705,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 			acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof(struct new_acl_entry));
 
 			if(acl_entry_link->entryp == NULL) {
-				free(file_acl);
+				SAFE_FREE(file_acl);
 				errno = ENOMEM;
 				DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
 				return(NULL);
@@ -1750,7 +1748,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 	}
 
 	acl_entry_link_head->count = 0;
-	free(file_acl);
+	SAFE_FREE(file_acl);
  
 	return(acl_entry_link_head);
 }
@@ -1955,14 +1953,14 @@ int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl
 			acl_length += sizeof(struct acl_entry);
 			file_acl_temp = (struct acl *)malloc(acl_length);
 			if(file_acl_temp == NULL) {
-				free(file_acl);
+				SAFE_FREE(file_acl);
 				errno = ENOMEM;
 				DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
 				return(-1);
 			}  
 
 			memcpy(file_acl_temp,file_acl,file_acl->acl_len);
-			free(file_acl);
+			SAFE_FREE(file_acl);
 			file_acl = file_acl_temp;
 		}
 
@@ -1989,7 +1987,7 @@ int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl
 	rc = chacl(name,file_acl,file_acl->acl_len);
 	DEBUG(10,("errno is %d\n",errno));
 	DEBUG(10,("return code is %d\n",rc));
-	free(file_acl);
+	SAFE_FREE(file_acl);
 	DEBUG(10,("Exiting the sys_acl_set_file\n"));
 	return(rc);
 }
@@ -2044,14 +2042,14 @@ int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
 			acl_length += sizeof(struct acl_entry);
 			file_acl_temp = (struct acl *)malloc(acl_length);
 			if(file_acl_temp == NULL) {
-				free(file_acl);
+				SAFE_FREE(file_acl);
 				errno = ENOMEM;
 				DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
 				return(-1);
 			}
 
 			memcpy(file_acl_temp,file_acl,file_acl->acl_len);
-			free(file_acl);
+			SAFE_FREE(file_acl);
 			file_acl = file_acl_temp;
 		}
 
@@ -2078,7 +2076,7 @@ int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
 	rc = fchacl(fd,file_acl,file_acl->acl_len);
 	DEBUG(10,("errno is %d\n",errno));
 	DEBUG(10,("return code is %d\n",rc));
-	free(file_acl);
+	SAFE_FREE(file_acl);
 	DEBUG(10,("Exiting sys_acl_set_fd\n"));
 	return(rc);
 }
@@ -2104,14 +2102,14 @@ int sys_acl_free_acl(SMB_ACL_T posix_acl)
 	struct acl_entry_link *acl_entry_link;
 
 	for(acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
-		free(acl_entry_link->prevp->entryp);
-		free(acl_entry_link->prevp);
+		SAFE_FREE(acl_entry_link->prevp->entryp);
+		SAFE_FREE(acl_entry_link->prevp);
 	}
 
-	free(acl_entry_link->prevp->entryp);
-	free(acl_entry_link->prevp);
-	free(acl_entry_link->entryp);
-	free(acl_entry_link);
+	SAFE_FREE(acl_entry_link->prevp->entryp);
+	SAFE_FREE(acl_entry_link->prevp);
+	SAFE_FREE(acl_entry_link->entryp);
+	SAFE_FREE(acl_entry_link);
  
 	return(0);
 }