From: Joshua Colp <jcolp@digium.com>
Date: Mon, 9 Jul 2007 01:17:28 +0000 (+0000)
Subject: Merged revisions 73930 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d61056132a08ae4cb27e63f6ce2de44be0e66e13;p=thirdparty%2Fasterisk.git

Merged revisions 73930 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73930 | file | 2007-07-08 22:13:57 -0300 (Sun, 08 Jul 2007) | 2 lines

Add a few sanity checks when writing out the dialplan. (issue #10157 reported by dome)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 507a960393..799892ba96 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -883,9 +883,9 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
 						incomplete = 1;	/* error encountered or label > 125 chars */
 					
 					fprintf(output, "exten => %s%s%s,%d%s,%s(%s)\n",
-					    ast_get_extension_name(p), sep, cid,
+					    ast_get_extension_name(p), (ast_strlen_zero(sep) ? "" : sep), (ast_strlen_zero(cid) ? "" : cid),
 					    ast_get_extension_priority(p), label,
-					    ast_get_extension_app(p), tempdata);
+					    ast_get_extension_app(p), (ast_strlen_zero(tempdata) ? "" : tempdata));
 				}
 			}
 		}