From: Jinrong Xie <jrxie@ucdavis.edu>
Date: Mon, 29 Jun 2015 10:09:27 +0000 (+0000)
Subject: fixed unsafe usage of malloc() pointed out by jtsiomb.
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=freeglut;a=commitdiff_plain;h=4e0dd98c5cef6701f92c134bdf11ceecbdd6ad8f

fixed unsafe usage of malloc() pointed out by jtsiomb.

(cherry picked from commit aa5514903def8bcc8ceac2487f629b766d23094d)

(cherry picked from commit aa5514903def8bcc8ceac2487f629b766d23094d)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1764 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/mswin/fg_internal_mswin.h b/src/mswin/fg_internal_mswin.h
index c5ef600..912b6f7 100644
--- a/src/mswin/fg_internal_mswin.h
+++ b/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 <stonexjr at gmail.com> 12/24/2014
 int  fgIsSpaceballWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam);
 void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam);
 
diff --git a/src/mswin/fg_spaceball_mswin.c b/src/mswin/fg_spaceball_mswin.c
index 09f6a96..277b648 100644
--- a/src/mswin/fg_spaceball_mswin.c
+++ b/src/mswin/fg_spaceball_mswin.c
@@ -37,6 +37,7 @@
  */
 
 #include <GL/freeglut.h>
+#include <stdlib.h>
 #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));