proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 17:13:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13646 from donaldsharp/logically_illogical

Browse Source 
mgmtd: xpath is already NULL in the failure path
This commit is contained in:
Donatas Abraitis 2023-06-02 09:19:04 +03:00 committed by GitHub
commit 0f1a66f2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mgmtd/mgmt_txn.c
View File

@ -1022,7 +1022,7 @@ static int mgmt_txn_create_config_batches(struct mgmt_txn_req *txn_req,
(void)mgmt_txn_send_commit_cfg_reply( (void)mgmt_txn_send_commit_cfg_reply(
txn_req->txn, MGMTD_INTERNAL_ERROR, txn_req->txn, MGMTD_INTERNAL_ERROR,
"Internal error! Could not get Xpath from Ds node!"); "Internal error! Could not get Xpath from Ds node!");
goto mgmt_txn_create_config_batches_failed; return -1;
} }
value = (char *)lyd_get_value(chg->cb.dnode); value = (char *)lyd_get_value(chg->cb.dnode);
@ -1130,18 +1130,11 @@ static int mgmt_txn_create_config_batches(struct mgmt_txn_req *txn_req,
(void)mgmt_txn_send_commit_cfg_reply( (void)mgmt_txn_send_commit_cfg_reply(
txn_req->txn, MGMTD_NO_CFG_CHANGES, txn_req->txn, MGMTD_NO_CFG_CHANGES,
"No changes found to commit!"); "No changes found to commit!");
goto mgmt_txn_create_config_batches_failed; return -1;
} }
cmtcfg_req->next_phase = MGMTD_COMMIT_PHASE_TXN_CREATE; cmtcfg_req->next_phase = MGMTD_COMMIT_PHASE_TXN_CREATE;
return 0; return 0;
mgmt_txn_create_config_batches_failed:
if (xpath)
free(xpath);
return -1;
} }
static int mgmt_txn_prepare_config(struct mgmt_txn_ctx *txn) static int mgmt_txn_prepare_config(struct mgmt_txn_ctx *txn)