From 820323bc1ee188e4f33bcaae437c1a3c56a53924 Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Sun, 12 Jul 2015 18:37:38 +0100 Subject: [PATCH 1/2] dev9ghz: Check if user has selected an adapter Avoid copying from an invalid pointer --- plugins/dev9ghzdrk/Win32/Win32.cpp | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/plugins/dev9ghzdrk/Win32/Win32.cpp b/plugins/dev9ghzdrk/Win32/Win32.cpp index ff77cf47ae..504368e86a 100644 --- a/plugins/dev9ghzdrk/Win32/Win32.cpp +++ b/plugins/dev9ghzdrk/Win32/Win32.cpp @@ -37,7 +37,7 @@ void SysMessage(char *fmt, ...) { va_start(list,fmt); vsprintf(tmp,fmt,list); va_end(list); - MessageBox(0, tmp, "Dev9linuz Msg", 0); + MessageBox(0, tmp, "Dev9 Msg", 0); } void OnInitDialog(HWND hW) { @@ -77,8 +77,30 @@ void OnInitDialog(HWND hW) { void OnOk(HWND hW) { int i = ComboBox_GetCurSel(GetDlgItem(hW, IDC_ETHDEV)); - char* ptr=(char*)ComboBox_GetItemData(GetDlgItem(hW, IDC_ETHDEV),i); - strcpy(config.Eth, ptr); + if (i == -1) + { + //adapter not selected + if (Button_GetCheck(GetDlgItem(hW, IDC_ETHENABLED))) + { + //Trying to use an ethernet without + //selected adapter, we can't have that + SysMessage("Please Select an ethernet adapter"); + return; + } + else + { + //user not planning on using + //ethernet anyway + strcpy(config.Eth, ETH_DEF); + } + } + else + { + //adapter is selected + char* ptr = (char*)ComboBox_GetItemData(GetDlgItem(hW, IDC_ETHDEV), i); + strcpy(config.Eth, ptr); + } + Edit_GetText(GetDlgItem(hW, IDC_HDDFILE), config.Hdd, 256); config.ethEnable = Button_GetCheck(GetDlgItem(hW, IDC_ETHENABLED)); From ebafb24099b5e0cc0383fa0971ef8fc1b1da068b Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Sun, 12 Jul 2015 18:38:23 +0100 Subject: [PATCH 2/2] dev9ghz: proper casing --- plugins/dev9ghzdrk/Win32/Win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dev9ghzdrk/Win32/Win32.cpp b/plugins/dev9ghzdrk/Win32/Win32.cpp index 504368e86a..17927eda94 100644 --- a/plugins/dev9ghzdrk/Win32/Win32.cpp +++ b/plugins/dev9ghzdrk/Win32/Win32.cpp @@ -84,7 +84,7 @@ void OnOk(HWND hW) { { //Trying to use an ethernet without //selected adapter, we can't have that - SysMessage("Please Select an ethernet adapter"); + SysMessage("Please select an ethernet adapter"); return; } else