diff options
| author | Jeremy Allison <jra@samba.org> | 2006-06-28 05:00:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:19:03 -0500 |
| commit | 3e626e61078500738009a99c0dea8a46551bd315 (patch) | |
| tree | 3d491dc8fa94776f6786981c7cfc5b98cae8e628 | |
| parent | 2ef834cdd8a498a4cf54445fd9e291d86daaad18 (diff) | |
| download | samba-3e626e61078500738009a99c0dea8a46551bd315.tar.gz samba-3e626e61078500738009a99c0dea8a46551bd315.tar.bz2 samba-3e626e61078500738009a99c0dea8a46551bd315.zip | |
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)
| -rw-r--r-- | source3/smbd/posix_acls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 40cb6698a0..6e403dba92 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -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); /* |