Skip to content

Fix pointer casts causing SIGBUS on arm on Android. #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix pointer casts causing SIGBUS on arm on Android. #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Source/Drivers/OniFile/DataRecords.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,9 @@ void IntPropRecord::SetValue(XnUInt64 nValue)
XnUInt64 IntPropRecord::GetValue() const
{
XN_ASSERT(GetPropDataSize() == sizeof(XnUInt64));
return *(XnUInt64*)GetPropData();
XnUInt64 data;
memcpy(&data, GetPropData(), sizeof(XnUInt64));
return data;
}

XnStatus IntPropRecord::AsString(XnChar* strDest, XnUInt32 nSize, XnUInt32& nCharsWritten)
Expand Down Expand Up @@ -762,7 +764,9 @@ void RealPropRecord::SetValue(XnDouble dValue)
XnDouble RealPropRecord::GetValue() const
{
XN_ASSERT(GetPropDataSize() == sizeof(XnDouble));
return *(XnDouble*)GetPropData();
XnDouble data;
memcpy(&data, GetPropData(), sizeof(XnDouble));
return data;
}

XnStatus RealPropRecord::AsString(XnChar* strDest, XnUInt32 nSize, XnUInt32& nCharsWritten)
Expand Down
7 changes: 4 additions & 3 deletions Source/Drivers/OniFile/PlayerDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,10 +1006,11 @@ XnStatus XN_CALLBACK_TYPE PlayerDevice::OnNodeGeneralPropChanged(void* pCookie,
}
else if (strcmp(strPropName, XN_PROP_FIELD_OF_VIEW) == 0)
{
XnFieldOfView* pFieldOfView = (XnFieldOfView*)pBuffer;
XnFieldOfView pFieldOfView;
memcpy(&pFieldOfView, pBuffer, sizeof(XnFieldOfView));

// Set the HFOV.
float fov = (float)pFieldOfView->fHFOV;
float fov = (float)pFieldOfView.fHFOV;
rc = pSource->SetProperty(ONI_STREAM_PROPERTY_HORIZONTAL_FOV, &fov, sizeof(fov));
if (rc != ONI_STATUS_OK)
{
Expand All @@ -1018,7 +1019,7 @@ XnStatus XN_CALLBACK_TYPE PlayerDevice::OnNodeGeneralPropChanged(void* pCookie,
else
{
// Set the VFOV.
fov = (float)pFieldOfView->fVFOV;
fov = (float)pFieldOfView.fVFOV;
rc = pSource->SetProperty(ONI_STREAM_PROPERTY_VERTICAL_FOV, &fov, sizeof(fov));
if (rc != ONI_STATUS_OK)
{
Expand Down