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 /cdr | |
| 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 'cdr')
| -rw-r--r-- | cdr/cdr_pgsql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 61ab2b86f..4b536abcc 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -617,7 +617,7 @@ static int config_module(int reload) if (strchr(schemaname, '\\') || strchr(schemaname, '\'')) { char *tmp = schemaname, *ptr; - ptr = schemaname = alloca(strlen(tmp) * 2 + 1); + ptr = schemaname = ast_alloca(strlen(tmp) * 2 + 1); for (; *tmp; tmp++) { if (strchr("\\'", *tmp)) { *ptr++ = *tmp; @@ -630,7 +630,7 @@ static int config_module(int reload) if (strchr(tablename, '\\') || strchr(tablename, '\'')) { char *tmp = tablename, *ptr; - ptr = tablename = alloca(strlen(tmp) * 2 + 1); + ptr = tablename = ast_alloca(strlen(tmp) * 2 + 1); for (; *tmp; tmp++) { if (strchr("\\'", *tmp)) { *ptr++ = *tmp; |