Change in libosmocore[master]: rate_ctr_group_free(): guard against empty or NULL input

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Mar 19 12:57:10 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13303 )

Change subject: rate_ctr_group_free(): guard against empty or NULL input
......................................................................

rate_ctr_group_free(): guard against empty or NULL input

Change-Id: I859a91ee4400b3685c05971f8c66bceca6758724
---
M src/rate_ctr.c
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 75302da..c9319a6 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -255,7 +255,11 @@
 /*! Free the memory for the specified group of counters */
 void rate_ctr_group_free(struct rate_ctr_group *grp)
 {
-	llist_del(&grp->list);
+	if (!grp)
+		return;
+
+	if (!llist_empty(&grp->list))
+		llist_del(&grp->list);
 	talloc_free(grp);
 }
 

-- 
To view, visit https://gerrit.osmocom.org/13303
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I859a91ee4400b3685c05971f8c66bceca6758724
Gerrit-Change-Number: 13303
Gerrit-PatchSet: 3
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190319/3996f3a9/attachment.html>


More information about the gerrit-log mailing list