boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-02-01 21:02:07 +00:00
Code Issues Projects Releases Wiki Activity

fixed subtle bug in reset_object_address. Turns out that the address anything loaded as a pointer should not be altered.

Browse Source
This commit is contained in:
Robert Ramey
2019-10-20 14:08:13 -07:00
parent f04a8cbe90
commit 098019d074
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic_iarchive.cpp
View File

@@ -257,7 +257,10 @@ basic_iarchive_impl::reset_object_address(
break;
}
for(; i < m_moveable_objects.end; ++i){
void const * const this_address = object_id_vector[i].address;
const aobject & ao = object_id_vector[i];
if(ao.loaded_as_pointer)
continue;
void const * const this_address = ao.address;
// calculate displacement from this level
// warning - pointer arithmetic on void * is in herently non-portable
// but expected to work on all platforms in current usage
@@ -497,7 +500,6 @@ basic_iarchive_impl::load_pointer(
serialization::state_saver<object_id_type> w_end(m_moveable_objects.end);
// add to list of serialized objects so that we can properly handle
// cyclic strucures
object_id_vector.push_back(aobject(t, cid));