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

Merge PR #715: src/Cedar: resolve possible null pointer dereference and silence dead code warning

Browse Source
This commit is contained in:
Davide Beatrici 2018-09-24 20:35:47 +02:00 committed by GitHub
commit 33f5de78ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/Client.c
View File

@ -1869,6 +1869,7 @@ BEGIN_LISTENER:
// If the port cannot be opened // If the port cannot be opened
if (cn_next_allow <= Tick64()) if (cn_next_allow <= Tick64())
{ {
#ifdef OS_WIN32
if (cursor_changed) if (cursor_changed)
{ {
// It can be judged to have the rights to open the port // It can be judged to have the rights to open the port
@ -1876,6 +1877,7 @@ BEGIN_LISTENER:
// So, take over the port which is owned by other process forcibly // So, take over the port which is owned by other process forcibly
CncReleaseSocket(); CncReleaseSocket();
} }
#endif // OS_WIN32
if (cn_listener->Halt) if (cn_listener->Halt)
{ {

2
src/Cedar/Hub.c
View File

@ -3782,7 +3782,7 @@ LABEL_TRY_AGAIN:
if (no_parse_dhcp == false && packet != NULL) if (no_parse_dhcp == false && packet != NULL)
{ {
if (hub->Option != NULL && hub->Option->RemoveDefGwOnDhcpForLocalhost) if (hub != NULL && hub->Option != NULL && hub->Option->RemoveDefGwOnDhcpForLocalhost)
{ {
// Remove the designation of the DHCP server from the DHCP response packet addressed to localhost // Remove the designation of the DHCP server from the DHCP response packet addressed to localhost
if (packet->TypeL7 == L7_DHCPV4) if (packet->TypeL7 == L7_DHCPV4)