aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-04 22:00:54 +0200
committerStefan Boberg <[email protected]>2021-09-04 22:00:54 +0200
commite18de60b83b87946e6c58e11d113ceb70b8bf0a0 (patch)
tree66a4a53221b1419f5eff817088786d2a655867cd
parentCleaned up editorconfig (diff)
downloadzen-e18de60b83b87946e6c58e11d113ceb70b8bf0a0.tar.xz
zen-e18de60b83b87946e6c58e11d113ceb70b8bf0a0.zip
Made IoHash zero initialize member, corrected Empty Attachment hash check
-rw-r--r--zencore/compactbinarypackage.cpp4
-rw-r--r--zencore/include/zencore/iohash.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp
index 92ec3789d..7880164f9 100644
--- a/zencore/compactbinarypackage.cpp
+++ b/zencore/compactbinarypackage.cpp
@@ -567,7 +567,7 @@ TEST_CASE("usonpackage")
CHECK_FALSE(bool(Attachment.AsObject()));
CHECK_FALSE(Attachment.IsBinary());
CHECK_FALSE(Attachment.IsObject());
- CHECK(Attachment.GetHash() == IoHash::Zero);
+ CHECK(Attachment.GetHash() == IoHash::HashBuffer({}));
TestSaveLoadValidate("Null", Attachment);
}
@@ -824,7 +824,7 @@ TEST_CASE("usonpackage.serialization")
CHECK(bool(Package));
CHECK(Package.GetAttachments().size() == 2);
CHECK(Package.GetObject().Equals(CbObject()));
- CHECK(Package.GetObjectHash() == IoHash());
+ CHECK(Package.GetObjectHash() == IoHash::Zero);
TestSaveLoadValidate("Attachments", Package);
const CbAttachment* const Object1Attachment = Package.FindAttachment(Object1.GetHash());
diff --git a/zencore/include/zencore/iohash.h b/zencore/include/zencore/iohash.h
index 4a8fcd03f..aaa638684 100644
--- a/zencore/include/zencore/iohash.h
+++ b/zencore/include/zencore/iohash.h
@@ -25,7 +25,7 @@ class CompositeBuffer;
*/
struct IoHash
{
- alignas(uint32_t) uint8_t Hash[20];
+ alignas(uint32_t) uint8_t Hash[20] = {};
static IoHash MakeFrom(const void* data /* 20 bytes */)
{