[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2271-g48fd7b3

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  48fd7b3635137e2fe77c0b0413965869194421ff (commit)
      from  6bfb06ad95963ae2acb67c4694a98282d3b29faa (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 48fd7b3635137e2fe77c0b0413965869194421ff
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Mon May 5 11:15:59 2008 +0200

    Fix two uninitialized variable warnings

-----------------------------------------------------------------------

Summary of changes:
 source/rpc_client/cli_pipe.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 7e381f2..8c801e5 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/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);
                }


-- 
Samba Shared Repository