mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 17:18:56 +00:00
pbrd: address 230815 coverity: pbr_vty.c pend/strtoul
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
This commit is contained in:
parent
6182675e7e
commit
2e6c879e99
@ -441,18 +441,18 @@ DEFPY (pbr_map_match_dscp,
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned long ul_dscp;
|
unsigned long ul_dscp;
|
||||||
char *pend;
|
char *pend = NULL;
|
||||||
uint8_t raw_dscp;
|
uint8_t raw_dscp;
|
||||||
|
|
||||||
assert(dscp);
|
assert(dscp);
|
||||||
ul_dscp = strtol(dscp, &pend, 0);
|
ul_dscp = strtoul(dscp, &pend, 0);
|
||||||
if (*pend)
|
if (pend && *pend)
|
||||||
raw_dscp = pbr_map_decode_dscp_enum(dscp);
|
raw_dscp = pbr_map_decode_dscp_enum(dscp);
|
||||||
else
|
else
|
||||||
raw_dscp = ul_dscp << 2;
|
raw_dscp = ul_dscp << 2;
|
||||||
if (raw_dscp > PBR_DSFIELD_DSCP) {
|
if (raw_dscp > PBR_DSFIELD_DSCP) {
|
||||||
vty_out(vty, "Invalid dscp value: %s%s\n", dscp,
|
vty_out(vty, "Invalid dscp value: %s%s\n", dscp,
|
||||||
(pend ? "" : " (numeric value must be in range 0-63)"));
|
((pend && *pend) ? "" : " (numeric value must be in range 0-63)"));
|
||||||
return CMD_WARNING_CONFIG_FAILED;
|
return CMD_WARNING_CONFIG_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -859,19 +859,19 @@ DEFPY (pbr_map_action_dscp,
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned long ul_dscp;
|
unsigned long ul_dscp;
|
||||||
char *pend;
|
char *pend = NULL;
|
||||||
uint8_t raw_dscp;
|
uint8_t raw_dscp;
|
||||||
|
|
||||||
assert(dscp);
|
assert(dscp);
|
||||||
ul_dscp = strtol(dscp, &pend, 0);
|
ul_dscp = strtoul(dscp, &pend, 0);
|
||||||
if (*pend)
|
if (pend && *pend)
|
||||||
raw_dscp = pbr_map_decode_dscp_enum(dscp);
|
raw_dscp = pbr_map_decode_dscp_enum(dscp);
|
||||||
else
|
else
|
||||||
raw_dscp = ul_dscp << 2;
|
raw_dscp = ul_dscp << 2;
|
||||||
|
|
||||||
if (raw_dscp > PBR_DSFIELD_DSCP) {
|
if (raw_dscp > PBR_DSFIELD_DSCP) {
|
||||||
vty_out(vty, "Invalid dscp value: %s%s\n", dscp,
|
vty_out(vty, "Invalid dscp value: %s%s\n", dscp,
|
||||||
(pend ? "" : " (numeric value must be in range 0-63)"));
|
((pend && *pend) ? "" : " (numeric value must be in range 0-63)"));
|
||||||
return CMD_WARNING_CONFIG_FAILED;
|
return CMD_WARNING_CONFIG_FAILED;
|
||||||
}
|
}
|
||||||
if (CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DSCP) &&
|
if (CHECK_FLAG(pbrms->action_bm, PBR_ACTION_DSCP) &&
|
||||||
|
Loading…
Reference in New Issue
Block a user