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

Merge pull request #52 from Bigpet/master 

Dev9 plugin - prevent null dereference if no device is set
This commit is contained in:
ramapcsx2 2014-05-25 16:49:49 +02:00
parent 8775e51ebd ad9ec44228
commit 71ebb2493e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/dev9ghzdrk/Win32/Win32.cpp
View File

@ -171,8 +171,13 @@ s32 _DEV9open()
//ResumeThread (handleDEV9Thread); //ResumeThread (handleDEV9Thread);
NetAdapter* na=GetNetAdapter(); NetAdapter* na=GetNetAdapter();
if (!na) if (!na)
{
emu_printf("Failed to GetNetAdapter()\n"); emu_printf("Failed to GetNetAdapter()\n");
InitNet( na); }
else
{
InitNet(na);
}
return 0; return 0;
} }

13
plugins/dev9ghzdrk/Win32/net.cpp
View File

@ -57,10 +57,13 @@ void InitNet(NetAdapter* ad)
} }
void TermNet() void TermNet()
{ {
RxRunning=false; if(RxRunning)
emu_printf("Waiting for RX-net thread to terminate.."); {
WaitForSingleObject(rx_thread,-1); RxRunning = false;
emu_printf(".done\n"); emu_printf("Waiting for RX-net thread to terminate..");
WaitForSingleObject(rx_thread, -1);
emu_printf(".done\n");
delete nif; delete nif;
}
} }