diff options
| author | Mark Stapp <mjs.ietf@gmail.com> | 2025-03-21 11:30:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-21 11:30:16 -0400 |
| commit | 556d3c445d63ffc62e35f2d7b2b41ef5df9906d7 (patch) | |
| tree | 4f1e21d2825e917df68430f0ce8f8f85dae252c9 /zebra | |
| parent | 797e0512224f039de54a7d64f73947ff26be9527 (diff) | |
| parent | 860c1e445043c6e380a9fb08cc0c21c6339625ad (diff) | |
Merge pull request #18359 from soumyar-roy/soumya/streamsize
zebra: zebra crash for zapi stream
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zapi_msg.c | 4 | ||||
| -rw-r--r-- | zebra/zebra_rnh.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 064b377f28..d4e65eb18c 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -516,7 +516,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client, const struct route_n const struct prefix *p, *src_p; uint16_t count = 0; afi_t afi; - size_t stream_size = 0; srcdest_rnode_prefixes(rn, &p, &src_p); memset(&api, 0, sizeof(api)); @@ -608,8 +607,7 @@ int zsend_redistribute_route(int cmd, struct zserv *client, const struct route_n SET_FLAG(api.message, ZAPI_MESSAGE_MTU); api.mtu = re->mtu; - stream_size = zapi_redistribute_stream_size(&api); - struct stream *s = stream_new(stream_size); + struct stream *s = stream_new_expandable(ZEBRA_MAX_PACKET_SIZ); /* Encode route and send. */ if (zapi_route_encode(cmd, s, &api) < 0) { diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 640e6551a7..6b6be59c47 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -1150,7 +1150,7 @@ int zebra_send_rnh_update(struct rnh *rnh, struct zserv *client, re = rnh->state; /* Get output stream. */ - s = stream_new(ZEBRA_MAX_PACKET_SIZ); + s = stream_new_expandable(ZEBRA_MAX_PACKET_SIZ); zclient_create_header(s, ZEBRA_NEXTHOP_UPDATE, vrf_id); |