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 /channels/chan_alsa.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 'channels/chan_alsa.c')
| -rw-r--r-- | channels/chan_alsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index e535a3adc..71d51adf4 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -182,7 +182,7 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) ast_debug(1, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write"); } - hwparams = alloca(snd_pcm_hw_params_sizeof()); + hwparams = ast_alloca(snd_pcm_hw_params_sizeof()); memset(hwparams, 0, snd_pcm_hw_params_sizeof()); snd_pcm_hw_params_any(handle, hwparams); @@ -223,7 +223,7 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) if (err < 0) ast_log(LOG_ERROR, "Couldn't set the new hw params: %s\n", snd_strerror(err)); - swparams = alloca(snd_pcm_sw_params_sizeof()); + swparams = ast_alloca(snd_pcm_sw_params_sizeof()); memset(swparams, 0, snd_pcm_sw_params_sizeof()); snd_pcm_sw_params_current(handle, swparams); |