From 7ba57b438780eafb63d692f199db6d300c954794 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Wed, 26 Sep 2018 20:27:40 -0700 Subject: [PATCH] Improve blob initialization by using correct size --- src/blobstore/implementations/onblocks/BlobOnBlocks.cpp | 2 +- src/cryfs/filesystem/fsblobstore/FsBlobView.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blobstore/implementations/onblocks/BlobOnBlocks.cpp b/src/blobstore/implementations/onblocks/BlobOnBlocks.cpp index cb6faef5..0202d23a 100644 --- a/src/blobstore/implementations/onblocks/BlobOnBlocks.cpp +++ b/src/blobstore/implementations/onblocks/BlobOnBlocks.cpp @@ -131,7 +131,7 @@ void BlobOnBlocks::write(const void *source, uint64_t offset, uint64_t count) { std::memcpy(leafData.data(), static_cast(source) + indexOfFirstLeafByte - offset, leafDataSize); leaf.nodeStore()->overwriteLeaf(leaf.blockId(), std::move(leafData)); } else { - //TODO Simplify formula, make it easier to understand + //TODO Simplify formula, make it easier to understand leaf.node()->write(static_cast(source) + indexOfFirstLeafByte - offset + leafDataOffset, leafDataOffset, leafDataSize); } diff --git a/src/cryfs/filesystem/fsblobstore/FsBlobView.h b/src/cryfs/filesystem/fsblobstore/FsBlobView.h index 2194b082..f13bc46d 100644 --- a/src/cryfs/filesystem/fsblobstore/FsBlobView.h +++ b/src/cryfs/filesystem/fsblobstore/FsBlobView.h @@ -23,7 +23,7 @@ namespace cryfs { } static void InitializeBlob(blobstore::Blob *baseBlob, BlobType blobType, const blockstore::BlockId &parent) { - baseBlob->resize(sizeof(FORMAT_VERSION_HEADER) + 1); + baseBlob->resize(HEADER_SIZE); baseBlob->write(&FORMAT_VERSION_HEADER, 0, sizeof(FORMAT_VERSION_HEADER)); uint8_t blobTypeInt = static_cast(blobType); baseBlob->write(&blobTypeInt, sizeof(FORMAT_VERSION_HEADER), sizeof(uint8_t));