fix more memleaks

Author: mpadge

src/sqlite3db-add-data.h

@@ -51,9 +51,11 @@ int rcpp_import_to_trip_table (const char* bikedb,
 {
     sqlite3 *dbcon;
     char *zErrMsg = nullptr;
+    const char *zVfs = nullptr;
     size_t rc;
 
-    rc = static_cast <size_t> (sqlite3_open_v2(bikedb, &dbcon, SQLITE_OPEN_READWRITE, nullptr));
+    rc = static_cast <size_t> (sqlite3_open_v2(bikedb, &dbcon, SQLITE_OPEN_READWRITE, zVfs));
+    //rc = static_cast <size_t> (sqlite3_open(bikedb, &dbcon));
     if (rc != SQLITE_OK)
         throw std::runtime_error ("Can't establish sqlite3 connection");
 
@@ -90,6 +92,7 @@ int rcpp_import_to_trip_table (const char* bikedb,
     sqlite3_prepare_v2(dbcon, sqlqry, BUFFER_SIZE, &stmt, nullptr);
 
     sqlite3_exec(dbcon, "BEGIN TRANSACTION", nullptr, nullptr, &zErrMsg);
+    sqlite3_free (zErrMsg);
 
     for(int filenum = 0; filenum < datafiles.length(); filenum++) 
     {
@@ -172,8 +175,10 @@ int rcpp_import_to_trip_table (const char* bikedb,
             }
         }
     }
+    sqlite3_finalize(stmt);
 
     sqlite3_exec(dbcon, "END TRANSACTION", nullptr, nullptr, &zErrMsg);
+    sqlite3_free (zErrMsg);
 
     if (city == "ny" || city == "bo" || city == "la" || city == "ph")
         import_to_station_table (dbcon, stationqry);
@@ -218,14 +223,19 @@ int rcpp_import_to_file_table (const char * bikedb,
         datafile_qry += std::to_string (nfiles) + ",\"" + city + "\",\"" + 
             i + "\");";
 
-        rc = sqlite3_exec(dbcon, datafile_qry.c_str(), nullptr, nullptr, &zErrMsg);
+        const char *sql = datafile_qry.c_str ();
+        rc = sqlite3_exec(dbcon, sql, nullptr, nullptr, &zErrMsg);
+        sqlite3_free (zErrMsg);
+        //rc = sqlite3_exec(dbcon, datafile_qry.c_str(), nullptr, nullptr, &zErrMsg);
         if (rc == 0)
             nfiles++;
     }
 
     rc = sqlite3_close_v2(dbcon);
+    //rc = sqlite3_close(dbcon);
     if (rc != SQLITE_OK)
         throw std::runtime_error ("Unable to close sqlite database");
+    sqlite3_free (zErrMsg);
 
     return nfiles;
 }

src/sqlite3db-utils.h

@@ -28,12 +28,12 @@ int get_stn_table_size (sqlite3 * dbcon);
 int get_max_trip_id (sqlite3 * dbcon)
 {
     sqlite3_stmt * stmt;
-    char qry_id [BUFFER_SIZE];
+    char qry_id [BUFFER_SIZE] = "\0";
     int rc = sprintf(qry_id, "SELECT MAX(id) FROM trips");
     rc = sqlite3_prepare_v2(dbcon, qry_id, BUFFER_SIZE, &stmt, nullptr);
     rc = sqlite3_step (stmt);
     int max_trip_id = sqlite3_column_int (stmt, 0);
-    sqlite3_reset (stmt);
+    sqlite3_finalize (stmt);
     (void) rc; // supress unused variable warning;
 
     return max_trip_id;
@@ -49,12 +49,12 @@ int get_max_trip_id (sqlite3 * dbcon)
 int get_max_stn_id (sqlite3 * dbcon)
 {
     sqlite3_stmt * stmt;
-    char qry_id [BUFFER_SIZE];
+    char qry_id [BUFFER_SIZE] = "\0";
     sprintf(qry_id, "SELECT MAX(id) FROM stations");
     int rc = sqlite3_prepare_v2(dbcon, qry_id, BUFFER_SIZE, &stmt, nullptr);
     rc = sqlite3_step (stmt);
     int max_stn_id = sqlite3_column_int (stmt, 0);
-    sqlite3_reset (stmt);
+    sqlite3_finalize (stmt);
     (void) rc; // supress unused variable warning;
 
     return max_stn_id;
@@ -70,12 +70,12 @@ int get_max_stn_id (sqlite3 * dbcon)
 int get_stn_table_size (sqlite3 * dbcon)
 {
     sqlite3_stmt * stmt;
-    char qry_id [BUFFER_SIZE];
+    char qry_id [BUFFER_SIZE] = "\0";
     sprintf(qry_id, "SELECT COUNT(*) FROM stations");
     int rc = sqlite3_prepare_v2(dbcon, qry_id, BUFFER_SIZE, &stmt, nullptr);
     rc = sqlite3_step (stmt);
     int num_stns = sqlite3_column_int (stmt, 0);
-    sqlite3_reset (stmt);
+    sqlite3_finalize (stmt);
     (void) rc; // supress unused variable warning;
 
     return num_stns;