IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798500 - FTBFS (tests failure) on armhf

Browse Source 
Ensure the transition_times are correctly aligned for their sizes
before attempting to copy them into the transitions vector.
This commit is contained in:
John Ralls 2022-04-02 16:41:52 -07:00
parent 3125352d5a
commit 26b009c0f4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libgnucash/engine/gnc-timezone.cpp
View File

@ -446,15 +446,23 @@ namespace IANAParser
auto info_index = info_index_zero + index;
if (transition_size == 4)
{
transitions.push_back(
{*(endian_swap(reinterpret_cast<int32_t*>(&fileblock[fb_index]))),
static_cast<uint8_t>(fileblock[info_index])});
int32_t transition_time;
// Ensure correct alignment for ARM.
memcpy(&transition_time,
endian_swap(reinterpret_cast<int32_t*>(&fileblock[fb_index])),
sizeof(int32_t));
auto info = static_cast<uint8_t>(fileblock[info_index]);
transitions.push_back({transition_time, info});
}
else
{
transitions.push_back(
{*(endian_swap(reinterpret_cast<int64_t*>(&fileblock[fb_index]))),
static_cast<uint8_t>(fileblock[info_index])});
int64_t transition_time;
// Ensure correct alignment for ARM.
memcpy(&transition_time,
endian_swap(reinterpret_cast<int64_t*>(&fileblock[fb_index])),
sizeof(int64_t));
auto info = static_cast<uint8_t>(fileblock[info_index]);
transitions.push_back({transition_time, info});
}
}