From ec822df6c45f66c2bfdff3346be3b8db195c928a Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Tue, 11 Apr 2017 14:41:59 +0200
Subject: [PATCH] Adding more NULL checks before using pointer

---
 src/controller_patcher                        |  2 +-
 .../hid_controller_function_patcher.cpp       | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/controller_patcher b/src/controller_patcher
index 41012b4..bb6964c 160000
--- a/src/controller_patcher
+++ b/src/controller_patcher
@@ -1 +1 @@
-Subproject commit 41012b4543bc798e47e15c8b5e1b7cd12fec1977
+Subproject commit bb6964cd6f474e6c04135310548f00cc2d3fe8c3
diff --git a/src/patcher/hid_controller_function_patcher.cpp b/src/patcher/hid_controller_function_patcher.cpp
index af9be90..08c3088 100644
--- a/src/patcher/hid_controller_function_patcher.cpp
+++ b/src/patcher/hid_controller_function_patcher.cpp
@@ -53,7 +53,6 @@ DECL(void, __PPCExit, void){
 DECL(s32, VPADRead, s32 chan, VPADData *buffer, u32 buffer_size, s32 *error) {
     s32 result = real_VPADRead(chan, buffer, buffer_size, error);
 
-
     if(gHIDAttached && buffer_size > 0){
         ControllerPatcher::setRumble(UController_Type_Gamepad,!!VPADBASEGetMotorOnRemainingCount(0));
 
@@ -63,11 +62,10 @@ DECL(s32, VPADRead, s32 chan, VPADData *buffer, u32 buffer_size, s32 *error) {
                 //You can open the home menu this way, but not close it. Need a proper way to close it using the same button...
                 //OSSendAppSwitchRequest(5,0,0); //Open the home menu!
             }
-
-            *error = 0;
-            result = 1; // We want the WiiU to ignore everything else.
-        }else{
-
+            if(error != NULL){
+                *error = 0;
+                result = 1; // We want the WiiU to ignore everything else.
+            }
         }
     }
 
@@ -88,8 +86,10 @@ DECL(s32,KPADReadEx, s32 chan, KPADData * buffer, u32 buffer_count, s32 *error )
             if(buffer[0].pro.btns_h & WPAD_PRO_BUTTON_HOME){ //Pro controller doesn't work in home menu so it's okay to let this enabled.
                 OSSendAppSwitchRequest(5,0,0); //Open the home menu!
             }
-            *error = 0; //No error
-            return 1; // We have saved one set of data. Should be enough because its no wireless communication.
+            if(error != NULL){
+                *error = 0;
+                 return 1; // We have saved one set of data. Should be enough because its no wireless communication.
+            }
         }else if(res != CONTROLLER_PATCHER_ERROR_MAPPING_DISABLED){
             //log_printf("KPADReadEx error: %d\n",res);
         }
@@ -103,8 +103,10 @@ DECL(s32, WPADProbe, s32 chan, u32 * result ){
     (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro2) && chan == 1) ||
     (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro3) && chan == 2) ||
     (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro4) && chan == 3)){
-        *result = WPAD_EXT_PRO_CONTROLLER;
-        return 0;
+        if(result != NULL){
+            *result = WPAD_EXT_PRO_CONTROLLER;
+            return 0;
+        }
     }
 
     return real_WPADProbe(chan,result);
@@ -165,7 +167,6 @@ DECL(void,WPADRead,s32 chan, WPADReadData *data ){
         (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro3) && chan == 2) ||
         (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro4) && chan == 3)){
             ControllerPatcher::setProControllerDataFromHID((void*)data,chan,PRO_CONTROLLER_MODE_WPADReadData);
-
     }else{
         real_WPADRead(chan,data);
     }