Added comments to make it clearer when we're assigning a pointer that it

must not be freed afterwards.
Jeremy.
(This used to be commit 80bad908c0235a57446c70b9632d3415c9d2fcf5)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index a40fb4042f48f90589a22b89ffaefca4d0e05b92..93a57925f13ca93e24d69a968f7fee7ca148852a 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1000,8 +1000,16 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
                                                return False;
                                        }
 
+                                       /*
+                                        * We must not free current_ace here as its
+                                        * pointer is now owned by the dir_ace list.
+                                        */
                                        current_ace = dup_ace;
                                } else {
+                                       /*
+                                        * We must not free current_ace here as its
+                                        * pointer is now owned by the dir_ace list.
+                                        */
                                        current_ace = NULL;
                                }
                        }
@@ -1036,6 +1044,10 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
                                print_canon_ace( current_ace, 0);
                        }
                        all_aces_are_inherit_only = False;
+                       /*
+                        * We must not free current_ace here as its
+                        * pointer is now owned by the file_ace list.
+                        */
                        current_ace = NULL;
                }