summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2015-06-01 16:08:29 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-06-01 16:08:29 -0500
commit1e3701a52917bc40c430bb918863cde31bb512d6 (patch)
tree9c3bd07580078f92b549cf91bf2d4094a9b774a9
parent9e7827e3ac057f22bc17823a44778b76270c5901 (diff)
parent888bb49618cdf952a00481ea148c0be462593f29 (diff)
Merge "Fix buffer overflow in slin sample frames generation." into 13
-rw-r--r--include/asterisk/slin.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/slin.h b/include/asterisk/slin.h
index 148ee09ab..976637473 100644
--- a/include/asterisk/slin.h
+++ b/include/asterisk/slin.h
@@ -62,7 +62,7 @@ static inline struct ast_frame *slin8_sample(void)
{
static struct ast_frame f = {
.frametype = AST_FRAME_VOICE,
- .datalen = sizeof(ex_slin8) * 2,
+ .datalen = sizeof(ex_slin8),
.samples = ARRAY_LEN(ex_slin8),
.mallocd = 0,
.offset = 0,
@@ -79,7 +79,7 @@ static inline struct ast_frame *slin16_sample(void)
{
static struct ast_frame f = {
.frametype = AST_FRAME_VOICE,
- .datalen = sizeof(ex_slin16) * 2,
+ .datalen = sizeof(ex_slin16),
.samples = ARRAY_LEN(ex_slin16),
.mallocd = 0,
.offset = 0,