[Asterisk-code-review] Messaging: Report error on failure to register tech or handler. (asterisk[13])
Joshua Colp
asteriskteam at digium.com
Tue Nov 7 14:32:00 CST 2017
Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7036 )
Change subject: Messaging: Report error on failure to register tech or handler.
......................................................................
Messaging: Report error on failure to register tech or handler.
Message tech and handler registrations use a vector which could fail to
expand. If it does log and error and return error.
Change-Id: I593a8de81a07fb0452e9b0efd5d4018b77bca6f4
---
M main/message.c
1 file changed, 12 insertions(+), 2 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/message.c b/main/message.c
index be0035d..caee37c 100644
--- a/main/message.c
+++ b/main/message.c
@@ -1364,7 +1364,12 @@
return -1;
}
- AST_VECTOR_APPEND(&msg_techs, tech);
+ if (AST_VECTOR_APPEND(&msg_techs, tech)) {
+ ast_log(LOG_ERROR, "Failed to register message technology for '%s'\n",
+ tech->name);
+ ast_rwlock_unlock(&msg_techs_lock);
+ return -1;
+ }
ast_verb(3, "Message technology '%s' registered.\n", tech->name);
ast_rwlock_unlock(&msg_techs_lock);
@@ -1419,7 +1424,12 @@
return -1;
}
- AST_VECTOR_APPEND(&msg_handlers, handler);
+ if (AST_VECTOR_APPEND(&msg_handlers, handler)) {
+ ast_log(LOG_ERROR, "Failed to register message handler for '%s'\n",
+ handler->name);
+ ast_rwlock_unlock(&msg_handlers_lock);
+ return -1;
+ }
ast_verb(2, "Message handler '%s' registered.\n", handler->name);
ast_rwlock_unlock(&msg_handlers_lock);
--
To view, visit https://gerrit.asterisk.org/7036
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: I593a8de81a07fb0452e9b0efd5d4018b77bca6f4
Gerrit-Change-Number: 7036
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/0beb76d8/attachment.html>
More information about the asterisk-code-review
mailing list