Fix move constructor and move assignment for Database

After moving the busy_handler_, the referenced instance casues the crash issue.

Change-Id: I023c55987551ed5f08935bf73ef18c8868dc3ef3
Signed-off-by: jh9216.park <jh9216.park@samsung.com>

diff --git a/tizen-database/database.hpp b/tizen-database/database.hpp
index 2ed94fa..75c2c61 100644 (file)
--- a/tizen-database/database.hpp
+++ b/tizen-database/database.hpp
@@ -669,7 +669,7 @@ class Database {
     busy_handler_ = std::move(busy_handler);
     r = sqlite3_busy_handler(db_, [](void* data, int count) {
       Database* pDb = static_cast<Database*>(data);
-      if (pDb->busy_handler_(count))
+      if (pDb->busy_handler_ && pDb->busy_handler_(count))
         return 1;
       return 0;
     }, this);
@@ -691,7 +691,16 @@ class Database {
 
   Database(Database&& db) noexcept {
     db_ = db.db_;
+    busy_handler_ = std::move(db.busy_handler_);
     db.db_ = nullptr;
+    db.busy_handler_ = nullptr;
+
+    sqlite3_busy_handler(db_, [](void* data, int count) {
+      Database* pDb = static_cast<Database*>(data);
+      if (pDb->busy_handler_ && pDb->busy_handler_(count))
+        return 1;
+      return 0;
+    }, this);
   }
 
   explicit operator bool() const {
@@ -702,10 +711,18 @@ class Database {
 
   Database& operator = (Database&& db) noexcept {
     if (this != &db) {
-        if (db_)
-          sqlite3_close_v2(db_);
-        db_ = db.db_;
-        db.db_ = nullptr;
+      if (db_)
+        sqlite3_close_v2(db_);
+      db_ = db.db_;
+      busy_handler_ = std::move(db.busy_handler_);
+      db.db_ = nullptr;
+      db.busy_handler_ = nullptr;
+      sqlite3_busy_handler(db_, [](void* data, int count) {
+        Database* pDb = static_cast<Database*>(data);
+        if (pDb->busy_handler_ && pDb->busy_handler_(count))
+          return 1;
+        return 0;
+      }, this);
     }
 
     return *this;