[github21] Segfault condition fixed

 If the keyspace is not present, session_ will be null and
 it would segfault in CQLConnection destructor.

diff --git a/src/lib/dhcpsrv/cql_connection.cc b/src/lib/dhcpsrv/cql_connection.cc
index ef5c33f479c8afdbb984d50ff9d0cbf2c44bf36a..3a4b920f2742c9177b57683293ce8e66d077b962 100644 (file)
--- a/src/lib/dhcpsrv/cql_connection.cc
+++ b/src/lib/dhcpsrv/cql_connection.cc
@@ -30,23 +30,33 @@ CqlConnection::CqlConnection(const ParameterMap& parameters) :
 CqlConnection::~CqlConnection() {
     // Free up the prepared statements, ignoring errors.
     // Session and connection resources are deallocated.
-    CassError rc;
+    CassError rc = CASS_OK;
+    std::string error;
+
     for (int i = 0; i < statements_.size(); i++) {
         if (statements_[i]) {
             cass_prepared_free(statements_[i]);
         }
         statements_[i] = NULL;
     }
-    CassFuture* close_future = cass_session_close(session_);
-    cass_future_wait(close_future);
-    std::string error;
-    checkStatementError(error, close_future, "could not close connection to DB");
-    rc = cass_future_error_code(close_future);
-    cass_future_free(close_future);
-    cass_session_free(session_);
-    session_ = NULL;
-    cass_cluster_free(cluster_);
-    cluster_ = NULL;
+
+    if (session_) {
+        CassFuture* close_future = cass_session_close(session_);
+        cass_future_wait(close_future);
+        checkStatementError(error, close_future, "could not close connection to DB");
+        rc = cass_future_error_code(close_future);
+        cass_future_free(close_future);
+        cass_session_free(session_);
+        session_ = NULL;
+    }
+
+    if (cluster_) {
+        cass_cluster_free(cluster_);
+        cluster_ = NULL;
+    }
+
+    // We're closing the connection anyway. Let's not throw at this
+    // stage
     if (rc != CASS_OK) {
         isc_throw(DbOpenError, error);
     }