5 files changed, 27 insertions, 12 deletions

diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index 6231479..c11f49c 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -451,7 +451,7 @@ QVector<Identifier> EntityStore::fullScan(const QByteArray &type)
                     return true;
                 }
 
-                size_t revision = *reinterpret_cast<const size_t*>(key.constData());
+                size_t revision = byteArrayToSizeT(key);
 
                 const auto metadata = flatbuffers::GetRoot<Metadata>(buffer.metadataBuffer());
                 const QByteArray uid = DataStore::getUidFromRevision(d->getTransaction(), revision);
diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index ac246b2..5b4d3ec 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -141,7 +141,7 @@ size_t DataStore::getLatestRevisionFromUid(DataStore::Transaction &t, const QByt
     size_t revision;
     t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues)
         .findLatest(uid, [&revision](const QByteArray &key, const QByteArray &value) {
-            revision = *reinterpret_cast<const size_t *>(value.constData());
+            revision = byteArrayToSizeT(value);
         });
 
     return revision;
@@ -152,7 +152,7 @@ QList<size_t> DataStore::getRevisionsUntilFromUid(DataStore::Transaction &t, con
     QList<size_t> queriedRevisions;
     t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues)
         .scan(uid, [&queriedRevisions, lastRevision](const QByteArray &, const QByteArray &value) {
-            size_t currentRevision = *reinterpret_cast<const size_t *>(value.constData());
+            size_t currentRevision = byteArrayToSizeT(value);
             if (currentRevision < lastRevision) {
                 queriedRevisions << currentRevision;
                 return true;
@@ -185,7 +185,7 @@ void DataStore::recordRevision(DataStore::Transaction &transaction, size_t revis
         .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys)
         .write(revision, uid);
     transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues)
-        .write(uid, QByteArray::fromRawData(reinterpret_cast<const char *>(&revision), sizeof(revision)));
+        .write(uid, sizeTToByteArray(revision));
     transaction
         .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys)
         .write(revision, type);
@@ -199,7 +199,7 @@ void DataStore::removeRevision(DataStore::Transaction &transaction, size_t revis
         .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys)
         .remove(revision);
     transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues)
-        .remove(uid, QByteArray::fromRawData(reinterpret_cast<const char *>(&revision), sizeof(revision)));
+        .remove(uid, sizeTToByteArray(revision));
     transaction
         .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys)
         .remove(revision);
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index e3377b2..981d4ef 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -382,7 +382,7 @@ DataStore::NamedDatabase::~NamedDatabase()
 bool DataStore::NamedDatabase::write(const size_t key, const QByteArray &value,
     const std::function<void(const DataStore::Error &error)> &errorHandler)
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return write(baKey, value, errorHandler);
 }
 
@@ -425,7 +425,7 @@ bool DataStore::NamedDatabase::write(const QByteArray &sKey, const QByteArray &s
 void DataStore::NamedDatabase::remove(
     const size_t key, const std::function<void(const DataStore::Error &error)> &errorHandler)
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return remove(baKey, errorHandler);
 }
 
@@ -437,7 +437,7 @@ void DataStore::NamedDatabase::remove(const QByteArray &k, const std::function<v
 void DataStore::NamedDatabase::remove(const size_t key, const QByteArray &value,
     const std::function<void(const DataStore::Error &error)> &errorHandler)
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return remove(baKey, value, errorHandler);
 }
 
@@ -478,10 +478,10 @@ int DataStore::NamedDatabase::scan(const size_t key,
     const std::function<bool(size_t key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler, bool skipInternalKeys) const
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return scan(baKey,
         [&resultHandler](const QByteArray &key, const QByteArray &value) {
-            size_t integerKey = *reinterpret_cast<const size_t *>(key.constData());
+            size_t integerKey = byteArrayToSizeT(value);
             return resultHandler(integerKey, value);
         },
         errorHandler, /* findSubstringKeys = */ false, skipInternalKeys);
@@ -650,8 +650,8 @@ int DataStore::NamedDatabase::findAllInRange(const size_t lowerBound, const size
     const std::function<void(const QByteArray &key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler) const
 {
-    auto baLowerBound = QByteArray::fromRawData(reinterpret_cast<const char *>(&lowerBound), sizeof(size_t));
-    auto baUpperBound = QByteArray::fromRawData(reinterpret_cast<const char *>(&upperBound), sizeof(size_t));
+    auto baLowerBound = sizeTToByteArray(lowerBound);
+    auto baUpperBound = sizeTToByteArray(upperBound);
     return findAllInRange(baLowerBound, baUpperBound, resultHandler, errorHandler);
 }
 
diff --git a/common/utils.cpp b/common/utils.cpp
index 3c54db4..f6c6798 100644
--- a/common/utils.cpp
+++ b/common/utils.cpp
@@ -23,3 +23,13 @@ QByteArray Sink::createUuid()
 {
     return QUuid::createUuid().toByteArray();
 }
+
+const QByteArray Sink::sizeTToByteArray(const size_t &value)
+{
+    return QByteArray::fromRawData(reinterpret_cast<const char *>(&value), sizeof(size_t));
+}
+
+size_t Sink::byteArrayToSizeT(const QByteArray &value)
+{
+    return *reinterpret_cast<const size_t *>(value.constData());
+}
diff --git a/common/utils.h b/common/utils.h
index ec1d5b1..8565f17 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -26,6 +26,11 @@ namespace Sink {
 
 QByteArray createUuid();
 
+// No copy is done on this functions. Therefore, the caller must not use the
+// returned QByteArray after the size_t has been destroyed.
+const QByteArray sizeTToByteArray(const size_t &);
+size_t byteArrayToSizeT(const QByteArray &);
+
 template <typename T>
 static QByteArray padNumber(T number);