Fix arrays in kvjson visitor, prohibit empty db name

[Bug/Feature]   Arrays were not correctly handled.
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, run tests

Change-Id: Idd5c2c35baf602e09961ee8af80857dda313a5da

diff --git a/src/config/from-kvjson-visitor.hpp b/src/config/from-kvjson-visitor.hpp
index 174bbad..bbae07e 100644 (file)
--- a/src/config/from-kvjson-visitor.hpp
+++ b/src/config/from-kvjson-visitor.hpp
@@ -111,11 +111,10 @@ private:
 
     int getArraySize(std::string& name, json_object* object)
     {
-        int length = -1, jlength = json_object_array_length(object);
         if (mStorePtr->exists(name)) {
-            length = mStorePtr->get<int>(name);
+            return mStorePtr->get<int>(name);
         }
-        return length != jlength ? jlength : length;
+        return json_object_array_length(object);
     }
 
     template<typename T>

diff --git a/src/config/sqlite3/connection.cpp b/src/config/sqlite3/connection.cpp
index e5d0552..cb25694 100644 (file)
--- a/src/config/sqlite3/connection.cpp
+++ b/src/config/sqlite3/connection.cpp
@@ -31,6 +31,11 @@ namespace sqlite3 {
 
 Connection::Connection(const std::string& path)
 {
+    if (path.empty()) {
+        // Sqlite creates temporary database in case of empty path
+        // but we want to forbid this.
+        throw ConfigException("Error opening the database: empty path");
+    }
     if (::sqlite3_open_v2(path.c_str(),
                           &mDbPtr,
                           SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,