From 5207d456f1132041a07c9b3c48bfa7a9112a698f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 19 Feb 2013 09:00:51 +0100 Subject: [PATCH] s4-libcli: Check return value of smbcli_request_setup(). Reviewed-by: Alexander Bokovoy --- source4/libcli/climessage.c | 9 +++++++++ source4/libcli/raw/clioplock.c | 3 +++ source4/libcli/raw/clitree.c | 3 +++ 3 files changed, 15 insertions(+) diff --git a/source4/libcli/climessage.c b/source4/libcli/climessage.c index 5ed0e8e3cd2..3e9808c128c 100644 --- a/source4/libcli/climessage.c +++ b/source4/libcli/climessage.c @@ -33,6 +33,9 @@ bool smbcli_message_start(struct smbcli_tree *tree, const char *host, const char struct smbcli_request *req; req = smbcli_request_setup(tree, SMBsendstrt, 0, 0); + if (req == NULL) { + return false; + } smbcli_req_append_string(req, username, STR_TERMINATE); smbcli_req_append_string(req, host, STR_TERMINATE); if (!smbcli_request_send(req) || @@ -57,6 +60,9 @@ bool smbcli_message_text(struct smbcli_tree *tree, char *msg, int len, int grp) struct smbcli_request *req; req = smbcli_request_setup(tree, SMBsendtxt, 1, 0); + if (req == NULL) { + return false; + } SSVAL(req->out.vwv, VWV(0), grp); smbcli_req_append_bytes(req, (const uint8_t *)msg, len); @@ -80,6 +86,9 @@ bool smbcli_message_end(struct smbcli_tree *tree, int grp) struct smbcli_request *req; req = smbcli_request_setup(tree, SMBsendend, 1, 0); + if (req == NULL) { + return false; + } SSVAL(req->out.vwv, VWV(0), grp); if (!smbcli_request_send(req) || diff --git a/source4/libcli/raw/clioplock.c b/source4/libcli/raw/clioplock.c index 396ab964450..6c04843f3f7 100644 --- a/source4/libcli/raw/clioplock.c +++ b/source4/libcli/raw/clioplock.c @@ -30,6 +30,9 @@ _PUBLIC_ bool smbcli_oplock_ack(struct smbcli_tree *tree, uint16_t fnum, uint16_ struct smbcli_request *req; req = smbcli_request_setup(tree, SMBlockingX, 8, 0); + if (req == NULL) { + return false; + } SSVAL(req->out.vwv,VWV(0),0xFF); SSVAL(req->out.vwv,VWV(1),0); diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c index 1c3321e6b83..11be5485f26 100644 --- a/source4/libcli/raw/clitree.c +++ b/source4/libcli/raw/clitree.c @@ -168,6 +168,9 @@ _PUBLIC_ NTSTATUS smb_tree_disconnect(struct smbcli_tree *tree) if (!tree) return NT_STATUS_OK; req = smbcli_request_setup(tree, SMBtdis, 0, 0); + if (req == NULL) { + return NT_STATUS_NO_MEMORY; + } if (smbcli_request_send(req)) { (void) smbcli_request_receive(req); -- 2.11.4.GIT