diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
| commit | 9b16c8b0f6c3b6310e303411421bfcb16b26c3c4 (patch) | |
| tree | 273c31a834a21bd2239ec6b83cd35c602ea25d26 /main/dsp.c | |
| parent | 6c23a60f802e7708389b1a6463a40dc0500512bd (diff) | |
Clean up and ensure proper usage of alloca()
This replaces all calls to alloca() with ast_alloca() which calls gcc's
__builtin_alloca() to avoid BSD semantics and removes all NULL checks
on memory allocated via ast_alloca() and ast_strdupa().
(closes issue ASTERISK-20125)
Review: https://reviewboard.asterisk.org/r/2032/
Patch-by: Walter Doekes (wdoekes)
........
Merged revisions 370642 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 370643 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/dsp.c')
| -rw-r--r-- | main/dsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/dsp.c b/main/dsp.c index c5da2dfba..33db5055f 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -1336,13 +1336,13 @@ static int ast_dsp_silence_noise_with_energy(struct ast_dsp *dsp, struct ast_fra len = f->datalen; switch (f->subclass.format.id) { case AST_FORMAT_ULAW: - s = alloca(len * 2); + s = ast_alloca(len * 2); for (x = 0;x < len; x++) { s[x] = AST_MULAW(odata[x]); } break; case AST_FORMAT_ALAW: - s = alloca(len * 2); + s = ast_alloca(len * 2); for (x = 0;x < len; x++) { s[x] = AST_ALAW(odata[x]); } @@ -1406,13 +1406,13 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, switch (af->subclass.format.id) { case AST_FORMAT_ULAW: case AST_FORMAT_TESTLAW: - shortdata = alloca(af->datalen * 2); + shortdata = ast_alloca(af->datalen * 2); for (x = 0;x < len; x++) { shortdata[x] = AST_MULAW(odata[x]); } break; case AST_FORMAT_ALAW: - shortdata = alloca(af->datalen * 2); + shortdata = ast_alloca(af->datalen * 2); for (x = 0; x < len; x++) { shortdata[x] = AST_ALAW(odata[x]); } |