1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00

r16616: Klocwork #2025. Stop null deref. I actually don't

think this can happen in real life but the code is
too complicated to be sure....
Jerry please merge this for 3.0.23.
Jeremy.
(This used to be commit 1e5042d4c0d1a0d0a5cfbcb0d47815e1510ee52a)
This commit is contained in:
Jeremy Allison 2006-06-28 05:00:09 +00:00 committed by Gerald (Jerry) Carter
parent 2ef834cdd8
commit 3e626e6107

View File

@ -1483,7 +1483,7 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
* Only add to the file ACL if not inherit only.
*/
if (!(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
if (current_ace && !(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
DLIST_ADD_END(file_ace, current_ace, tmp_ace);
/*