mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-28 12:10:24 +00:00
Merge pull request #11414 from donaldsharp/memory_cannot_fail
Memory cannot fail
This commit is contained in:
commit
952071e44a
@ -145,8 +145,7 @@ struct stream *stream_dup(const struct stream *s)
|
||||
|
||||
STREAM_VERIFY_SANE(s);
|
||||
|
||||
if ((snew = stream_new(s->endp)) == NULL)
|
||||
return NULL;
|
||||
snew = stream_new(s->endp);
|
||||
|
||||
return (stream_copy(snew, s));
|
||||
}
|
||||
|
@ -1294,10 +1294,6 @@ static void zebra_ptm_send_bfdd(struct stream *msg)
|
||||
|
||||
/* Create copy for replication. */
|
||||
msgc = stream_dup(msg);
|
||||
if (msgc == NULL) {
|
||||
zlog_debug("%s: not enough memory", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Send message to all running BFDd daemons. */
|
||||
for (ALL_LIST_ELEMENTS_RO(zrouter.client_list, node, client)) {
|
||||
@ -1308,10 +1304,6 @@ static void zebra_ptm_send_bfdd(struct stream *msg)
|
||||
|
||||
/* Allocate more messages. */
|
||||
msg = stream_dup(msgc);
|
||||
if (msg == NULL) {
|
||||
zlog_debug("%s: not enough memory", __func__);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
stream_free(msgc);
|
||||
@ -1326,10 +1318,6 @@ static void zebra_ptm_send_clients(struct stream *msg)
|
||||
|
||||
/* Create copy for replication. */
|
||||
msgc = stream_dup(msg);
|
||||
if (msgc == NULL) {
|
||||
zlog_debug("%s: not enough memory", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Send message to all running client daemons. */
|
||||
for (ALL_LIST_ELEMENTS_RO(zrouter.client_list, node, client)) {
|
||||
@ -1340,10 +1328,6 @@ static void zebra_ptm_send_clients(struct stream *msg)
|
||||
|
||||
/* Allocate more messages. */
|
||||
msg = stream_dup(msgc);
|
||||
if (msg == NULL) {
|
||||
zlog_debug("%s: not enough memory", __func__);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
stream_free(msgc);
|
||||
|
Loading…
Reference in New Issue
Block a user