AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

resolve several issues identified by cppcheck (#465)

Browse Source 
[src/Cedar/Admin.c:13452] -> [src/Cedar/Admin.c:13492]: (warning) Either the condition 'cedar!=NULL' is redundant or there is possible null pointer dereference: cedar.
[src/Cedar/SM.c:18455] -> [src/Cedar/SM.c:18379]: (warning) Either the condition 'p!=NULL' is redundant or there is possible null pointer dereference: p.
[src/Cedar/SM.c:18455] -> [src/Cedar/SM.c:18491]: (warning) Either the condition 'p!=NULL' is redundant or there is possible null pointer dereference: p.
[src/Cedar/SM.c:18455] -> [src/Cedar/SM.c:18506]: (warning) Either the condition 'p!=NULL' is redundant or there is possible null pointer dereference: p.
[src/Cedar/Protocol.c:5190] -> [src/Cedar/Protocol.c:5115]: (warning) Either the condition 's!=NULL' is redundant or there is possible null pointer dereference: s.
[src/Cedar/Protocol.c:5190] -> [src/Cedar/Protocol.c:5145]: (warning) Either the condition 's!=NULL' is redundant or there is possible null pointer dereference: s.
[src/Cedar/Hub.c:5517] -> [src/Cedar/Hub.c:5553]: (warning) Either the condition 'dest!=NULL' is redundant or there is possible null pointer dereference: dest.
[src/Cedar/Hub.c:5517] -> [src/Cedar/Hub.c:5556]: (warning) Either the condition 'dest!=NULL' is redundant or there is possible null pointer dereference: dest.
This commit is contained in:
Ilya Shipitsin 2018-04-11 03:08:31 +05:00 committed by Moataz Elmasry
parent a238b7450d
commit 596493e1a1
4 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/Admin.c
View File

@ -13489,7 +13489,7 @@ UINT AdminAccept(CONNECTION *c, PACK *p)
else else
{ {
// Hub admin mode // Hub admin mode
if (cedar->Server != NULL && cedar->Server->ServerType == SERVER_TYPE_FARM_MEMBER) if (server != NULL && server->ServerType == SERVER_TYPE_FARM_MEMBER)
{ {
// Connection with hub admin mode to cluster member is not permitted // Connection with hub admin mode to cluster member is not permitted
return ERR_NOT_ENOUGH_RIGHT; return ERR_NOT_ENOUGH_RIGHT;

2
src/Cedar/Hub.c
View File

@ -5514,7 +5514,7 @@ void StorePacketToHubPa(HUB_PA *dest, SESSION *src, void *data, UINT size, PKT *
} }
} }
if (dest != NULL && src != NULL && dest->Session != NULL && src->Hub != NULL && src->Hub->Option != NULL) if (src != NULL && dest->Session != NULL && src->Hub != NULL && src->Hub->Option != NULL)
{ {
if (dest->Session->AdjustMss != 0 || if (dest->Session->AdjustMss != 0 ||
(dest->Session->IsUsingUdpAcceleration && dest->Session->UdpAccelMss != 0) || (dest->Session->IsUsingUdpAcceleration && dest->Session->UdpAccelMss != 0) ||

2
src/Cedar/Protocol.c
View File

@ -5234,7 +5234,7 @@ REDIRECTED:
sess->EnableBulkOnRUDP = false; sess->EnableBulkOnRUDP = false;
sess->EnableHMacOnBulkOfRUDP = false; sess->EnableHMacOnBulkOfRUDP = false;
if (s != NULL && s->IsRUDPSocket && s->BulkRecvKey != NULL && s->BulkSendKey != NULL) if (s->IsRUDPSocket && s->BulkRecvKey != NULL && s->BulkSendKey != NULL)
{ {
// Bulk transfer on R-UDP // Bulk transfer on R-UDP
if (PackGetBool(p, "enable_bulk_on_rudp")) if (PackGetBool(p, "enable_bulk_on_rudp"))

51
src/Cedar/SM.c
View File

@ -18452,38 +18452,35 @@ void SmServerDlgRefresh(HWND hWnd, SM_SERVER *p)
} }
// Listener list update // Listener list update
if (p != NULL) RPC_LISTENER_LIST t;
Zero(&t, sizeof(RPC_LISTENER_LIST));
if (CALL(hWnd, ScEnumListener(p->Rpc, &t)))
{ {
RPC_LISTENER_LIST t; LVB *b = LvInsertStart();
Zero(&t, sizeof(RPC_LISTENER_LIST)); for (i = 0;i < t.NumPort;i++)
if (CALL(hWnd, ScEnumListener(p->Rpc, &t)))
{ {
LVB *b = LvInsertStart(); wchar_t tmp[MAX_SIZE];
for (i = 0;i < t.NumPort;i++) wchar_t *status;
UINT icon;
UniFormat(tmp, sizeof(tmp), _UU("CM_LISTENER_TCP_PORT"), t.Ports[i]);
status = _UU("CM_LISTENER_ONLINE");
icon = ICO_PROTOCOL;
if (t.Errors[i])
{ {
wchar_t tmp[MAX_SIZE]; status = _UU("CM_LISTENER_ERROR");
wchar_t *status; icon = ICO_PROTOCOL_X;
UINT icon;
UniFormat(tmp, sizeof(tmp), _UU("CM_LISTENER_TCP_PORT"), t.Ports[i]);
status = _UU("CM_LISTENER_ONLINE");
icon = ICO_PROTOCOL;
if (t.Errors[i])
{
status = _UU("CM_LISTENER_ERROR");
icon = ICO_PROTOCOL_X;
}
else if (t.Enables[i] == false)
{
status = _UU("CM_LISTENER_OFFLINE");
icon = ICO_PROTOCOL_OFFLINE;
}
LvInsertAdd(b, icon, (void *)t.Ports[i], 2, tmp, status);
} }
LvInsertEnd(b, hWnd, L_LISTENER); else if (t.Enables[i] == false)
FreeRpcListenerList(&t); {
status = _UU("CM_LISTENER_OFFLINE");
icon = ICO_PROTOCOL_OFFLINE;
}
LvInsertAdd(b, icon, (void *)t.Ports[i], 2, tmp, status);
} }
LvInsertEnd(b, hWnd, L_LISTENER);
FreeRpcListenerList(&t);
} }
// Get the DDNS client state // Get the DDNS client state