svn commit: samba r12089 - in branches/SAMBA_4_0/source/librpc/rpc: .

[mimir at samba.org]

Author: mimir
Date: 2005-12-06 11:11:11 +0000 (Tue, 06 Dec 2005)
New Revision: 12089

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12089

Log:
Couple of fixes in cases of memory outage before we sort
out how and when to use composite_error() and composite_trigger_error().
Spotted by Metze.


rafal


Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c	2005-12-06 08:58:21 UTC (rev 12088)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c	2005-12-06 11:11:11 UTC (rev 12089)
@@ -54,7 +54,7 @@
 	if (!NT_STATUS_IS_OK(c->status)) {
 
 		DEBUG(0,("Failed to open pipe %s - %s\n", s->io.pipe_name, nt_errstr(c->status)));
-		composite_trigger_error(c);
+		composite_error(c, c->status);
 		return;
 	}
 
@@ -74,7 +74,7 @@
 	if (!NT_STATUS_IS_OK(c->status)) {
 
 		DEBUG(0,("Failed to connect to %s - %s\n", s->io.binding->host, nt_errstr(c->status)));
-		composite_trigger_error(c);
+		composite_error(c, c->status);
 		return;
 	}
 
@@ -82,6 +82,10 @@
 	s->io.pipe_name = s->io.binding->endpoint;
 
 	open_ctx = dcerpc_pipe_open_smb_send(s->io.pipe->conn, s->tree, s->io.pipe_name);
+	if (open_ctx == NULL) {
+		composite_error(c, NT_STATUS_NO_MEMORY);
+		return;
+	}
 
 	composite_continue(c, open_ctx, continue_pipe_open_smb, c);
 }
@@ -102,8 +106,8 @@
 
 	s = talloc_zero(c, struct pipe_np_smb_state);
 	if (s == NULL) {
-		c->status = NT_STATUS_NO_MEMORY;
-		goto failed;
+		composite_error(c, NT_STATUS_NO_MEMORY);
+		goto done;
 	}
 
 	c->state = COMPOSITE_STATE_IN_PROGRESS;
@@ -122,10 +126,14 @@
 	conn->in.workgroup              = lp_workgroup();
 
 	if (s->io.binding->flags & DCERPC_SCHANNEL) {
-		struct cli_credentials *anon_creds
-			= cli_credentials_init(tmp_ctx);
-		if (composite_nomem(anon_creds, c)) return NULL;
+		struct cli_credentials *anon_creds;
 
+		anon_creds = cli_credentials_init(tmp_ctx);
+		if (!anon_creds) {
+			composite_error(c, NT_STATUS_NO_MEMORY);
+			goto done;
+		}
+
 		cli_credentials_set_anonymous(anon_creds);
 		cli_credentials_guess(anon_creds);
 
@@ -136,14 +144,15 @@
 	}
 
 	conn_req = smb_composite_connect_send(conn, s->io.pipe->conn, s->io.pipe->conn->event_ctx);
+	if (!conn_req) {
+		composite_error(c, NT_STATUS_NO_MEMORY);
+		goto done;
+	}
 
 	composite_continue(c, conn_req, continue_smb_connect, c);
-	
+
+done:
 	return c;
-
-failed:
-	composite_trigger_error(c);
-	return NULL;
 }