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

Merge pull request #14453 from pguibert6WIND/isis_startup_crash

Browse source 
isisd: fix crash when configuring srv6 locator without isis instance
This commit is contained in:
Donald Sharp 2023-09-21 06:33:16 -04:00 committed by GitHub
parent cd3bd19314 f4ac971fcc
commit 4d64badc5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
isisd/isis_zebra.c
View file

@ -1225,6 +1225,9 @@ static int isis_zebra_process_srv6_locator_add(ZAPI_CALLBACK_ARGS)
struct listnode *node; struct listnode *node;
struct isis_area *area; struct isis_area *area;
if (!isis)
return -1;
/* Decode the SRv6 locator */ /* Decode the SRv6 locator */
if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0) if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0)
return -1; return -1;
@ -1274,6 +1277,9 @@ static int isis_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
struct isis_srv6_sid *sid; struct isis_srv6_sid *sid;
struct srv6_adjacency *sra; struct srv6_adjacency *sra;
if (!isis)
return -1;
/* Decode the received zebra message */ /* Decode the received zebra message */
if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0) if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0)
return -1; return -1;