aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Devillechabrol <[email protected]>2025-04-02 10:48:23 -0700
committerGitHub Enterprise <[email protected]>2025-04-02 10:48:23 -0700
commit896530f4dc746098c90212d35e8e120de8acdc42 (patch)
tree665d5c9002cd97c04ddffeaf211fcf8e55d01dce
parentadded --find-max-block-count option to builds upload (#337) (diff)
parentMerge branch 'main' into fd-fix-binary-json (diff)
downloadzen-896530f4dc746098c90212d35e8e120de8acdc42.tar.xz
zen-896530f4dc746098c90212d35e8e120de8acdc42.zip
Merge pull request #319 from ue-foundation/fd-fix-binary-json
Fixed missing trailing quote when converting binary data from compact binary to json
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zencore/compactbinaryjson.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75292c1b7..19b525bf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
- **EXPERIMENTAL** `zen builds`
- Feature: `zen builds upload` command has new option `--find-max-block-count` to control how many blocks we search for reuse.
- Improvement: Bumped the default number of blocks to search during upload to 10000 (from 5000).
+- Bugfix: Fixed missing trailing quote when converting binary data from compact binary to json
## 5.6.1
- Bugfix: GetModificationTickFromPath and CopyFile now works correctly on Windows/Mac
diff --git a/src/zencore/compactbinaryjson.cpp b/src/zencore/compactbinaryjson.cpp
index d8c8a8584..68ed09549 100644
--- a/src/zencore/compactbinaryjson.cpp
+++ b/src/zencore/compactbinaryjson.cpp
@@ -293,6 +293,7 @@ private:
const uint32_t EncodedSize = Base64::GetEncodedDataSize(uint32_t(Value.GetSize()));
const size_t EncodedIndex = Builder.AddUninitialized(size_t(EncodedSize));
Base64::Encode(static_cast<const uint8_t*>(Value.GetData()), uint32_t(Value.GetSize()), Builder.Data() + EncodedIndex);
+ Builder << '"';
}
private: