From 6a7688012fd765e6dfcaf91b4cb81ee489390ac2 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Fri, 17 Sep 2010 13:38:22 +0000 Subject: [PATCH] Merged revisions 287309 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r287309 | mnicholson | 2010-09-17 08:37:10 -0500 (Fri, 17 Sep 2010) | 19 lines Merged revisions 287308 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r287308 | mnicholson | 2010-09-17 08:36:07 -0500 (Fri, 17 Sep 2010) | 12 lines Merged revisions 287307 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287307 | mnicholson | 2010-09-17 08:34:34 -0500 (Fri, 17 Sep 2010) | 5 lines Use ast_strdup() instead of ast_strdupa() while processing in ast_hint_state_changed(). (related to issue #17928) Reported by: mdu113 ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287310 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 546cc8fca4..1be93f2d71 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4225,8 +4225,10 @@ static int handle_statechange(void *datap) AST_RWLIST_TRAVERSE(&hints, hint, list) { struct ast_state_cb *cblist; - char *parse = ast_strdupa(ast_get_extension_app(hint->exten)); - char *cur; + /* can't use ast_strdupa() here because we may run out of stack + * space while looping over a large number of large strings */ + char *dup = ast_strdup(ast_get_extension_app(hint->exten)); + char *cur, *parse = dup; int state; while ( (cur = strsep(&parse, "&")) ) { @@ -4234,6 +4236,9 @@ static int handle_statechange(void *datap) break; } } + + ast_free(dup); + if (!cur) { continue; }