diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2020-02-05 01:49:08 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 01:49:08 -0300 |
| commit | ecaeb3b697bfcd46fe4ee7a519fdebb69c7318f9 (patch) | |
| tree | d631ffc455be41355b1f6f763958a4cfbcf4a5d5 /zebra/zebra_mlag.c | |
| parent | 8f6ebcbeb2455855a0e9dd2946d48e8db23f7192 (diff) | |
| parent | e1b36e132b7eda2d230f2f95945e231df37a42f5 (diff) | |
Merge pull request #5750 from qlyoung/fix-null-after-xfree
*: don't null after XFREE; XFREE does this itself
Diffstat (limited to 'zebra/zebra_mlag.c')
| -rw-r--r-- | zebra/zebra_mlag.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c index f6bd5f4586..fc7804a409 100644 --- a/zebra/zebra_mlag.c +++ b/zebra/zebra_mlag.c @@ -797,13 +797,11 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type) } for (i = 0; i < mlag_msg.msg_cnt; i++) { - if (pay_load[i]->vrf_name) - XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name); + XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name); if (pay_load[i]->owner_id == MLAG_OWNER_INTERFACE && pay_load[i]->intf_name) XFREE(MTYPE_MLAG_PBUF, pay_load[i]->intf_name); - if (pay_load[i]) - XFREE(MTYPE_MLAG_PBUF, pay_load[i]); + XFREE(MTYPE_MLAG_PBUF, pay_load[i]); } XFREE(MTYPE_MLAG_PBUF, pay_load); if (cleanup == true) @@ -861,13 +859,11 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type) } for (i = 0; i < mlag_msg.msg_cnt; i++) { - if (pay_load[i]->vrf_name) - XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name); + XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name); if (pay_load[i]->owner_id == MLAG_OWNER_INTERFACE && pay_load[i]->intf_name) XFREE(MTYPE_MLAG_PBUF, pay_load[i]->intf_name); - if (pay_load[i]) - XFREE(MTYPE_MLAG_PBUF, pay_load[i]); + XFREE(MTYPE_MLAG_PBUF, pay_load[i]); } XFREE(MTYPE_MLAG_PBUF, pay_load); if (cleanup) @@ -914,8 +910,7 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type) mlag_lib_msgid_to_str(mlag_msg.msg_type, buf, sizeof(buf)), len); - if (hdr.data.data) - XFREE(MTYPE_MLAG_PBUF, hdr.data.data); + XFREE(MTYPE_MLAG_PBUF, hdr.data.data); return len; } |