Checks return code before nullifying db pointer.

iwongu · Mar 17, 2016 · 011c3f5 · 011c3f5
1 parent 426ed4c
commit 011c3f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/boost_src/sqlite3pp.cpp b/boost_src/sqlite3pp.cpp
@@ -97,7 +97,9 @@ namespace sqlite3pp
     int rc = SQLITE_OK;
     if (db_) {
       rc = sqlite3_close(db_);
-      db_ = 0;
+      if (rc == SQLITE_OK) {
+        db_ = 0;
+      }
     }
 
     return rc;

diff --git a/headeronly_src/sqlite3pp.ipp b/headeronly_src/sqlite3pp.ipp
@@ -114,7 +114,9 @@ namespace sqlite3pp
     auto rc = SQLITE_OK;
     if (db_) {
       rc = sqlite3_close(db_);
-      db_ = nullptr;
+      if (rc == SQLITE_OK) {
+        db_ = nullptr;
+      }
     }
 
     return rc;

diff --git a/src/sqlite3pp.cpp b/src/sqlite3pp.cpp
@@ -116,7 +116,9 @@ namespace sqlite3pp
     auto rc = SQLITE_OK;
     if (db_) {
       rc = sqlite3_close(db_);
-      db_ = nullptr;
+      if (rc == SQLITE_OK) {
+        db_ = nullptr;
+      }
     }
 
     return rc;