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 /apps/app_osplookup.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 'apps/app_osplookup.c')
-rw-r--r-- | apps/app_osplookup.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index d63c6daa3..88edbd51a 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -2270,10 +2270,7 @@ static int ospauth_exec( AST_APP_ARG(options); ); - if (!(tmp = ast_strdupa(data))) { - ast_log(LOG_ERROR, "Out of memory\n"); - return OSP_AST_ERROR; - } + tmp = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, tmp); @@ -2365,10 +2362,7 @@ static int osplookup_exec( return OSP_AST_ERROR; } - if (!(tmp = ast_strdupa(data))) { - ast_log(LOG_ERROR, "Out of memory\n"); - return OSP_AST_ERROR; - } + tmp = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, tmp); @@ -2654,10 +2648,7 @@ static int ospnext_exec( return OSP_AST_ERROR; } - if (!(tmp = ast_strdupa(data))) { - ast_log(LOG_ERROR, "Out of memory\n"); - return OSP_AST_ERROR; - } + tmp = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, tmp); @@ -2836,10 +2827,7 @@ static int ospfinished_exec( AST_APP_ARG(options); ); - if (!(tmp = ast_strdupa(data))) { - ast_log(LOG_ERROR, "Out of memory\n"); - return OSP_AST_ERROR; - } + tmp = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, tmp); |