[asterisk-commits] elguero: trunk r399295 - in /trunk: ./ main/features_config.c

[SVN commits to the Asterisk project]

Author: elguero
Date: Tue Sep 17 19:13:23 2013
New Revision: 399295

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399295
Log:
Fix Segfault In features-config.c When Application Has No Arguments

Some applications do not require arguments.  Therefore, when parsing application
maps in features.conf, it is possible that app_data will be set to NULL.

* This patch sets app_data to "" if it is NULL.

Review: https://reviewboard.asterisk.org/r/2804
........

Merged revisions 399294 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/features_config.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Sep 17 19:13:23 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197,399207,399225,399237,399247,399257,399268,399283
+/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197,399207,399225,399237,399247,399257,399268,399283,399294

Modified: trunk/main/features_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features_config.c?view=diff&rev=399295&r1=399294&r2=399295
==============================================================================
--- trunk/main/features_config.c (original)
+++ trunk/main/features_config.c Tue Sep 17 19:13:23 2013
@@ -1348,6 +1348,11 @@
 		*slash = '\0';
 	}
 
+	/* Some applications do not require arguments. */
+	if (!args.app_data) {
+		args.app_data = "";
+	}
+
 	/* Two syntaxes allowed for applicationmap:
 	 * Old: foo = *1,self,NoOp,Boo!,default
 	 * New: foo = *1,self,NoOp(Boo!),default