RPCS3/cereal
1
0
Fork 0
mirror of https://github.com/RPCS3/cereal.git synced 2025-03-04 21:49:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JSON now matches string length for out of order NVPs

Browse Source 
Fixes #183, relates #168, #169
fix originally proposed by @felixzng
This commit is contained in:
Shane Grant 2015-05-02 21:17:44 -07:00
parent 94d49c42ac
commit 5d541d33cd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/cereal/archives/json.hpp
View File

@ -491,11 +491,15 @@ namespace cereal
const auto len = std::strlen( searchName );
size_t index = 0;
for( auto it = itsMemberItBegin; it != itsMemberItEnd; ++it, ++index )
if( std::strncmp( searchName, it->name.GetString(), len ) == 0 )
{
const auto currentName = it->name.GetString();
if( ( std::strncmp( searchName, currentName, len ) == 0 ) &&
( std::strlen( currentName ) == len ) )
{
itsIndex = index;
return;
}
}
throw Exception("JSON Parsing failed - provided NVP not found");
}

12
unittests/unordered_loads.cpp
View File

@ -30,6 +30,7 @@
struct unordered_naming
{
int x;
int xx;
int y;
int z;
@ -38,7 +39,8 @@ struct unordered_naming
{
ar( CEREAL_NVP(x),
CEREAL_NVP(z),
CEREAL_NVP(y) );
CEREAL_NVP(y),
CEREAL_NVP(xx) );
}
template <class Archive>
@ -46,18 +48,19 @@ struct unordered_naming
{
ar( x,
CEREAL_NVP(y),
CEREAL_NVP(z) );
CEREAL_NVP(z),
CEREAL_NVP(xx) );
}
bool operator==( unordered_naming const & other ) const
{
return x == other.x && y == other.y && z == other.z;
return x == other.x && xx == other.xx && y == other.y && z == other.z;
}
};
std::ostream& operator<<(std::ostream& os, unordered_naming const & s)
{
os << "[x: " << s.x << " y: " << s.y << " z: " << s.z << "]";
os << "[x: " << s.x << " xx: " << s.xx << " y: " << s.y << " z: " << s.z << "]";
return os;
}
@ -92,6 +95,7 @@ void test_unordered_loads()
std::pair<float, unordered_naming> o_un7;
o_un7.first = rngF();
o_un7.second.x = rngI();
o_un7.second.xx = rngI();
o_un7.second.y = rngI();
o_un7.second.z = rngI();