wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-remote-logs

This commit is contained in:
Evan Tschannen 2018-05-10 17:01:25 -07:00
parent 91338fc984 c45599f2a9
commit 67fa95264c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flow/flow.cpp
View File

@ -158,12 +158,12 @@ StringRef strinc(StringRef const& str, Arena& arena) {
}
StringRef addVersionStampAtEnd(StringRef const& str, Arena& arena) {
int16_t size = str.size();
uint8_t* s = new (arena) uint8_t[size + 12];
int32_t size = str.size();
uint8_t* s = new (arena) uint8_t[size + 14];
memcpy(s, str.begin(), size);
memset(&s[size], 0, 10);
memcpy(&s[size+10], &size, 2);
return StringRef(s,size + 12);
memcpy(&s[size+10], &size, 4);
return StringRef(s,size + 14);
}
Standalone<StringRef> addVersionStampAtEnd(StringRef const& str) {