From ef6b6566e6cf026817b23bdd36f93aa3da3bfed5 Mon Sep 17 00:00:00 2001
From: counterpoint <counterpoint@aliro.org>
Date: Wed, 3 Jun 2015 15:08:08 +0100
Subject: [PATCH] Fixes?

---
 server/core/dcb.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/core/dcb.c b/server/core/dcb.c
index 64807c3ff..6530cb0b8 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -1825,6 +1825,7 @@ static bool dcb_set_state_nolock(
 			case DCB_STATE_DISCONNECTED: 
 				dcb->state = new_state;
 				succp = true;
+                        default: ;
                 }
                 break;
                 
@@ -1833,6 +1834,7 @@ static bool dcb_set_state_nolock(
 			case DCB_STATE_NOPOLLING:
 				dcb->state = new_state;
 				succp = true;
+                        default: ;
                 }
                 break;
 
@@ -1841,6 +1843,7 @@ static bool dcb_set_state_nolock(
 			case DCB_STATE_NOPOLLING:
 				dcb->state = new_state;
 				succp = true;
+                        default: ;
                 }
                 break;
                 
@@ -1850,6 +1853,7 @@ static bool dcb_set_state_nolock(
 				dcb->state = new_state;
 			case DCB_STATE_POLLING: /*< ok to try but state can't change */
 				succp = true;
+                        default: ;
                 }
                 break;
 
@@ -1859,6 +1863,7 @@ static bool dcb_set_state_nolock(
 				dcb->state = new_state;
 			case DCB_STATE_POLLING: /*< ok to try but state can't change */
 				succp = true;
+                        default: ;
                 }
                 break;
 
@@ -1867,6 +1872,7 @@ static bool dcb_set_state_nolock(
 			case DCB_STATE_FREED:
 				dcb->state = new_state;
 				succp = true;
+                        default: ;
                 }
                 break;
 
@@ -2304,13 +2310,14 @@ int
 dcb_persistent_clean_count(DCB *dcb)
 {
     int count = 0;
-    if (dcb)
+    if (dcb && dcb->server)
     {
         SERVER *server = dcb->server;
         DCB *previousdcb = NULL;
         DCB *persistentdcb = server->persistent;
     
         while (persistentdcb) {
+			CHK_DCB(persistentdcb);
             if (count >= server->persistpoolmax || (persistentdcb->last_read + server->persistmaxtime) < time(NULL))
             {
                 if (previousdcb) {