Skip to content

Correct the behaviors of WriteBuffer #2346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EstherWx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correct the behaviors of WriteBuffer #2346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions include/rapidjson/schema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,11 @@ class Hasher {
}

bool String(const Ch* str, SizeType len, bool) {
WriteBuffer(kStringType, str, len * sizeof(Ch));
if (len == 0) {
WriteType(kStringType);
} else {
WriteBuffer(kStringType, str, len * sizeof(Ch));
}
return true;
}

Expand Down Expand Up @@ -401,18 +405,26 @@ class Hasher {
double d;
};

bool WriteType(Type type) { return WriteBuffer(type, 0, 0); }
bool WriteType(Type type) {
uint64_t h = Hash(RAPIDJSON_UINT64_C2(0xcbf29ce4, 0x84222325), type);
*stack_.template Push<uint64_t>() = h;
return true;
}

bool WriteNumber(const Number& n) { return WriteBuffer(kNumberType, &n, sizeof(n)); }

bool WriteBuffer(Type type, const void* data, size_t len) {
// FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
uint64_t h = Hash(RAPIDJSON_UINT64_C2(0xcbf29ce4, 0x84222325), type);
const unsigned char* d = static_cast<const unsigned char*>(data);
for (size_t i = 0; i < len; i++)
h = Hash(h, d[i]);
*stack_.template Push<uint64_t>() = h;
return true;
if (data != NULL && len != 0) {
uint64_t h = Hash(RAPIDJSON_UINT64_C2(0xcbf29ce4, 0x84222325), type);
const unsigned char* d = static_cast<const unsigned char*>(data);
for (size_t i = 0; i < len; i++)
h = Hash(h, d[i]);
*stack_.template Push<uint64_t>() = h;
return true;
} else {
return false;
}
}

static uint64_t Hash(uint64_t h, uint64_t d) {
Expand Down