From: Luigi Rizzo <rizzo@icir.org>
Date: Tue, 28 Nov 2006 13:08:56 +0000 (+0000)
Subject: do not return 500 Internal error if the AMI command provides
X-Git-Tag: 1.6.0-beta1~3^2~3848
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29985ff8c3f5fcfc7dae6a74e07286419e07fa83;p=thirdparty%2Fasterisk.git

do not return 500 Internal error if the AMI command provides
no output.



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

diff --git a/main/manager.c b/main/manager.c
index 6207bb2391..1c4d2c19e5 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2767,10 +2767,11 @@ static char *generic_http_callback(enum output_format format,
 		char *buf;
 		off_t len = lseek(s->fd, 0, SEEK_END);	/* how many chars available */
 
-		if (len > 0 && (buf = ast_calloc(1, len+1))) {
+		/* always return something even if len == 0 */
+		if ((buf = ast_calloc(1, len+1))) {
 			if (!s->outputstr)
 				s->outputstr = ast_calloc(1, sizeof(*s->outputstr));
-			if (s->outputstr) {
+			if (len > 0 && s->outputstr) {
 				lseek(s->fd, 0, SEEK_SET);
 				read(s->fd, buf, len);
 				if (0)