Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-29 19:07:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't parse version for json if there is no expected version.

Browse Source
This commit is contained in:
Jacob Dufault 2018-02-11 17:14:27 -08:00
parent 1d98797f26
commit 35c407b2ac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/serializer.cc
View File

@ -359,13 +359,13 @@ std::unique_ptr<IndexFile> Deserialize(SerializeFormat format,
switch (format) { switch (format) {
case SerializeFormat::Json: { case SerializeFormat::Json: {
rapidjson::Document reader; rapidjson::Document reader;
if (gTestOutputMode) if (gTestOutputMode || !expected_version) {
reader.Parse(serialized_index_content.c_str()); reader.Parse(serialized_index_content.c_str());
else { } else {
const char* p = strchr(serialized_index_content.c_str(), '\n'); const char* p = strchr(serialized_index_content.c_str(), '\n');
if (!p) if (!p)
return nullptr; return nullptr;
if (expected_version && atoi(serialized_index_content.c_str()) != *expected_version) if (atoi(serialized_index_content.c_str()) != *expected_version)
return nullptr; return nullptr;
reader.Parse(p + 1); reader.Parse(p + 1);
} }