matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #14342 from fdumontet6WIND/fix_crash_snmp

Browse source 
bgpd: fix crash in *bgpv2PeerErrorsTable"
This commit is contained in:
Donald Sharp 2023-09-27 15:25:38 -04:00 committed by GitHub
parent bb308b1efc b8f3f0b86f
commit 60c38a99ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bgpd/bgp_debug.c
View file

@ -500,12 +500,13 @@ const char *bgp_notify_subcode_str(char code, char subcode)
const char *bgp_notify_admin_message(char *buf, size_t bufsz, uint8_t *data, const char *bgp_notify_admin_message(char *buf, size_t bufsz, uint8_t *data,
size_t datalen) size_t datalen)
{ {
memset(buf, 0, bufsz);
if (!data || datalen < 1) if (!data || datalen < 1)
return NULL; return buf;
uint8_t len = data[0]; uint8_t len = data[0];
if (!len || len > datalen - 1) if (!len || len > datalen - 1)
return NULL; return buf;
return zlog_sanitize(buf, bufsz, data + 1, len); return zlog_sanitize(buf, bufsz, data + 1, len);
} }

4
bgpd/bgp_vty.c
View file

@ -11310,9 +11310,7 @@ static void bgp_show_peer_reset(struct vty * vty, struct peer *peer,
msgbuf, sizeof(msgbuf), msgbuf, sizeof(msgbuf),
(uint8_t *)peer->notify.data, (uint8_t *)peer->notify.data,
peer->notify.length); peer->notify.length);
if (msg_str) json_object_string_add(json_peer,
json_object_string_add(
json_peer,
"lastShutdownDescription", "lastShutdownDescription",
msg_str); msg_str);
} }