[asterisk-commits] mvanbaak: branch group/appdocsxml r132205 - in /team/group/appdocsxml: ./ main/

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Fri Jul 18 15:44:38 2008
New Revision: 132205

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

........
r132203 | tilghman | 2008-07-18 22:41:02 +0200 (Fri, 18 Jul 2008) | 2 lines

Fix trunk devmode

........

Modified:
    team/group/appdocsxml/   (props changed)
    team/group/appdocsxml/main/manager.c

Propchange: team/group/appdocsxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 18 15:44:38 2008
@@ -1,1 +1,1 @@
-/trunk:1-132173
+/trunk:1-132204

Modified: team/group/appdocsxml/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/main/manager.c?view=diff&rev=132205&r1=132204&r2=132205
==============================================================================
--- team/group/appdocsxml/main/manager.c (original)
+++ team/group/appdocsxml/main/manager.c Fri Jul 18 15:44:38 2008
@@ -1270,7 +1270,7 @@
 {
 	int x;
 	char hdr[40];
-	const char *action, *cat, *match, *line;
+	const char *action, *cat, *match, *line, *tmp;
 	char *var, *value;
 	struct ast_category *category;
 	struct ast_variable *v;
@@ -1285,11 +1285,19 @@
 		snprintf(hdr, sizeof(hdr), "Cat-%06d", x);
 		cat = astman_get_header(m, hdr);
 		snprintf(hdr, sizeof(hdr), "Var-%06d", x);
-		var = astman_get_header(m, hdr);
-		ast_uri_decode(var);
+		if ((tmp = astman_get_header(m, hdr))) {
+			var = ast_strdupa(tmp);
+			ast_uri_decode(var);
+		} else {
+			var = "";
+		}
 		snprintf(hdr, sizeof(hdr), "Value-%06d", x);
-		value = astman_get_header(m, hdr);
-		ast_uri_decode(value);
+		if ((tmp = astman_get_header(m, hdr))) {
+			value = ast_strdupa(tmp);
+			ast_uri_decode(value);
+		} else {
+			value = "";
+		}
 		if (!ast_strlen_zero(value) && *value == '>') {
 			object = 1;
 			value++;