[asterisk-commits] mnicholson: branch 1.8 r287309 - in /branches/1.8: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Sep 17 08:37:10 2010
New Revision: 287309

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287309
Log:
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
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/pbx.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/pbx.c?view=diff&rev=287309&r1=287308&r2=287309
==============================================================================
--- branches/1.8/main/pbx.c (original)
+++ branches/1.8/main/pbx.c Fri Sep 17 08:37:10 2010
@@ -4225,8 +4225,10 @@
 
 	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 @@
 				break;
 			}
 		}
+
+		ast_free(dup);
+
 		if (!cur) {
 			continue;
 		}