vfs_recycle: don't unlink on allocation failure

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15659

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Noel Power <noel.power@suse.com>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 43e229692d1df03924765bd0dfa50d8829ea3087..47b21983984fec8f00906900e227905ea4460582 100644 (file)
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -650,13 +650,7 @@ static int recycle_unlink_internal(vfs_handle_struct *handle,
                TALLOC_FREE(smb_fname_final->base_name);
                smb_fname_final->base_name = talloc_strdup(smb_fname_final,
                                                           final_name);
-               if (smb_fname_final->base_name == NULL) {
-                       rc = SMB_VFS_NEXT_UNLINKAT(handle,
-                                               dirfsp,
-                                               smb_fname,
-                                               flags);
-                       goto done;
-               }
+               ALLOC_CHECK(smb_fname_final->base_name, done);
        }
 
        DEBUG(10, ("recycle: Moving %s to %s\n", smb_fname_str_dbg(full_fname),