From 9a2d12d6e4e794b8d7464eca6e48d25691386211 Mon Sep 17 00:00:00 2001
From: "morten.ofstad" <morten.ofstad@bluware.com>
Date: Thu, 12 Nov 2020 15:59:27 +0100
Subject: [PATCH 1/2] Fix the rounding of the file name length in the file
 table to be consistent with the BulkDataStore specification.

---
 src/OpenVDS/BulkDataStore/HueBulkDataStore.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/OpenVDS/BulkDataStore/HueBulkDataStore.cpp b/src/OpenVDS/BulkDataStore/HueBulkDataStore.cpp
index 7c122939..adc4caa7 100644
--- a/src/OpenVDS/BulkDataStore/HueBulkDataStore.cpp
+++ b/src/OpenVDS/BulkDataStore/HueBulkDataStore.cpp
@@ -1076,11 +1076,14 @@ HueBulkDataStoreImpl::UpdateFileTable(DataStoreFileDescriptor const &fileDescrip
   int32_t
     fileNameLength = std::max(int32_t(fileDescriptor.m_fileName.length()), GetDataStoreHeader().m_fileNameLength);
 
+  // Round up to multiple of 8.
+  fileNameLength = (fileNameLength + 7) & ~7;
+
   // Create new file table if necessary
   if (fileDescriptor.m_fileIndex == -1 || fileNameLength != GetDataStoreHeader().m_fileNameLength)
   {
     int
-      newFileTableEntrySize = (int)sizeof(FileHeader) + std::max((int)fileDescriptor.m_fileName.length(), GetDataStoreHeader().m_fileNameLength);
+      newFileTableEntrySize = (int)sizeof(FileHeader) + fileNameLength;
 
     DataStoreBuffer
       *fileTable = CreateBuffer(newFileTableEntrySize * (fileTableEntryCount + 1), ExtentAllocator::FileTableExtent);
-- 
GitLab


From eda9192afc79de8b507570d0f76fcb8c8f88855c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@bluware.com>
Date: Mon, 16 Nov 2020 08:50:29 +0100
Subject: [PATCH 2/2] Mark release 1.1.4

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b956680..1afc4097 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ if(CCACHE_PROGRAM)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
 endif()
 
-project(OpenVDS VERSION 1.1.3)
+project(OpenVDS VERSION 1.1.4)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
   "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-- 
GitLab