From bebaef4be9a87d92b11bc29a002a531a9d1fa5d7 Mon Sep 17 00:00:00 2001
From: dankcushions
Date: Fri, 13 May 2016 16:21:37 +0100
Subject: Defensive code to avoid SEGFAULT

---
 frontend/plugin.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'frontend')

diff --git a/frontend/plugin.c b/frontend/plugin.c
index cf93df8..53ecac9 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -67,7 +67,12 @@ static long PADreadPort1(PadDataS *pad, int pad_index) {
 }
 
 static long PADreadPort2(PadDataS *pad, int pad_index) {
-	pad->controllerType = in_type[pad_index];
+    /* Temporary hack to avoid segfault when pad_index is a crazy number */
+    if (pad_index <= 1 || pad_index > 8) {
+        pad_index = 1;
+    }
+
+    pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
     if(multitap2==1){
     	pad->portMultitap=2;
-- 
cgit v1.2.3