do not return 500 Internal error if the AMI command provides
authorLuigi Rizzo <rizzo@icir.org>
Tue, 28 Nov 2006 13:08:56 +0000 (13:08 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Tue, 28 Nov 2006 13:08:56 +0000 (13:08 +0000)
no output.

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

main/manager.c

index 6207bb2..1c4d2c1 100644 (file)
@@ -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)