Merge pull request #63 from 0WAQ/main

con->close()

Author: stepbystepcode

mysql.cc

@@ -18,6 +18,7 @@ void sql_unlocked(const std::string& DeleteName)
     {
         std::cerr << "SQL Exception: in sql_unlocked() function" << e.what() << std::endl;
     }
+    con->close();
     delete stmt;
     delete con;
 }
@@ -38,6 +39,10 @@ int sql_findexist(const std::string& receiver)
         if (receiver == resultSet->getString("username"))
             return 1;
     }
+    con->close();
+    delete con;
+    delete readdatament;
+    delete resultSet;
     return 0;
 }
 int lockcheck(const std::string& filename)
@@ -59,6 +64,12 @@ int lockcheck(const std::string& filename)
     sql::PreparedStatement *changestatement = con->prepareStatement(changestate);
     changestatement->setString(1, filename);
     changestatement->executeUpdate();
+
+    con->close(); 
+    delete con;
+    delete readdatament;
+    delete resultSet;
+    delete changestatement;
     return 0;
 }
 void process(sql::PreparedStatement *readDatament, std::vector<std::string> s, sql::Connection *con)
@@ -82,6 +93,7 @@ void process(sql::PreparedStatement *readDatament, std::vector<std::string> s, s
         updateStatement->setString(1, friendlist);
         updateStatement->setString(2, s[i]);
         updateStatement->execute();
+        delete resultSet;
     }
 }
 
@@ -98,6 +110,10 @@ void sql_delete_operation(const std::string& sender, const std::string& receiver
 
     sql::PreparedStatement *readDatament = con->prepareStatement(readdata);
     process(readDatament, s, con);
+
+    con->close();
+    delete con;
+    delete readDatament;
 }
 
 void sql_process_request(const std::string& sender, const std::string& receiver, const std::string& attitude)
@@ -172,6 +188,8 @@ void sql_process_request(const std::string& sender, const std::string& receiver,
         }
         delete[] RS;
     }
+
+    con->close();
     delete updateStatement;
     delete resultSet;
     delete readDatament;
@@ -220,6 +238,7 @@ void sql_addrequest(const std::string& sender, const std::string& receiver)
         delete updateStatement;
     }
 
+    con->close();
     delete resultSet;
     delete readDatament;
     delete tool;
@@ -244,6 +263,7 @@ void sql_addhistory(const std::string& sender, const std::string& receiver, cons
         insertData->setString(5, receiver);
         insertData->executeUpdate();
 
+        con->close();
         delete insertData;
         delete con;
     }
@@ -272,6 +292,7 @@ void sql_add(const std::string& username, const std::string& passwd, int avatar)
         ptool->setString(4, "FlypenTeam");
         ptool->executeUpdate();
 
+        con->close();
         delete ptool;
         delete tool;
         delete con;
@@ -321,6 +342,7 @@ Json::Value get_my_info(const std::string& me)
                     {
                         info["avatar"] = res->getInt("avatar");
                     }
+                    delete res;
                     return info;
                 };
 
@@ -352,8 +374,13 @@ Json::Value get_my_info(const std::string& me)
                 std::string userJson = Json::writeString(builder, user);
 
                 json[me] = user;
+
+                delete prepStmt;
+                delete res;
             }
         }
+        con->close();
+        delete con;
     }
     catch (sql::SQLException &e)
     {
@@ -392,6 +419,7 @@ bool sql_check(const std::string& user, const std::string& passwd)
                 result = false;
         }
 
+        con->close();
         delete res;
         delete prepStmt;
         delete con;
@@ -496,6 +524,7 @@ Json::Value sql_find_my_msg(const std::string& me, const std::string& connect_ty
         for (auto &x : sender_messages)
             result[x.first] = x.second;
 
+        con->close();
         delete res;
         delete prepStmt;
         delete con;
@@ -519,5 +548,6 @@ void set_avatar(const std::string& person, int avatar)
     updateStatement->setInt(1, avatar);
     updateStatement->setString(2, person);
     updateStatement->execute();
+    con->close();
     delete con;
 }