Add some defensive coding.

bareos · Feb 17, 2015 · 908e48d · 908e48d
1 parent 68578f9
commit 908e48d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 1 deletion.
diff --git a/src/ndmp/ndma_comm_session.c b/src/ndmp/ndma_comm_session.c
@@ -504,15 +504,19 @@ ndma_session_destroy (struct ndm_session *sess)
 
 	if (sess->plumb.control) {
 		ndmconn_destruct (sess->plumb.control);
+		sess->plumb.control = NULL;
 	}
 	if (sess->plumb.data) {
 		ndmconn_destruct (sess->plumb.data);
+		sess->plumb.data = NULL;
 	}
 	if (sess->plumb.tape) {
 		ndmconn_destruct (sess->plumb.tape);
+		sess->plumb.tape = NULL;
 	}
 	if (sess->plumb.robot) {
 		ndmconn_destruct (sess->plumb.robot);
+		sess->plumb.robot = NULL;
 	}
 
 #ifndef NDMOS_OPTION_NO_CONTROL_AGENT

diff --git a/src/ndmp/ndma_cops_backreco.c b/src/ndmp/ndma_cops_backreco.c
@@ -649,6 +649,7 @@ ndmca_backreco_startup (struct ndm_session *sess)
 	rc = ndmca_connect_data_agent(sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.data);
+		sess->plumb.data = NULL;
 		return rc;
 	}
 
@@ -659,6 +660,7 @@ ndmca_backreco_startup (struct ndm_session *sess)
 	rc = ndmca_connect_tape_agent(sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.tape);
+		sess->plumb.tape = NULL;
 		return rc;
 	}
 

diff --git a/src/ndmp/ndma_cops_labels.c b/src/ndmp/ndma_cops_labels.c
@@ -76,6 +76,7 @@ ndmca_op_init_labels (struct ndm_session *sess)
 	rc = ndmca_connect_tape_agent (sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.tape);
+		sess->plumb.tape = NULL;
 		return rc;	/* already tattled */
 	}
 
@@ -132,6 +133,7 @@ ndmca_op_list_labels (struct ndm_session *sess)
 
 	if ((rc = ndmca_connect_tape_agent (sess)) != 0) {
 		ndmconn_destruct (sess->plumb.tape);
+		sess->plumb.tape = NULL;
 		return rc;	/* already tattled */
 	}
 

diff --git a/src/ndmp/ndma_cops_query.c b/src/ndmp/ndma_cops_query.c
@@ -62,6 +62,7 @@ ndmca_opq_data (struct ndm_session *sess)
 	rc = ndmca_connect_data_agent (sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.data);
+		sess->plumb.data = NULL;
 		return rc;	/* already tattled */
 	}
 
@@ -98,6 +99,7 @@ ndmca_opq_tape (struct ndm_session *sess)
 	rc = ndmca_connect_tape_agent (sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.tape);
+		sess->plumb.data = NULL;
 		return rc;	/* already tattled */
 	}
 

diff --git a/src/ndmp/ndma_ctrl_conn.c b/src/ndmp/ndma_ctrl_conn.c
@@ -128,6 +128,7 @@ ndmca_connect_tape_agent (struct ndm_session *sess)
 		rc = ndmca_connect_data_agent (sess);
 		if (rc) {
 			ndmconn_destruct (sess->plumb.data);
+			sess->plumb.data = NULL;
 			return rc;
 		}
 		sess->plumb.tape = sess->plumb.data;

diff --git a/src/ndmp/ndma_ctst_data.c b/src/ndmp/ndma_ctst_data.c
@@ -99,6 +99,7 @@ ndmca_op_test_data (struct ndm_session *sess)
 	rc = ndmca_connect_data_agent(sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.data);
+		sess->plumb.data = NULL;
 		return rc;
 	}
 

diff --git a/src/ndmp/ndma_ctst_mover.c b/src/ndmp/ndma_ctst_mover.c
@@ -141,6 +141,7 @@ ndmca_op_test_mover (struct ndm_session *sess)
 		rc = ndmca_connect_data_agent (sess);
 		if (rc) {
 			ndmconn_destruct (sess->plumb.data);
+			sess->plumb.data = NULL;
 			return rc;
 		}
 	}

diff --git a/src/ndmp/ndma_ctst_subr.c b/src/ndmp/ndma_ctst_subr.c
@@ -151,6 +151,7 @@ ndmca_test_load_tape (struct ndm_session *sess)
 	rc = ndmca_connect_tape_agent(sess);
 	if (rc) {
 		ndmconn_destruct (sess->plumb.tape);
+		sess->plumb.tape = NULL;
 		return rc;	/* already tattled */
 	}
 

diff --git a/src/ndmp/ndml_conn.c b/src/ndmp/ndml_conn.c
@@ -104,7 +104,10 @@ ndmconn_destruct (struct ndmconn *conn)
 		conn->chan.fd = -1;
 	}
 
-	xdr_destroy (&conn->xdrs);
+	if (conn->xdrs.x_ops) {
+		xdr_destroy (&conn->xdrs);
+		conn->xdrs.x_ops = NULL;
+	}
 
 	if (conn->was_allocated) {
 		NDMOS_API_FREE (conn);