[Asterisk-code-review] stasis: Release object if vector append fails. (asterisk[15])

Joshua Colp asteriskteam at digium.com
Tue Nov 7 16:37:15 CST 2017


Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7043 )

Change subject: stasis: Release object if vector append fails.
......................................................................

stasis: Release object if vector append fails.

Change-Id: I3e5cc669169aab6175ddfaf7486edeaeb4fdcfb1
---
M main/stasis.c
1 file changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  George Joseph: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, approved



diff --git a/main/stasis.c b/main/stasis.c
index a82e938..4328b84 100644
--- a/main/stasis.c
+++ b/main/stasis.c
@@ -1239,10 +1239,9 @@
 void ast_multi_object_blob_add(struct ast_multi_object_blob *multi,
 	enum stasis_user_multi_object_snapshot_type type, void *object)
 {
-	if (!multi || !object) {
-		return;
+	if (!multi || !object || AST_VECTOR_APPEND(&multi->snapshots[type], object)) {
+		ao2_cleanup(object);
 	}
-	AST_VECTOR_APPEND(&multi->snapshots[type],object);
 }
 
 /*! \brief Publish single channel user event (for app_userevent compatibility) */

-- 
To view, visit https://gerrit.asterisk.org/7043
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e5cc669169aab6175ddfaf7486edeaeb4fdcfb1
Gerrit-Change-Number: 7043
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171107/7f0b8a78/attachment.html>


More information about the asterisk-code-review mailing list