mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
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
This commit is contained in:
@@ -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]);
|
||||
}
|
||||
|
Reference in New Issue
Block a user