diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-01-06 16:00:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 16:00:35 -0500 |
| commit | 5c3be0814fb190b007ff31efa85cca5e66e2daab (patch) | |
| tree | a1ccfecc075d149d34c12ea97d0aadb8da7a1343 /lib/zclient.c | |
| parent | 193c7b4caf168980b10439fde9695ec271b78a02 (diff) | |
| parent | b900b3c6a4018415a385d76207489347cd629062 (diff) | |
Merge pull request #5621 from qlyoung/fix-zclient-excess-nexthop-decode
lib: dont decode more nexthops than we can handle
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index 6982d287a2..fd1b181e58 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2679,6 +2679,17 @@ int zapi_labels_decode(struct stream *s, struct zapi_labels *zl) } STREAM_GETW(s, zl->nexthop_num); + + if (zl->nexthop_num > MULTIPATH_NUM) { + flog_warn( + EC_LIB_ZAPI_ENCODE, + "%s: Prefix %pFX has %d nexthops, but we can only use the first %d", + __func__, &zl->route.prefix, zl->nexthop_num, + MULTIPATH_NUM); + } + + zl->nexthop_num = MIN(MULTIPATH_NUM, zl->nexthop_num); + for (int i = 0; i < zl->nexthop_num; i++) { znh = &zl->nexthops[i]; |