mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +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:
@@ -1749,11 +1749,11 @@ void __ast_verbose_ap(const char *file, int line, const char *func, int level, s
|
||||
now = ast_tvnow();
|
||||
ast_localtime(&now, &tm, NULL);
|
||||
ast_strftime(date, sizeof(date), dateformat, &tm);
|
||||
datefmt = alloca(strlen(date) + 3 + strlen(prefix) + strlen(fmt) + 1);
|
||||
datefmt = ast_alloca(strlen(date) + 3 + strlen(prefix) + strlen(fmt) + 1);
|
||||
sprintf(datefmt, "%c[%s] %s%s", (char) magic, date, prefix, fmt);
|
||||
fmt = datefmt;
|
||||
} else {
|
||||
char *tmp = alloca(strlen(prefix) + strlen(fmt) + 2);
|
||||
char *tmp = ast_alloca(strlen(prefix) + strlen(fmt) + 2);
|
||||
sprintf(tmp, "%c%s%s", (char) magic, prefix, fmt);
|
||||
fmt = tmp;
|
||||
}
|
||||
|
Reference in New Issue
Block a user