From 57c82eb66f6eff3ff07d88c4cea294c238e45803 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 19 Jan 2006 04:17:45 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.2@8232 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_milliwatt.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 5ef708c1f2..9c46689f49 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)