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

Merge pull request #1762 from Evengard/ppp-coverity-fixes

Browse Source 
Fixing up coverity report flags from #1760 and #1761
This commit is contained in:
Yihong Wu 2023-02-05 00:15:51 +09:00 committed by GitHub
commit d49b9f108b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Cedar/Proto_PPP.c
View File

@ -1269,7 +1269,7 @@ bool PPPProcessEAPResponsePacket(PPP_SESSION *p, PPP_PACKET *pp, PPP_PACKET *req
char hubname[MAX_SIZE]; char hubname[MAX_SIZE];
HUB *hub; HUB *hub;
bool found = false; bool found = false;
UINT authtype; UINT authtype = AUTHTYPE_ANONYMOUS;
UCHAR eapidentitypkt[MAX_SIZE] = { 0 }; UCHAR eapidentitypkt[MAX_SIZE] = { 0 };
WRITE_USHORT(ms_chap_v2_code, PPP_LCP_AUTH_CHAP); WRITE_USHORT(ms_chap_v2_code, PPP_LCP_AUTH_CHAP);
@ -1278,6 +1278,7 @@ bool PPPProcessEAPResponsePacket(PPP_SESSION *p, PPP_PACKET *pp, PPP_PACKET *req
switch (eap_packet->Type) switch (eap_packet->Type)
{ {
case PPP_EAP_TYPE_IDENTITY: case PPP_EAP_TYPE_IDENTITY:
p->Eap_MatchUserByCert = false;
// Parse username // Parse username
Copy(eapidentitypkt, eap_packet->Data, MIN(MAX_SIZE, eap_datasize)); Copy(eapidentitypkt, eap_packet->Data, MIN(MAX_SIZE, eap_datasize));
@ -3428,6 +3429,11 @@ bool PPPProcessEAPTlsResponse(PPP_SESSION *p, PPP_EAP *eap_packet, UINT eapSize)
UCHAR flags = PPP_EAP_TLS_FLAG_NONE; UCHAR flags = PPP_EAP_TLS_FLAG_NONE;
UINT sizeLeft = 0; UINT sizeLeft = 0;
Debug("Got EAP-TLS size=%i\n", eapSize); Debug("Got EAP-TLS size=%i\n", eapSize);
if (eapSize == 0)
{
// This is a broken packet without flags, ignore it
return false;
}
if (eapSize == 1 && eap_packet->Tls.Flags == PPP_EAP_TLS_FLAG_NONE) if (eapSize == 1 && eap_packet->Tls.Flags == PPP_EAP_TLS_FLAG_NONE)
{ {
// This is an EAP-TLS message ACK // This is an EAP-TLS message ACK
@ -3507,7 +3513,7 @@ bool PPPProcessEAPTlsResponse(PPP_SESSION *p, PPP_EAP *eap_packet, UINT eapSize)
} }
dataBuffer = eap_packet->Tls.TlsDataWithoutLength; dataBuffer = eap_packet->Tls.TlsDataWithoutLength;
dataSize = eapSize - 1; dataSize = eapSize - 1;
if (eap_packet->Tls.Flags & PPP_EAP_TLS_FLAG_TLS_LENGTH) if (eap_packet->Tls.Flags & PPP_EAP_TLS_FLAG_TLS_LENGTH && dataSize >= 4)
{ {
dataBuffer = eap_packet->Tls.TlsDataWithLength.Data; dataBuffer = eap_packet->Tls.TlsDataWithLength.Data;
dataSize -= 4; dataSize -= 4;