[PATCH] Fix two CIDs

[Volker Lendecke]

Hi!

Review appreciated!

Thanks, Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 574ac5dd1fae8875a356c0fe048ff648cb0a955c Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 30 Mar 2018 12:22:57 -0500
Subject: [PATCH 1/2] tstream: Fix CID 1167982 Unchecked return value

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 libcli/smb/tstream_smbXcli_np.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libcli/smb/tstream_smbXcli_np.c b/libcli/smb/tstream_smbXcli_np.c
index a59db13321b..7928f400c2f 100644
--- a/libcli/smb/tstream_smbXcli_np.c
+++ b/libcli/smb/tstream_smbXcli_np.c
@@ -1008,9 +1008,8 @@ static void tstream_smbXcli_np_readv_trans_done(struct tevent_req *subreq)
 	cli_nps->read.ofs = 0;
 	cli_nps->read.left = received;
 	cli_nps->read.buf = talloc_array(cli_nps, uint8_t, received);
-	if (cli_nps->read.buf == NULL) {
+	if (tevent_req_nomem(cli_nps->read.buf, req)) {
 		TALLOC_FREE(subreq);
-		tevent_req_nomem(cli_nps->read.buf, req);
 		return;
 	}
 	memcpy(cli_nps->read.buf, rcvbuf, received);
-- 
2.11.0


From 26991f19d5054801bed8b0d9929f3280525dc21d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 30 Mar 2018 12:23:47 -0500
Subject: [PATCH 2/2] tstream: Fix CID 1167981 Unchecked return value

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 libcli/smb/tstream_smbXcli_np.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libcli/smb/tstream_smbXcli_np.c b/libcli/smb/tstream_smbXcli_np.c
index 7928f400c2f..949535d5aea 100644
--- a/libcli/smb/tstream_smbXcli_np.c
+++ b/libcli/smb/tstream_smbXcli_np.c
@@ -1093,9 +1093,8 @@ static void tstream_smbXcli_np_readv_read_done(struct tevent_req *subreq)
 	cli_nps->read.ofs = 0;
 	cli_nps->read.left = received;
 	cli_nps->read.buf = talloc_array(cli_nps, uint8_t, received);
-	if (cli_nps->read.buf == NULL) {
+	if (tevent_req_nomem(cli_nps->read.buf, req)) {
 		TALLOC_FREE(subreq);
-		tevent_req_nomem(cli_nps->read.buf, req);
 		return;
 	}
 	memcpy(cli_nps->read.buf, rcvbuf, received);
-- 
2.11.0