1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 19:39:53 +03:00

cppcheck issues:

[src/Cedar/WebUI.c:1728] -> [src/Cedar/WebUI.c:1730]: (warning) Either the condition 'buf==0' is redundant or there is possible null pointer dereference: buf.
[src/Mayaqua/FileIO.c:383] -> [src/Mayaqua/FileIO.c:386]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.
[src/Mayaqua/TcpIp.c:1837] -> [src/Mayaqua/TcpIp.c:1839]: (warning) Either the condition 'tcp!=0' is redundant or there is possible null pointer dereference: tcp.
This commit is contained in:
Ilya Shipitsin 2016-04-29 23:59:35 +05:00
parent 2f52dac9c4
commit 84f95447a3
3 changed files with 4 additions and 4 deletions

View File

@ -1725,12 +1725,12 @@ static wchar_t *WuUniReadFile(char *filename)
static void WuUniReplace(wchar_t **buf, wchar_t *from, wchar_t *to) static void WuUniReplace(wchar_t **buf, wchar_t *from, wchar_t *to)
{ {
UINT dstsize; UINT dstsize;
wchar_t *oldbuf = *buf;
if(buf == NULL || from == NULL || to == NULL) if(buf == NULL || from == NULL || to == NULL)
{ {
return; return;
} }
wchar_t *oldbuf = *buf;
dstsize = (UniCalcReplaceStrEx(*buf, from, to, true) + 1) * sizeof(wchar_t); dstsize = (UniCalcReplaceStrEx(*buf, from, to, true) + 1) * sizeof(wchar_t);
*buf = (wchar_t*)Malloc(dstsize); *buf = (wchar_t*)Malloc(dstsize);

View File

@ -380,13 +380,13 @@ void ZipAddFileStart(ZIP_PACKER *p, char *name, UINT size, UINT64 dt, UINT attri
// Add data to the file // Add data to the file
UINT ZipAddFileData(ZIP_PACKER *p, void *data, UINT pos, UINT len) UINT ZipAddFileData(ZIP_PACKER *p, void *data, UINT pos, UINT len)
{ {
UINT total_size = p->CurrentFile->CurrentSize + len;
UINT ret; UINT ret;
// Validate arguments // Validate arguments
if (p == NULL) if (p == NULL)
{ {
return 0; return 0;
} }
UINT total_size = p->CurrentFile->CurrentSize + len;
if (total_size > p->CurrentFile->Size) if (total_size > p->CurrentFile->Size)
{ {
return 0; return 0;

View File

@ -1834,9 +1834,9 @@ PKT *ParsePacketEx4(UCHAR *buf, UINT size, bool no_l3, UINT vlan_type_id, bool b
if ((p->TypeL3 == L3_IPV4 || p->TypeL3 == L3_IPV6) && p->TypeL4 == L4_TCP) if ((p->TypeL3 == L3_IPV4 || p->TypeL3 == L3_IPV6) && p->TypeL4 == L4_TCP)
{ {
TCP_HEADER *tcp = p->L4.TCPHeader; TCP_HEADER *tcp = p->L4.TCPHeader;
if (tcp->DstPort == port_raw || tcp->DstPort == port_raw2) if (tcp != NULL && (!((tcp->Flag & TCP_SYN) || (tcp->Flag & TCP_RST) || (tcp->Flag & TCP_FIN))))
{ {
if (tcp != NULL && (!((tcp->Flag & TCP_SYN) || (tcp->Flag & TCP_RST) || (tcp->Flag & TCP_FIN)))) if (tcp->DstPort == port_raw || tcp->DstPort == port_raw2)
{ {
if (p->PayloadSize >= 1) if (p->PayloadSize >= 1)
{ {