Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for memory corruption in Sixense ctor

Browse source 
This was due to interface having a different size for SixenseManager then
input-plugins expected.  This would cause the new operator allocation to be too small.
This commit is contained in:
Anthony J. Thibault 2015-07-24 14:03:53 -07:00
parent 9727302d02
commit 6fb6550641
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
View file

@ -264,7 +264,8 @@ const float MINIMUM_ARM_REACH = 0.3f; // meters
const float MAXIMUM_NOISE_LEVEL = 0.05f; // meters const float MAXIMUM_NOISE_LEVEL = 0.05f; // meters
const quint64 LOCK_DURATION = USECS_PER_SECOND / 4; // time for lock to be acquired const quint64 LOCK_DURATION = USECS_PER_SECOND / 4; // time for lock to be acquired
void SixenseManager::updateCalibration(const sixenseControllerData* controllers) { void SixenseManager::updateCalibration(void* controllersX) {
auto controllers = reinterpret_cast<sixenseControllerData*>(controllersX);
const sixenseControllerData* dataLeft = controllers; const sixenseControllerData* dataLeft = controllers;
const sixenseControllerData* dataRight = controllers + 1; const sixenseControllerData* dataRight = controllers + 1;

6
libraries/input-plugins/src/input-plugins/SixenseManager.h
View file

@ -27,6 +27,8 @@
#include "InputPlugin.h" #include "InputPlugin.h"
#include "InputDevice.h" #include "InputDevice.h"
class QLibrary;
const unsigned int BUTTON_0 = 1U << 0; // the skinny button between 1 and 2 const unsigned int BUTTON_0 = 1U << 0; // the skinny button between 1 and 2
const unsigned int BUTTON_1 = 1U << 5; const unsigned int BUTTON_1 = 1U << 5;
const unsigned int BUTTON_2 = 1U << 6; const unsigned int BUTTON_2 = 1U << 6;
@ -90,8 +92,7 @@ private:
void handleAxisEvent(float x, float y, float trigger, int index); void handleAxisEvent(float x, float y, float trigger, int index);
void handlePoseEvent(glm::vec3 position, glm::quat rotation, int index); void handlePoseEvent(glm::vec3 position, glm::quat rotation, int index);
#ifdef HAVE_SIXENSE void updateCalibration(void* controllers);
void updateCalibration(const sixenseControllerData* controllers);
int _calibrationState; int _calibrationState;
@ -114,7 +115,6 @@ private:
QLibrary* _sixenseLibrary; QLibrary* _sixenseLibrary;
#endif #endif
#endif
bool _hydrasConnected; bool _hydrasConnected;
bool _invertButtons = DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS; bool _invertButtons = DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS;