Fix valgrind "uninitialized read" error on "info" when returning !NT_STATUS_OK.
authorJeremy Allison <jra@samba.org>
Fri, 15 Oct 2010 21:16:30 +0000 (14:16 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 16 Oct 2010 00:38:21 +0000 (17:38 -0700)
Jeremy.

source3/modules/vfs_acl_common.c

index 2ddcd0ea23e8f290216368f4c5fd39d49cb27e4a..8ea0fb8b167f3d3b84f9d5f6178cc89f7ea20b54 100644 (file)
@@ -895,6 +895,10 @@ static NTSTATUS create_file_acl_common(struct vfs_handle_struct *handle,
                                        result,
                                        &info);
 
+       if (!NT_STATUS_IS_OK(status)) {
+               goto out;
+       }
+
        if (info != FILE_WAS_CREATED) {
                /* File/directory was opened, not created. */
                goto out;
@@ -902,7 +906,7 @@ static NTSTATUS create_file_acl_common(struct vfs_handle_struct *handle,
 
        fsp = *result;
 
-       if (!NT_STATUS_IS_OK(status) || fsp == NULL) {
+       if (fsp == NULL) {
                /* Only handle success. */
                goto out;
        }