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

Merge PR #698: Clean up Solaris device name parsing code to eliminate Coverity errors

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

20
src/Cedar/BridgeUnix.c
View File

@ -1126,7 +1126,7 @@ bool DlipReceiveAck(int fd)
#endif // UNIX_SOLARIS #endif // UNIX_SOLARIS
// Separate UNIX device name string into device name and id number // Validate device name and return proper device path according to system type
bool ParseUnixEthDeviceName(char *dst_devname, UINT dst_devname_size, char *src_name) bool ParseUnixEthDeviceName(char *dst_devname, UINT dst_devname_size, char *src_name)
{ {
UINT len, i; UINT len, i;
@ -1141,9 +1141,8 @@ bool ParseUnixEthDeviceName(char *dst_devname, UINT dst_devname_size, char *src_
return false; return false;
} }
len = strlen(src_name);
// Check string length // Check string length
if(len == 0) if (IsEmptyStr(src_name))
{ {
return false; return false;
} }
@ -1159,27 +1158,22 @@ bool ParseUnixEthDeviceName(char *dst_devname, UINT dst_devname_size, char *src_
device_path = "/dev/"; device_path = "/dev/";
} }
device_pathlen = strlen(device_path); device_pathlen = StrLen(device_path);
for (i = len-1; i+1 != 0; i--) // Last character must be a number
{
// Find last non-numeric character
if (src_name[i] < '0' || '9' < src_name[i]) if (src_name[i] < '0' || '9' < src_name[i])
{ {
// last character must be a number if (src_name[i + 1] == 0)
if(src_name[i+1]==0)
{ {
return false; return false;
} }
} }
StrCpy(dst_devname, dst_devname_size, device_path); StrCpy(dst_devname, dst_devname_size, device_path);
StrCpy(dst_devname + device_pathlen, dst_devname_size-device_pathlen, src_name); StrCpy(dst_devname + device_pathlen, dst_devname_size - device_pathlen, src_name);
dst_devname[device_pathlen + len] = 0; dst_devname[device_pathlen + len] = 0;
return true; return true;
}
// All characters in the string was numeric: error
return false;
} }
#if defined(BRIDGE_BPF) || defined(BRIDGE_PCAP) #if defined(BRIDGE_BPF) || defined(BRIDGE_PCAP)