diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-19 04:17:45 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-19 04:17:45 +0000 |
commit | 883098eb8d9d0b2fab6be868968cd3ca1eb1d6c5 (patch) | |
tree | c3bf1da41ad6785da51321586df37a7f8ef6a185 | |
parent | 9d480e38922b8513ad6048ded03b8962ba27c0bb (diff) |
fix a seg fault due to assuming that space gets allocatted on the stack in the
same order that we declare the variables (issue #6290)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@8232 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_milliwatt.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 5ef708c1f..9c46689f4 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -73,30 +73,29 @@ static void milliwatt_release(struct ast_channel *chan, void *data) static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int samples) { struct ast_frame wf; - unsigned char waste[AST_FRIENDLY_OFFSET]; - unsigned char buf[640]; + unsigned char buf[AST_FRIENDLY_OFFSET + 640]; int i,*indexp = (int *) data; - if (len > sizeof(buf)) + if (len + AST_FRIENDLY_OFFSET > sizeof(buf)) { - ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)sizeof(buf),len); - len = sizeof(buf); + ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)(sizeof(buf) - AST_FRIENDLY_OFFSET),len); + len = sizeof(buf) - AST_FRIENDLY_OFFSET; } - waste[0] = 0; /* make compiler happy */ wf.frametype = AST_FRAME_VOICE; wf.subclass = AST_FORMAT_ULAW; wf.offset = AST_FRIENDLY_OFFSET; wf.mallocd = 0; - wf.data = buf; + wf.data = buf + AST_FRIENDLY_OFFSET; wf.datalen = len; wf.samples = wf.datalen; wf.src = "app_milliwatt"; wf.delivery.tv_sec = 0; wf.delivery.tv_usec = 0; + wf.prev = wf.next = NULL; /* create a buffer containing the digital milliwatt pattern */ for(i = 0; i < len; i++) { - buf[i] = digital_milliwatt[(*indexp)++]; + buf[AST_FRIENDLY_OFFSET + i] = digital_milliwatt[(*indexp)++]; *indexp &= 7; } if (ast_write(chan,&wf) < 0) |