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

[freeglut] / src / mswin / fg_spaceball_mswin.c

diff --git a/src/mswin/fg_spaceball_mswin.c b/src/mswin/fg_spaceball_mswin.c
index ba2ccf0..f9bad24 100644 (file)
--- a/src/mswin/fg_spaceball_mswin.c
+++ b/src/mswin/fg_spaceball_mswin.c
@@ -10,7 +10,7 @@
  * Copyright (c) 2014 Jinrong Xie. All Rights Reserved.
  * Written by Jinrong Xie <stonexjr at gmail.com>
  * Modification date: Wed Dec 24, 2014
-
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -30,13 +30,14 @@
  */
 
 /*
- * Modified by Jinrong Xie (stonexjr@gmail.com) 12/24/2014
+ * Modified by Jinrong Xie <stonexjr at gmail.com> 12/24/2014
  * for Space Navigator support on Windows.
  * This code is enhanced by at least supporting 3Dconnexion's 
  * six degree of freedom navigator.
  */
 
 #include <GL/freeglut.h>
+#include <stdlib.h>
 #include "../fg_internal.h"
 
 enum {
@@ -53,7 +54,7 @@ RAWINPUTDEVICE __fgSpaceball = { 0x01, 0x08, 0x00, 0x00 };
 void fgPlatformInitializeSpaceball(void)
 {
        HWND hwnd;
-    sball_initialized = 1;
+       sball_initialized = 1;
        if (!fgStructure.CurrentWindow)
        {
                sball_initialized = 0;
@@ -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));
@@ -188,4 +189,4 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
                        __fgSpaceKeystate = dwKeystate;
                }
        }
-}
\ No newline at end of file
+}