libdcdb: fixed a Cassandra-related memory leak on sensor-publish ops

1a435282 · Alessio Netti · d87022f9 · 1a435282
Commit 1a435282 authored Jan 20, 2020 by Alessio Netti
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lib/src/sensorconfig.cpp lib/src/sensorconfig.cpp +4 -2

No files found.
--- a/lib/src/sensorconfig.cpp
+++ b/lib/src/sensorconfig.cpp
@@ -963,7 +963,6 @@ SCError SensorConfigImpl::getPublicSensorByName(PublicSensor& sensor, const char
            const CassValue* opSet = nullptr;
            CassIterator *opSetIt = nullptr;
            if((opSet=cass_row_get_column_by_name(row, "operations")) && (opSetIt=cass_iterator_from_collection(opSet))) {
-                CassIterator *opSetIt = cass_iterator_from_collection(opSet);
                const char *opString;
                size_t opLen;

@@ -1495,6 +1494,8 @@ SCError SensorConfigImpl::setOperations(std::string publicName, std::set<std::st
    rc = cass_future_error_code(future);
    if (rc != CASS_OK) {
        connection->printError(future);
+        cass_future_free(future);
+        cass_collection_free(cassSet);
        return SC_UNKNOWNERROR;
    }
    
@@ -1517,7 +1518,8 @@ SCError SensorConfigImpl::setOperations(std::string publicName, std::set<std::st
    else {
        error = SC_OK;
    }
-    
+
+    cass_future_free(future);
    cass_statement_free(statement);
    cass_prepared_free(prepared);
    cass_collection_free(cassSet);