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 507a960..799892b 100644 (file)
--- 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));
                                }
                        }
                }