ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #625 from turtleli/onepad-fix 

linux: onepad: Prevent dereference of deleted pointer
This commit is contained in:
Gregory Hainaut 2015-06-29 23:47:44 +02:00
parent c659b1aa18 b96609cb51
commit e3adf823b3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/onepad/onepad.cpp
View File

@ -246,9 +246,11 @@ EXPORT_C_(s32) PADinit(u32 flags)
EXPORT_C_(void) PADshutdown() EXPORT_C_(void) PADshutdown()
{ {
CloseLogging(); CloseLogging();
if (conf) delete conf; delete conf;
if (key_status) delete key_status; conf = nullptr;
delete key_status;
key_status = nullptr;
} }
EXPORT_C_(s32) PADopen(void *pDsp) EXPORT_C_(s32) PADopen(void *pDsp)