From: Joshua Colp <jcolp@digium.com>
Date: Mon, 17 Sep 2007 02:02:09 +0000 (+0000)
Subject: Merged revisions 82514 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1407
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abe84c029febd5fec7ae7d81ff543935ed556145;p=thirdparty%2Fasterisk.git

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

........
r82514 | file | 2007-09-16 23:00:59 -0300 (Sun, 16 Sep 2007) | 4 lines

(closes issue #10734)
Reported by: asgaroth
Instead of passing a NULL pointer into snprintf pass "". It makes Solaris much happier.

........


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

diff --git a/main/pbx.c b/main/pbx.c
index c879c58345..82f69c5f48 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3329,7 +3329,7 @@ static void print_ext(struct ast_exten *e, char * buf, int buflen)
 	} else {
 		snprintf(buf, buflen, "%d. %s(%s)",
 			prio, ast_get_extension_app(e),
-			(char *)ast_get_extension_app_data(e));
+			(!ast_strlen_zero(ast_get_extension_app_data(e)) ? (char *)ast_get_extension_app_data(e) : ""));
 	}
 }