From aa5514903def8bcc8ceac2487f629b766d23094d Mon Sep 17 00:00:00 2001 From: Jinrong Xie Date: Wed, 13 May 2015 00:42:20 -0700 Subject: [PATCH] fixed unsafe usage of malloc() pointed out by jtsiomb. --- freeglut/freeglut/src/mswin/fg_internal_mswin.h | 2 +- freeglut/freeglut/src/mswin/fg_spaceball_mswin.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/freeglut/freeglut/src/mswin/fg_internal_mswin.h b/freeglut/freeglut/src/mswin/fg_internal_mswin.h index c5ef600..912b6f7 100644 --- a/freeglut/freeglut/src/mswin/fg_internal_mswin.h +++ b/freeglut/freeglut/src/mswin/fg_internal_mswin.h @@ -129,7 +129,7 @@ struct tagSFG_PlatformJoystick /* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */ /* Spaceball device functions, defined in fg_spaceball_mswin.c */ -//Added by Jinrong Xie (stonexjr @ gmail.com) 12/24/2014 +//Added by Jinrong Xie 12/24/2014 int fgIsSpaceballWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam); void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam); diff --git a/freeglut/freeglut/src/mswin/fg_spaceball_mswin.c b/freeglut/freeglut/src/mswin/fg_spaceball_mswin.c index 09f6a96..277b648 100644 --- a/freeglut/freeglut/src/mswin/fg_spaceball_mswin.c +++ b/freeglut/freeglut/src/mswin/fg_spaceball_mswin.c @@ -37,6 +37,7 @@ */ #include +#include #include "../fg_internal.h" enum { @@ -121,7 +122,7 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) if (res == -1) return; - rawInputBuffer = (BYTE*)malloc(size); + rawInputBuffer = malloc(size * sizeof *rawInputBuffer); pRawInput = (PRAWINPUT)rawInputBuffer; res = GetRawInputData(hRawInput, RID_INPUT, pRawInput, &size, sizeof(RAWINPUTHEADER));