aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_local.c
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-19 15:34:07 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-19 15:34:07 +0000
commitdb926891c2aa79b8c46d4ad0df8da08a709626dd (patch)
treef9bc1567201187c9016c7f6f10d54b46c79fad42 /channels/chan_local.c
parent3e206f6c0b66fb319b14c8cd1265e6bff8d8bf52 (diff)
Merged revisions 302412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r302412 | seanbright | 2011-01-19 10:31:39 -0500 (Wed, 19 Jan 2011) | 10 lines Use appropriate type for requested format in chan_local. We were passing and storing the requested format as an int instead of format_t resulting in truncation. (closes issue #18238) Reported by: whizemen Patches: 0018238_speex16.patch uploaded by whizemen (license 1143) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@302413 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
-rw-r--r--channels/chan_local.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index f224140c7..e80722c23 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -141,7 +141,7 @@ struct local_pvt {
unsigned int flags; /*!< Private flags */
char context[AST_MAX_CONTEXT]; /*!< Context to call */
char exten[AST_MAX_EXTENSION]; /*!< Extension to call */
- int reqformat; /*!< Requested format */
+ format_t reqformat; /*!< Requested format */
struct ast_jb_conf jb_conf; /*!< jitterbuffer configuration for this local channel */
struct ast_channel *owner; /*!< Master Channel - Bridging happens here */
struct ast_channel *chan; /*!< Outbound channel - PBX is run here */
@@ -955,7 +955,7 @@ static int local_hangup(struct ast_channel *ast)
}
/*! \brief Create a call structure */
-static struct local_pvt *local_alloc(const char *data, int format)
+static struct local_pvt *local_alloc(const char *data, format_t format)
{
struct local_pvt *tmp = NULL;
char *c = NULL, *opts = NULL;