kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a case where code made assumptions about how memory for variables is

Browse Source 
allocatted on the stack - this patch is slightly different than the one
that went in for the trunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@28966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-05-20 02:31:30 +00:00
parent 4eef3ef785
commit 9123735599
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/app_sms.c
View File

@@ -1178,25 +1178,24 @@ static void sms_messagetx(sms_t * h)
static int sms_generate (struct ast_channel *chan, void *data, int len, int samples) static int sms_generate (struct ast_channel *chan, void *data, int len, int samples)
{ {
struct ast_frame f = { 0 }; struct ast_frame f = { 0 };
unsigned char waste[AST_FRIENDLY_OFFSET]; #define MAXSAMPLES 800
#ifdef OUTALAW #ifdef OUTALAW
unsigned char buf[800]; unsigned char *buf;
#else #else
signed short buf[800]; short *buf;
#endif #endif
#define SAMPLE2LEN sizeof(*buf)
sms_t *h = data; sms_t *h = data;
int i; int i;
if (len > sizeof (buf)) { if (samples > MAXSAMPLES) {
ast_log (LOG_WARNING, "Only doing %d bytes (%d bytes requested)\n", (int)(sizeof (buf) / sizeof (signed short)), len); ast_log (LOG_WARNING, "Only doing %d samples (%d requested)\n",
len = sizeof (buf); MAXSAMPLES, samples);
#ifdef OUTALAW samples = MAXSAMPLES;
samples = len;
#else
samples = len / 2;
#endif
} }
waste[0] = 0; /* make compiler happy */ len = samples * SAMPLE2LEN + AST_FRIENDLY_OFFSET;
buf = alloca(len);
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
#ifdef OUTALAW #ifdef OUTALAW
f.subclass = AST_FORMAT_ALAW; f.subclass = AST_FORMAT_ALAW;
@@ -1206,8 +1205,7 @@ static int sms_generate (struct ast_channel *chan, void *data, int len, int samp
f.datalen = samples * 2; f.datalen = samples * 2;
#endif #endif
f.offset = AST_FRIENDLY_OFFSET; f.offset = AST_FRIENDLY_OFFSET;
f.mallocd = 0; f.data = buf + AST_FRIENDLY_OFFSET;
f.data = buf;
f.samples = samples; f.samples = samples;
f.src = "app_sms"; f.src = "app_sms";
/* create a buffer containing the digital sms pattern */ /* create a buffer containing the digital sms pattern */