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

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Aug 16 08:00:57 2008
New Revision: 138411

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

........
r138409 | tilghman | 2008-08-16 07:52:06 -0500 (Sat, 16 Aug 2008) | 3 lines

Also make sure hinting won't crash on reload.
(Closes issue #13312)

........

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Sat Aug 16 08:00:57 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409

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=138411&r1=138410&r2=138411
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Sat Aug 16 08:00:57 2008
@@ -5921,7 +5921,7 @@
 		 */
 		if (exten && exten->exten[0] == '_') {
 			ast_add_extension(exten->parent->name, 0, this->exten, PRIORITY_HINT, NULL,
-				0, exten->app, strdup(exten->data), free, registrar);
+				0, exten->app, ast_strdup(exten->data), ast_free_ptr, registrar);
 			exten = ast_hint_extension(NULL, this->context, this->exten);
 		}