ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use predefined constants for comparing out of range integer values

Browse Source
This commit is contained in:
Jeremy Lakeman 2018-05-28 11:06:35 +09:30
parent b1fdf380f9
commit 9522575417
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf_schema.c
View File

@ -260,7 +260,7 @@ int cf_opt_int32_nonneg(int32_t *intp, const char *text)
{
const char *end = text;
long value = strtol(text, (char**)&end, 10);
if (end == text || *end || value < 0 || value > 0x7fffffffL)
if (end == text || *end || value < 0 || value > INT32_MAX)
return CFINVALID;
*intp = value;
return CFOK;
@ -270,7 +270,7 @@ int cf_opt_int32_rs232baudrate(int32_t *intp, const char *text)
{
const char *end = text;
long value = strtol(text, (char**)&end, 10);
if (end == text || *end || value < 0 || value > 0x7fffffffL)
if (end == text || *end || value < 0 || value > INT32_MAX)
return CFINVALID;
switch(value) {
case 50: case 75: case 110: case 134: case 150: case 200: case 300:
@ -341,7 +341,7 @@ int cf_opt_uint32_nonzero(uint32_t *intp, const char *text)
{
const char *end = text;
unsigned long value = strtoul(text, (char**)&end, 10);
if (end == text || *end || value < 1 || value > 0xffffffffL)
if (end == text || *end || value < 1 || value > UINT32_MAX)
return CFINVALID;
*intp = value;
return CFOK;
@ -483,7 +483,7 @@ int cf_opt_ushort(unsigned short *ushortp, const char *text)
{
const char *end = text;
unsigned long value = strtoul(text, (char**)&end, 10);
if (end == text || *end || value > 0xffffL)
if (end == text || *end || value > UINT16_MAX)
return CFINVALID;
*ushortp = value;
return CFOK;