From db51fade6de9461e7a139da2bf5887a9a6569506 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Thu, 20 Jul 2017 13:04:40 +0300
Subject: * dfinput: Fix possible buffer overflows in the ui.

---
 plugins/dfinput/pad.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'plugins/dfinput/pad.c')

diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index bd3aef73..8861ec4d 100755
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -17,11 +17,15 @@
  */
 
 #include "pad.h"
-#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__)
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#if !SDL_VERSION_ATLEAST(2,0,0)
 #include <linux/input.h>
 #include <sys/file.h>
 #include <time.h>
 #endif
+#endif
 
 #if SDL_VERSION_ATLEAST(2,0,0)
 int has_haptic;
@@ -121,11 +125,13 @@ long PADopen(unsigned long *Disp) {
 		}
  
 #if SDL_VERSION_ATLEAST(2,0,0)
-		SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
-		
-    has_haptic = 0;
-    if (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0)
-      has_haptic = 1;
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+        if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
+            return PSE_PAD_ERR_FAILURE;
+	
+        has_haptic = 0;
+        if (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0)
+            has_haptic = 1;
 #endif
 
 		InitSDLJoy();
-- 
cgit v1.2.3