citra-emu
/
citra
Archived
1
0
Fork 0
Code

Fix memory region serialization (OSK crash)

This commit is contained in:
Hamish Milne 2020-04-10 16:51:01 +01:00
parent 3278a4d7ef
commit 432ac24503
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/serialization/boost_discrete_interval.hpp
View File

@ -6,6 +6,7 @@
#include <boost/icl/discrete_interval.hpp> #include <boost/icl/discrete_interval.hpp>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/logging/log.h"
namespace boost::serialization { namespace boost::serialization {
@ -25,7 +26,7 @@ void load(Archive& ar, boost::icl::discrete_interval<DomainT, Compare>& obj,
ar >> lower; ar >> lower;
ar >> upper; ar >> upper;
ar >> bounds; ar >> bounds;
obj = boost::icl::discrete_interval(upper, lower, boost::icl::interval_bounds(bounds)); obj = boost::icl::discrete_interval(lower, upper, boost::icl::interval_bounds(bounds));
} }
template <class Archive, class DomainT, ICL_COMPARE Compare> template <class Archive, class DomainT, ICL_COMPARE Compare>

2
src/common/serialization/boost_interval_set.hpp
View File

@ -26,7 +26,7 @@ void load(Archive& ar, boost::icl::interval_set<T>& set, const unsigned int file
for (u64 i = 0; i < count; i++) { for (u64 i = 0; i < count; i++) {
typename boost::icl::interval_set<T>::interval_type value{}; typename boost::icl::interval_set<T>::interval_type value{};
ar >> value; ar >> value;
set.add(value); set += value;
} }
} }