github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup! Check return value of SetProp 

Remove CHECK_NULL_PARAM and other over-zealous checks on the
return value of GetProp.

In pkcs11.c if SetProp() fails just do not use bold font for
header instead of leaking the font resource.
Also correct a bad fixup in commit 80697ecae6: hfontProp was not set!

(to be squashed with previous commit)

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/591/head
Selva Nair 2023-01-23 13:53:28 -05:00
parent a5c072d332
commit 3627dc6168
5 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
as.c
View File

@ -252,7 +252,6 @@ CRDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
param = (auth_param_t*)GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(param);
switch (LOWORD(wParam)) {
case ID_EDT_RESPONSE:
@ -630,8 +629,6 @@ ImportProfileFromURLDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
case WM_COMMAND:
type = (server_type_t) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(type);
switch (LOWORD(wParam))
{
case ID_EDT_AUTH_USER:
@ -702,6 +699,7 @@ ImportProfileFromURLDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
return TRUE;
case WM_NCDESTROY:
RemoveProp(hwndDlg, cfgProp);
break;
}

13
openvpn.c
View File

@ -586,7 +586,6 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
param = (auth_param_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(param);
switch (LOWORD(wParam))
{
case ID_EDT_AUTH_USER:
@ -673,7 +672,6 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE:
EndDialog(hwndDlg, LOWORD(wParam));
param = (auth_param_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(param);
StopOpenVPN(param->c);
return TRUE;
@ -772,7 +770,6 @@ GenericPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
param = (auth_param_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(param);
const char *template;
char *fmt;
switch (LOWORD(wParam))
@ -862,7 +859,6 @@ GenericPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
* other than GET_CONFIG. The state is in lParam.
*/
param = (auth_param_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(param);
if ((param->flags & FLAG_CR_TYPE_CRTEXT)
&& strcmp((const char *) lParam, "GET_CONFIG"))
{
@ -926,7 +922,6 @@ PrivKeyPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
switch (LOWORD(wParam))
{
case ID_CHK_SAVE_PASS:
@ -2041,7 +2036,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
switch (LOWORD(wParam))
{
case ID_DISCONNECT:
@ -2077,7 +2071,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
if (c->state != disconnected && c->state != detached)
ShowWindow(hwndDlg, SW_HIDE);
else
@ -2094,7 +2087,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_OVPN_RELEASE:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
c->state = reconnecting;
SetDlgItemText(c->hwndStatus, ID_TXT_STATUS, LoadLocalizedString(IDS_NFO_STATE_RECONNECTING));
SetDlgItemTextW(c->hwndStatus, ID_TXT_IP, L"");
@ -2104,7 +2096,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_OVPN_STOP:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
/* external messages can trigger when we are not ready -- check the state */
if (!IsWindowEnabled(GetDlgItem(c->hwndStatus, ID_DISCONNECT))
|| c->state == onhold)
@ -2125,7 +2116,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_OVPN_DETACH:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
/* just stop the thread keeping openvpn.exe running */
c->state = detaching;
EnableWindow(GetDlgItem(c->hwndStatus, ID_DISCONNECT), FALSE);
@ -2135,7 +2125,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_OVPN_SUSPEND:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
c->state = suspending;
EnableWindow(GetDlgItem(c->hwndStatus, ID_DISCONNECT), FALSE);
EnableWindow(GetDlgItem(c->hwndStatus, ID_RESTART), FALSE);
@ -2148,7 +2137,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_TIMER:
PrintDebug(L"WM_TIMER message with wParam = %lu", wParam);
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
if (wParam == IDT_STOP_TIMER)
{
/* openvpn failed to respond to stop signal -- terminate */
@ -2160,7 +2148,6 @@ StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_OVPN_RESTART:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
/* external messages can trigger when we are not ready -- check the state */
if (IsWindowEnabled(GetDlgItem(c->hwndStatus, ID_RESTART)))
{

7
openvpn.h
View File

@ -25,13 +25,6 @@
#include "options.h"
#define CHECK_NULL_PARAM(p) \
do { if (p) break; \
MsgToEventLog(EVENTLOG_ERROR_TYPE, L"%hs:%d GetProp returned null", \
__func__, __LINE__); \
return false; \
} while(0)
#define TRY_SETPROP(hwnd, name, p) \
do { if (SetPropW(hwnd, name, p)) break; \
MsgToEventLog(EVENTLOG_ERROR_TYPE, L"%hs:%d GetProp returned null", \

29
pkcs11.c
View File

@ -37,7 +37,7 @@
#include <shlwapi.h>
extern options_t o;
static const wchar_t *hfontProp;
static const wchar_t *hfontProp = L"header_font";
/* state of list array */
#define STATE_GET_COUNT 1
@ -414,10 +414,13 @@ pkcs11_listview_init(HWND parent)
lf.lfWeight = FW_BOLD;
HFONT hfb = CreateFontIndirect(&lf);
if (hfb)
if (hfb && SetPropW(parent, hfontProp, (HANDLE)hfb))
{
SendMessage(ListView_GetHeader(lv), WM_SETFONT, (WPARAM)hfb, 1);
SetPropW(parent, hfontProp, (HANDLE)hfb); /* failure here is not critical */
}
else if (hfb)
{
DeleteObject(hfb);
}
}
@ -452,13 +455,6 @@ static void CALLBACK
pkcs11_listview_fill(HWND hwnd, UINT UNUSED msg, UINT_PTR id, DWORD UNUSED now)
{
connection_t *c = (connection_t *) GetProp(hwnd, cfgProp);
if (!c)
{
KillTimer(hwnd, id);
return;
}
struct pkcs11_list *l = &c->pkcs11_list;
HWND lv = GetDlgItem(hwnd, ID_LVW_PKCS11);
@ -522,12 +518,6 @@ static void
pkcs11_listview_reset(HWND parent)
{
connection_t *c = (connection_t *) GetProp(parent, cfgProp);
if (!c)
{
return;
}
struct pkcs11_list *l = &c->pkcs11_list;
HWND lv = GetDlgItem(parent, ID_LVW_PKCS11);
@ -599,7 +589,6 @@ QueryPkcs11DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
if (LOWORD(wParam) == IDOK)
{
HWND lv = GetDlgItem(hwndDlg, ID_LVW_PKCS11);
@ -649,7 +638,6 @@ QueryPkcs11DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_NOTIFY:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
if (((NMHDR *)lParam)->idFrom == ID_LVW_PKCS11)
{
NMITEMACTIVATE *ln = (NMITEMACTIVATE *) lParam;
@ -667,10 +655,7 @@ QueryPkcs11DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
if (c)
{
StopOpenVPN(c);
}
StopOpenVPN(c);
EndDialog(hwndDlg, wParam);
return TRUE;

1
proxy.c
View File

@ -361,7 +361,6 @@ ProxyAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case IDOK:
c = (connection_t *) GetProp(hwndDlg, cfgProp);
CHECK_NULL_PARAM(c);
proxy_type = (c->proxy_type == http ? "HTTP" : "SOCKS");
snprintf(fmt, sizeof(fmt), "username \"%s Proxy\" \"%%s\"", proxy_type);