Skip to content

Resolve #15 segmentation fault due to buttonStates being incorrectly sized #31

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
turley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve #15 segmentation fault due to buttonStates being incorrectly sized #31

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
2 changes: 1 addition & 1 deletion gamepad/source/gamepad/Gamepad_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ void Gamepad_detectDevices() {
}

deviceRecord->axisStates = calloc(sizeof(float), deviceRecord->numAxes);
deviceRecord->buttonStates = calloc(sizeof(bool), deviceRecord->numButtons);
deviceRecord->buttonStates = calloc(sizeof(true), deviceRecord->numButtons);

if (Gamepad_deviceAttachCallback != NULL) {
Gamepad_deviceAttachCallback(deviceRecord, Gamepad_deviceAttachContext);
Expand Down
2 changes: 1 addition & 1 deletion gamepad/source/gamepad/Gamepad_macosx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ static void onDeviceMatched(void * context, IOReturn result, void * sender, IOHI
CFRelease(elements);

deviceRecord->axisStates = calloc(sizeof(float), deviceRecord->numAxes);
deviceRecord->buttonStates = calloc(sizeof(bool), deviceRecord->numButtons);
deviceRecord->buttonStates = calloc(sizeof(true), deviceRecord->numButtons);

IOHIDDeviceRegisterInputValueCallback(device, onDeviceValueChanged, deviceRecord);

Expand Down
2 changes: 1 addition & 1 deletion gamepad/source/gamepad/Gamepad_windows_dinput.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ static BOOL CALLBACK enumDevicesCallback(const DIDEVICEINSTANCE * instance, LPVO
deviceRecord->numButtons = 0;
IDirectInputDevice_EnumObjects(di8Device, countButtonsCallback, deviceRecord, DIDFT_BUTTON);
deviceRecord->axisStates = calloc(sizeof(float), deviceRecord->numAxes);
deviceRecord->buttonStates = calloc(sizeof(bool), deviceRecord->numButtons);
deviceRecord->buttonStates = calloc(sizeof(true), deviceRecord->numButtons);
deviceRecordPrivate->axisInfo = calloc(sizeof(struct diAxisInfo), deviceRecord->numAxes);
deviceRecordPrivate->buttonOffsets = calloc(sizeof(DWORD), deviceRecord->numButtons);
deviceRecord->numAxes = 0;
Expand Down
2 changes: 1 addition & 1 deletion gamepad/source/gamepad/Gamepad_windows_mm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ void Gamepad_detectDevices() {
deviceRecord->numAxes = caps.wNumAxes + ((caps.wCaps & JOYCAPS_HASPOV) ? 2 : 0);
deviceRecord->numButtons = caps.wNumButtons;
deviceRecord->axisStates = calloc(sizeof(float), deviceRecord->numAxes);
deviceRecord->buttonStates = calloc(sizeof(bool), deviceRecord->numButtons);
deviceRecord->buttonStates = calloc(sizeof(true), deviceRecord->numButtons);
devices = realloc(devices, sizeof(struct Gamepad_device *) * (numDevices + 1));
devices[numDevices++] = deviceRecord;

Expand Down