[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-89-gcb9456b

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  cb9456b3b68c428c85dff29dfa4c040147ecacd6 (commit)
      from  ce7301315fcb7a6878eb4cea444c2772c13c2cb0 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.112


- Log -----------------------------------------------------------------
commit cb9456b3b68c428c85dff29dfa4c040147ecacd6
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 26 13:38:12 2010 +1000

    From rusty
    Fix a SEGV that could happend when deleting a public ip.
    
    BZ62783

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

Summary of changes:
 server/ctdb_takeover.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 0288dd2..ae6c064 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -1653,7 +1653,9 @@ static void ctdb_tickle_sentenced_connections(struct event_context *ev, struct t
  */
 static int ctdb_killtcp_destructor(struct ctdb_kill_tcp *killtcp)
 {
-	killtcp->vnn->killtcp = NULL;
+	if (killtcp->vnn) {
+		killtcp->vnn->killtcp = NULL;
+	}
 	return 0;
 }
 
@@ -2143,6 +2145,9 @@ int32_t ctdb_control_del_public_address(struct ctdb_context *ctdb, TDB_DATA inda
 					 vnn->iface, 
 					 talloc_strdup(mem_ctx, ctdb_addr_to_str(&vnn->public_address)),
 					 vnn->public_netmask_bits);
+			if (vnn->killtcp) {
+				vnn->killtcp->vnn = NULL;
+			}
 			talloc_free(vnn);
 			if (ret != 0) {
 				return -1;


-- 
CTDB repository