refactoring: add size argument to initFromData()

Change-Id: I0fea35816cbbb7dc898e495adab73d9c28729bc3

diff --git a/src/internal/storage_backend_serialized.cpp b/src/internal/storage_backend_serialized.cpp
index 725d488..a099a1e 100644 (file)
--- a/src/internal/storage_backend_serialized.cpp
+++ b/src/internal/storage_backend_serialized.cpp
@@ -136,7 +136,7 @@ class StorageBackendSerialized::StorageBackendSerializedImpl {
 
 public:
        bool init(const char *filename, bool verify);
-       bool initFromData(const uint8_t *mem, bool verify);
+       bool initFromData(const uint8_t *mem, size_t size, bool verify);
        bool initFromXML(const char *config_name);
        void release();
 
@@ -281,7 +281,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::init(const char *fi
 
        auto mmapGuard = transaction_guard::makeGuard([&] () { releaseMMap(); });
 
-       if (!initFromData(mem, verify))
+       if (!initFromData(mem, length, verify))
                return false;
 
        openGuard.dismiss();
@@ -290,11 +290,11 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::init(const char *fi
        return true;
 }
 
-bool StorageBackendSerialized::StorageBackendSerializedImpl::initFromData(const uint8_t *mem, bool verify) {
+bool StorageBackendSerialized::StorageBackendSerializedImpl::initFromData(const uint8_t *mem, size_t size, bool verify) {
        assert(nullptr == file);
 
        if (verify) {
-               auto verifier = flatbuffers::Verifier(mem, length);
+               auto verifier = flatbuffers::Verifier(mem, size);
                if (!FB::VerifyFileBuffer(verifier) || !FB::FileBufferHasIdentifier(mem)) {
                        char fid[FB::FB_ID_SIZE + 1] = {0, };
                        strncpy(fid, (const char *)(mem + FB::FB_ID_OFFSET), FB::FB_ID_SIZE);
@@ -325,7 +325,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::initFromXML(const c
        if (nullptr == data)
                return false;
 
-       return initFromData(data, false);
+       return initFromData(data, serialized_size, false);
 }
 
 void StorageBackendSerialized::StorageBackendSerializedImpl::printContent(const bool xml_format) const {
@@ -357,8 +357,8 @@ bool StorageBackendSerialized::init(const char *filename, bool verify) {
        return pimpl->init(filename, verify);
 }
 
-bool StorageBackendSerialized::initFromData(const uint8_t *serialized_data, bool verify) {
-       return pimpl->initFromData(serialized_data, verify);
+bool StorageBackendSerialized::initFromData(const uint8_t *serialized_data, size_t length, bool verify) {
+       return pimpl->initFromData(serialized_data, length, verify);
 }
 
 bool StorageBackendSerialized::initFromXML(const char *config_name) {

diff --git a/src/internal/storage_backend_serialized.hpp b/src/internal/storage_backend_serialized.hpp
index cb83b8d..4781b87 100644 (file)
--- a/src/internal/storage_backend_serialized.hpp
+++ b/src/internal/storage_backend_serialized.hpp
@@ -29,7 +29,7 @@ public:
        ~StorageBackendSerialized();
 
        bool init(const char *filename, bool verify = false);
-       bool initFromData(const uint8_t *serialized_data, bool verify = false);
+       bool initFromData(const uint8_t *serialized_data, size_t length, bool verify = false);
        bool initFromXML(const char *config_name);
        void release();
 

diff --git a/src/stest_load_perf.cpp b/src/stest_load_perf.cpp
index a2ce952..5c30803 100644 (file)
--- a/src/stest_load_perf.cpp
+++ b/src/stest_load_perf.cpp
@@ -53,7 +53,7 @@ bool run_xml_plus_fb(const char *conf_file, bool verify) {
        }
 
        StorageBackendSerialized storage;
-       return storage.initFromData(buff);
+       return storage.initFromData(buff, size);
 }
 
 bool run_fb(const char *conf_file, bool verify) {

diff --git a/src/stest_performance.cpp b/src/stest_performance.cpp
index 15b81c6..47dc8a6 100644 (file)
--- a/src/stest_performance.cpp
+++ b/src/stest_performance.cpp
@@ -200,7 +200,7 @@ void run_fb(const char *conf_file, bool verify, size_t count, bool worst) {
        }
 
        StorageBackendSerialized storage;
-       storage.initFromData(buff);
+       storage.initFromData(buff, size);
 
        printf("FLATBUFFERS:\n");
        if (!worst)

diff --git a/src/test-libdbuspolicy1-access-deny-gdi.cpp b/src/test-libdbuspolicy1-access-deny-gdi.cpp
index 9e97270..c601408 100644 (file)
--- a/src/test-libdbuspolicy1-access-deny-gdi.cpp
+++ b/src/test-libdbuspolicy1-access-deny-gdi.cpp
@@ -141,22 +141,22 @@ bool run_fb(const std::pair<TestBusSetup, TestBusSetup> access_test) {
        const auto& system_bus_setup = access_test.first;
        const auto& session_bus_setup = access_test.second;
 
-       size_t size;
+       size_t size_sys, size_ses;
 
-       auto buff_sys = serializer.serialize(system_bus_setup.first.c_str(), size);
+       auto buff_sys = serializer.serialize(system_bus_setup.first.c_str(), size_sys);
        decltype(buff_sys) buff_ses = nullptr;
        if (session_bus_setup.first == "")
-               buff_ses = serializer.serialize(session_bus_setup.first.c_str(), size);
+               buff_ses = serializer.serialize(session_bus_setup.first.c_str(), size_ses);
 
        ldp_serialized::StorageBackendSerialized storage_sys, storage_ses;
 
        printf("FLATBUFFERS:\n");
 
-       storage_sys.initFromData(buff_sys);
+       storage_sys.initFromData(buff_sys, size_sys);
        bool res = run_tests_for_bus(storage_sys, policy_checker_system(), system_bus_setup.second, i, passed);
 
        if (buff_ses) {
-               storage_ses.initFromData(buff_ses);
+               storage_ses.initFromData(buff_ses, size_ses);
                res &= run_tests_for_bus(storage_ses, policy_checker_session(), session_bus_setup.second, i, passed);
        }
        return res;

diff --git a/src/test-libdbuspolicy1-method-gdi.cpp b/src/test-libdbuspolicy1-method-gdi.cpp
index b52e9fd..beaece1 100644 (file)
--- a/src/test-libdbuspolicy1-method-gdi.cpp
+++ b/src/test-libdbuspolicy1-method-gdi.cpp
@@ -128,7 +128,7 @@ bool run_fb() {
        auto buff = serializer.serialize("tests/default_allow/system.conf", size);
 
        ldp_serialized::StorageBackendSerialized storage;
-       storage.initFromData(buff);
+       storage.initFromData(buff, size);
        printf("FLATBUFFERS:\n");
        bool ret = method_test(storage);
        return ret;

diff --git a/src/test-libdbuspolicy1-ownership-deny-gdi.cpp b/src/test-libdbuspolicy1-ownership-deny-gdi.cpp
index 3f6817e..4096d8a 100644 (file)
--- a/src/test-libdbuspolicy1-ownership-deny-gdi.cpp
+++ b/src/test-libdbuspolicy1-ownership-deny-gdi.cpp
@@ -183,7 +183,7 @@ bool run_fb() {
        auto buff = serializer.serialize("tests/default_deny/system.conf", size);
 
        ldp_serialized::StorageBackendSerialized storage;
-       storage.initFromData(buff);
+       storage.initFromData(buff, size);
 
        printf("FRAMEBUFFERS:\n");
        return ownership_test(storage);

diff --git a/src/test-libdbuspolicy1-ownership-gdi.cpp b/src/test-libdbuspolicy1-ownership-gdi.cpp
index 5c1ba60..c844e0f 100644 (file)
--- a/src/test-libdbuspolicy1-ownership-gdi.cpp
+++ b/src/test-libdbuspolicy1-ownership-gdi.cpp
@@ -106,7 +106,7 @@ bool run_fb() {
        auto buff = serializer.serialize("tests/default_allow/system.conf", size);
 
        ldp_serialized::StorageBackendSerialized storage;
-       storage.initFromData(buff);
+       storage.initFromData(buff, size);
        printf("FLATBUFFERS:\n");
        return ownership_test(storage);
 }

diff --git a/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp b/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp
index f4cf1aa..a0c276a 100644 (file)
--- a/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp
+++ b/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp
@@ -190,7 +190,7 @@ bool run_fb() {
        auto buff = serializer.serialize("tests/default_deny/system.conf", size);
 
        ldp_serialized::StorageBackendSerialized storage;
-       storage.initFromData(buff);
+       storage.initFromData(buff, size);
 
        printf("FLATBUFFERS:\n");
        return send_prefix_test(storage);

diff --git a/src/test-libdbuspolicy1-signal-gdi.cpp b/src/test-libdbuspolicy1-signal-gdi.cpp
index 5da8633..44acae0 100644 (file)
--- a/src/test-libdbuspolicy1-signal-gdi.cpp
+++ b/src/test-libdbuspolicy1-signal-gdi.cpp
@@ -85,7 +85,7 @@ bool run_fb() {
        auto buff = serializer.serialize("tests/default_allow/system.conf", size);
 
        ldp_serialized::StorageBackendSerialized storage;
-       storage.initFromData(buff);
+       storage.initFromData(buff, size);
 
        printf("FLATBUFFERS:\n");
        return signal_test(storage);