From: Stefan Metzmacher Date: Tue, 21 Apr 2009 15:42:39 +0000 (+0200) Subject: s3:libsmb: always use the tevent_req_nomem() for checking allocation failures X-Git-Tag: tdb-1.1.5~919^2~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14bbed1d6703764e6a58f335f142490895e5c768;p=thirdparty%2Fsamba.git s3:libsmb: always use the tevent_req_nomem() for checking allocation failures This will also make sure we cleanup 'req' in case of an error. metze --- diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index f5d5ad0fdae..1a1153d5467 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -622,8 +622,8 @@ struct tevent_req *cli_mkdir_send(TALLOC_CTX *mem_ctx, } bytes = talloc_array(state, uint8_t, 1); - if (!bytes) { - return NULL; + if (tevent_req_nomem(bytes, req)) { + return tevent_req_post(req, ev); } bytes[0] = 4; bytes = smb_bytes_push_str(bytes, cli_ucs2(cli), dname, @@ -634,7 +634,7 @@ struct tevent_req *cli_mkdir_send(TALLOC_CTX *mem_ctx, } subreq = cli_smb_send(state, ev, cli, SMBmkdir, additional_flags, - 0, NULL, talloc_get_size(bytes), bytes); + 0, NULL, talloc_get_size(bytes), bytes); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); } @@ -730,8 +730,8 @@ struct tevent_req *cli_rmdir_send(TALLOC_CTX *mem_ctx, } bytes = talloc_array(state, uint8_t, 1); - if (!bytes) { - return NULL; + if (tevent_req_nomem(bytes, req)) { + return tevent_req_post(req, ev); } bytes[0] = 4; bytes = smb_bytes_push_str(bytes, cli_ucs2(cli), dname, @@ -742,7 +742,7 @@ struct tevent_req *cli_rmdir_send(TALLOC_CTX *mem_ctx, } subreq = cli_smb_send(state, ev, cli, SMBrmdir, additional_flags, - 0, NULL, talloc_get_size(bytes), bytes); + 0, NULL, talloc_get_size(bytes), bytes); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); }