summaryrefslogtreecommitdiff
path: root/main/message.c
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2017-11-06 16:10:56 -0500
committerCorey Farrell <git@cfware.com>2017-11-06 16:10:56 -0500
commit714026b32e1494a11d2b5984e3516450feb4ed7d (patch)
treee2f7ea2643d7f36dbfa70279d6809b60de42168d /main/message.c
parent637b37fb980822f50966f5292a786d03a859cd89 (diff)
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
Diffstat (limited to 'main/message.c')
-rw-r--r--main/message.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/main/message.c b/main/message.c
index fcdf705fe..ac7965ea7 100644
--- a/main/message.c
+++ b/main/message.c
@@ -1362,7 +1362,12 @@ int ast_msg_tech_register(const struct ast_msg_tech *tech)
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);
@@ -1417,7 +1422,12 @@ int ast_msg_handler_register(const struct ast_msg_handler *handler)
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);