From b96609cb5161c4b493cd814e01bb14f7cc7d47b5 Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Sat, 27 Jun 2015 22:49:49 +0100
Subject: [PATCH] onepad: fix possible dereference of deleted pointer

onepad will dereference conf after it has been deleted if a PADinit,
PADshutdown, PADinit sequence takes place.
---
 plugins/onepad/onepad.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/onepad/onepad.cpp b/plugins/onepad/onepad.cpp
index db51321f21..6d036876ef 100644
--- a/plugins/onepad/onepad.cpp
+++ b/plugins/onepad/onepad.cpp
@@ -246,9 +246,11 @@ EXPORT_C_(s32) PADinit(u32 flags)
 
 EXPORT_C_(void) PADshutdown()
 {
-    CloseLogging();
-	if (conf) delete conf;
-	if (key_status) delete key_status;
+	CloseLogging();
+	delete conf;
+	conf = nullptr;
+	delete key_status;
+	key_status = nullptr;
 }
 
 EXPORT_C_(s32) PADopen(void *pDsp)