[asterisk-commits] rmudgett: trunk r353466 - in /trunk: ./ include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jan 31 11:26:14 CST 2012
Author: rmudgett
Date: Tue Jan 31 11:26:09 2012
New Revision: 353466
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=353466
Log:
Fix memory leak in error paths for action_originate().
* Fix memory leak of vars in error paths for action_originate().
* Moved struct fast_originate_helper tech and data members to stringfields.
* Simplified ActionID header handling for fast_originate().
* Added doxygen note to ast_request() and ast_call() and the associated
channel callbacks that the data/addr parameters should be treated as const
char *.
Review: https://reviewboard.asterisk.org/r/1690/
........
Merged revisions 353454 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 353463 from http://svn.asterisk.org/svn/asterisk/branches/10
Modified:
trunk/ (props changed)
trunk/include/asterisk/channel.h
trunk/main/manager.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=353466&r1=353465&r2=353466
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Tue Jan 31 11:26:09 2012
@@ -516,7 +516,10 @@
int properties; /*!< Technology Properties */
- /*! \brief Requester - to set up call data structures (pvt's) */
+ /*!
+ * \brief Requester - to set up call data structures (pvt's)
+ * \note data should be treated as const char *.
+ */
struct ast_channel *(* const requester)(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, void *data, int *cause);
int (* const devicestate)(void *data); /*!< Devicestate call back */
@@ -535,8 +538,11 @@
*/
int (* const send_digit_end)(struct ast_channel *chan, char digit, unsigned int duration);
- /*! \brief Call a given phone number (address, etc), but don't
- * take longer than timeout seconds to do so. */
+ /*!
+ * \brief Call a given phone number (address, etc), but don't
+ * take longer than timeout seconds to do so.
+ * \note addr should be treated as const char *.
+ */
int (* const call)(struct ast_channel *chan, char *addr, int timeout);
/*! \brief Hangup (and possibly destroy) the channel */
@@ -1296,7 +1302,7 @@
* \param type type of channel to request
* \param format capabilities for requested channel
* \param requestor channel asking for data
- * \param data data to pass to the channel requester
+ * \param data data to pass to the channel requester (Should be treated as const char *)
* \param status status
*
* \details
@@ -1617,7 +1623,7 @@
* \brief Make a call
* \note Absolutely _NO_ channel locks should be held before calling this function.
* \param chan which channel to make the call on
- * \param addr destination of the call
+ * \param addr destination of the call (Should be treated as const char *)
* \param timeout time to wait on for connect
* \details
* Place a call, take no longer than timeout ms.
Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=353466&r1=353465&r2=353466
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Jan 31 11:26:09 2012
@@ -3687,12 +3687,12 @@
/*! \brief helper function for originate */
struct fast_originate_helper {
- char tech[AST_MAX_EXTENSION];
- /*! data can contain a channel name, extension number, username, password, etc. */
- char data[512];
int timeout;
struct ast_format_cap *cap; /*!< Codecs used for a call */
AST_DECLARE_STRING_FIELDS (
+ AST_STRING_FIELD(tech);
+ /*! data can contain a channel name, extension number, username, password, etc. */
+ AST_STRING_FIELD(data);
AST_STRING_FIELD(app);
AST_STRING_FIELD(appdata);
AST_STRING_FIELD(cid_name);
@@ -3706,6 +3706,21 @@
struct ast_variable *vars;
};
+/*!
+ * \internal
+ *
+ * \param doomed Struct to destroy.
+ *
+ * \return Nothing
+ */
+static void destroy_fast_originate_helper(struct fast_originate_helper *doomed)
+{
+ ast_format_cap_destroy(doomed->cap);
+ ast_variables_destroy(doomed->vars);
+ ast_string_field_free_memory(doomed);
+ ast_free(doomed);
+}
+
static void *fast_originate(void *data)
{
struct fast_originate_helper *in = data;
@@ -3715,16 +3730,20 @@
char requested_channel[AST_CHANNEL_NAME];
if (!ast_strlen_zero(in->app)) {
- res = ast_pbx_outgoing_app(in->tech, in->cap, in->data, in->timeout, in->app, in->appdata, &reason, 1,
+ res = ast_pbx_outgoing_app(in->tech, in->cap, (char *) in->data,
+ in->timeout, in->app, in->appdata, &reason, 1,
S_OR(in->cid_num, NULL),
S_OR(in->cid_name, NULL),
in->vars, in->account, &chan);
} else {
- res = ast_pbx_outgoing_exten(in->tech, in->cap, in->data, in->timeout, in->context, in->exten, in->priority, &reason, 1,
+ res = ast_pbx_outgoing_exten(in->tech, in->cap, (char *) in->data,
+ in->timeout, in->context, in->exten, in->priority, &reason, 1,
S_OR(in->cid_num, NULL),
S_OR(in->cid_name, NULL),
in->vars, in->account, &chan);
}
+ /* Any vars memory was passed to the ast_pbx_outgoing_xxx() calls. */
+ in->vars = NULL;
if (!chan) {
snprintf(requested_channel, AST_CHANNEL_NAME, "%s/%s", in->tech, in->data);
@@ -3732,7 +3751,7 @@
/* Tell the manager what happened with the channel */
chans[0] = chan;
ast_manager_event_multichan(EVENT_FLAG_CALL, "OriginateResponse", chan ? 1 : 0, chans,
- "%s%s"
+ "%s"
"Response: %s\r\n"
"Channel: %s\r\n"
"Context: %s\r\n"
@@ -3741,7 +3760,7 @@
"Uniqueid: %s\r\n"
"CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n",
- in->idtext, ast_strlen_zero(in->idtext) ? "" : "\r\n", res ? "Failure" : "Success",
+ in->idtext, res ? "Failure" : "Success",
chan ? ast_channel_name(chan) : requested_channel, in->context, in->exten, reason,
chan ? ast_channel_uniqueid(chan) : "<null>",
S_OR(in->cid_num, "<unknown>"),
@@ -3752,9 +3771,7 @@
if (chan) {
ast_channel_unlock(chan);
}
- in->cap = ast_format_cap_destroy(in->cap);
- ast_string_field_free_memory(in);
- ast_free(in);
+ destroy_fast_originate_helper(in);
return NULL;
}
@@ -4098,18 +4115,19 @@
vars = astman_get_variables(m);
if (ast_true(async)) {
- struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
+ struct fast_originate_helper *fast;
+
+ fast = ast_calloc(1, sizeof(*fast));
if (!fast || ast_string_field_init(fast, 252)) {
- if (fast) {
- ast_free(fast);
- }
+ ast_free(fast);
+ ast_variables_destroy(vars);
res = -1;
} else {
if (!ast_strlen_zero(id)) {
- ast_string_field_build(fast, idtext, "ActionID: %s", id);
+ ast_string_field_build(fast, idtext, "ActionID: %s\r\n", id);
}
- ast_copy_string(fast->tech, tech, sizeof(fast->tech));
- ast_copy_string(fast->data, data, sizeof(fast->data));
+ ast_string_field_set(fast, tech, tech);
+ ast_string_field_set(fast, data, data);
ast_string_field_set(fast, app, app);
ast_string_field_set(fast, appdata, appdata);
ast_string_field_set(fast, cid_num, l);
@@ -4123,9 +4141,7 @@
fast->timeout = to;
fast->priority = pi;
if (ast_pthread_create_detached(&th, NULL, fast_originate, fast)) {
- ast_format_cap_destroy(fast->cap);
- ast_string_field_free_memory(fast);
- ast_free(fast);
+ destroy_fast_originate_helper(fast);
res = -1;
} else {
res = 0;
@@ -4133,14 +4149,14 @@
}
} else if (!ast_strlen_zero(app)) {
res = ast_pbx_outgoing_app(tech, cap, data, to, app, appdata, &reason, 1, l, n, vars, account, NULL);
+ /* Any vars memory was passed to ast_pbx_outgoing_app(). */
} else {
if (exten && context && pi) {
res = ast_pbx_outgoing_exten(tech, cap, data, to, context, exten, pi, &reason, 1, l, n, vars, account, NULL);
+ /* Any vars memory was passed to ast_pbx_outgoing_exten(). */
} else {
astman_send_error(s, m, "Originate with 'Exten' requires 'Context' and 'Priority'");
- if (vars) {
- ast_variables_destroy(vars);
- }
+ ast_variables_destroy(vars);
res = 0;
goto fast_orig_cleanup;
}
More information about the asterisk-commits
mailing list