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 <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/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 <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));