fix: leaks

models/device_dbo.cc

@@ -98,11 +98,13 @@ device_db_select(sqlite3_stmt *stmt)
             else
             {
                 LOG_ERROR << "Error Selecting devices from database";
+                sqlite3_finalize(stmt);
                 return nullptr;
             }
         }
     }
 
+    sqlite3_finalize(stmt);
     all_devices[row] = nullptr;
 
     return all_devices;
@@ -137,6 +139,7 @@ device_dbo::remove()
     sqlite3_prepare_v2(globals::db, "DELETE FROM devices WHERE id=?1;", -1, &stmt, nullptr);
     sqlite3_bind_text(stmt, 1, this->id, -1, SQLITE_STATIC);
     rc = sqlite3_step(stmt);
+    sqlite3_finalize(stmt);
 
     return rc == SQLITE_DONE;
 

models/period.cc

@@ -15,13 +15,13 @@ period::to_json()
 {
     Json::Value result;
 
-    char start[6], end[6];
+    char start_str[6], end_str[6];
 
-    sprintf(start, "%02d:%02d", (int)(this->start / 60), this->start % 60);
-    sprintf(end, "%02d:%02d", (int)(this->end / 60), this->end % 60);
+    sprintf(start_str, "%02d:%02d", (int)(this->start / 60), this->start % 60);
+    sprintf(end_str, "%02d:%02d", (int)(this->end / 60), this->end % 60);
 
-    result["start"] = std::string(start);
-    result["end"] = std::string(end);
+    result["start"] = std::string(start_str);
+    result["end"] = std::string(end_str);
 
     return result;
 }
@@ -31,11 +31,11 @@ period::is_in_period(uint16_t timestamp)
 {
     if(this->start < this->end)
     {
-        return this->start < timestamp and timestamp < this->end;
+        return this->start <= timestamp and timestamp <= this->end;
     }
     if(this->start > this->end)
     {
-        return this->end < timestamp and timestamp < this->start;
+        return this->end <= timestamp and timestamp <= this->start;
     }
     return this->start == timestamp;
 }

models/schedule_dbo.cc

@@ -20,17 +20,16 @@ static bool schedule_db_update_insert(schedule_dbo *schedule, sqlite3_stmt *stmt
     sqlite3_bind_blob(stmt, 3, periods_blob, sizeof(uint16_t) * ((periods_blob[0] * 2) + 1), SQLITE_STATIC);
 
     rc = sqlite3_step(stmt);
-    if (rc != SQLITE_DONE)
-    {
-        printf("ERROR inserting data: %s\n", sqlite3_errmsg(globals::db));
-        free(periods_blob);
-        return false;
-    }
 
     sqlite3_finalize(stmt);
-
     free(periods_blob);
 
+    if (rc != SQLITE_DONE)
+    {
+        LOG_ERROR << "ERROR inserting data: " << sqlite3_errmsg(globals::db);
+        return false;
+    }
+
     return true;
 }
 
@@ -89,11 +88,14 @@ schedule_db_select(sqlite3_stmt *stmt)
             else
             {
                 LOG_ERROR << "Error Selecting schedules from database";
+                sqlite3_finalize(stmt);
                 return nullptr;
             }
         }
     }
 
+    sqlite3_finalize(stmt);
+
     all_schedules[row] = nullptr;
 
     return all_schedules;
@@ -129,10 +131,17 @@ schedule_dbo::remove()
     sqlite3_bind_text(stmt, 1, this->id, -1, SQLITE_STATIC);
     rc = sqlite3_step(stmt);
 
+    sqlite3_finalize(stmt);
+
     return rc == SQLITE_DONE;
 
 }
 
+schedule_dbo::~schedule_dbo()
+{
+    delete this->periods;
+}
+
 Json::Value
 schedule_dbo::to_json()
 {
@@ -165,7 +174,13 @@ schedule_dbo::get_one_by(const char *key, const char *value)
     sqlite3_prepare_v2(globals::db, sql, -1, &stmt, nullptr);
     sqlite3_bind_text(stmt, 1, value, -1, SQLITE_STATIC);
 
-    return schedule_db_select(stmt)[0];
+    schedule_dbo **schedule_list = schedule_db_select(stmt);
+    schedule_dbo *target_schedule =  schedule_list[0];
+
+    free(schedule_list);
+    free(sql);
+
+    return target_schedule;
 }
 
 void
@@ -173,7 +188,6 @@ schedule_dbo::free_list(schedule_dbo **schedules_list)
 {
     for(int i = 0; schedules_list[i] != nullptr; i++)
     {
-        delete schedules_list[i]->periods;
         delete schedules_list[i];
     }
     free(schedules_list);

models/schedule_dbo.h

@@ -24,6 +24,8 @@ public:
     bool
     remove();
 
+    ~schedule_dbo();
+
     Json::Value
     to_json();