[svn-commits] tilghman: branch 1.6.1 r138133 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Aug 15 14:24:27 2008
New Revision: 138133

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138133
Log:
Merged revisions 138124 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r138124 | tilghman | 2008-08-15 14:22:48 -0500 (Fri, 15 Aug 2008) | 4 lines

e->data can be NULL, so use the safe version of ast_strdup()
(closes issue #13312)
 Reported by: pj

........

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Aug 15 14:24:27 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138086
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138086,138124

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=138133&r1=138132&r2=138133
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Fri Aug 15 14:24:27 2008
@@ -3391,7 +3391,7 @@
 	 */
 	if (e->exten[0] == '_') {
 		ast_add_extension(e->parent->name, 0, exten, e->priority, e->label,
-			e->cidmatch, e->app, strdup(e->data), free,
+			e->cidmatch, e->app, ast_strdup(e->data), free,
 			e->registrar);
 		e = ast_hint_extension(NULL, context, exten);
 		if (!e || e->exten[0] == '_') {