From: Volker Lendecke <vl@samba.org>
Date: Mon, 5 May 2008 09:15:59 +0000 (+0200)
Subject: Fix two uninitialized variable warnings
X-Git-Tag: samba-4.0.0alpha6~801^2~1540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c00ff5407d5b126c8d38ceb2bcc8626ee7c0c5d;p=thirdparty%2Fsamba.git

Fix two uninitialized variable warnings
(This used to be commit 48fd7b3635137e2fe77c0b0413965869194421ff)
---

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 7e381f24c9d..8c801e5f6ba 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -145,7 +145,7 @@ static NTSTATUS rpc_read(struct rpc_pipe_client *cli,
 {
 	size_t size = (size_t)cli->max_recv_frag;
 	uint32 stream_offset = 0;
-	ssize_t num_read;
+	ssize_t num_read = 0;
 	char *pdata;
 	ssize_t extra_data_size = ((ssize_t)*current_pdu_offset) + ((ssize_t)data_to_read) - (ssize_t)prs_data_size(current_pdu);
 
@@ -839,9 +839,10 @@ static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
 		}
 		rparam = NULL;
 		prdata = SMB_MALLOC_ARRAY(char, 1);
-		if (prdata != NULL) {
-			nread = sys_read(cli->trans.tcp.sock, prdata, 1);
+		if (prdata == NULL) {
+			return NT_STATUS_NO_MEMORY;
 		}
+		nread = sys_read(cli->trans.tcp.sock, prdata, 1);
 		if (nread == 0) {
 			SAFE_FREE(prdata);
 		}