From: Doug Bailey <dbailey@digium.com>
Date: Tue, 18 Sep 2007 21:49:32 +0000 (+0000)
Subject: Corrected patch applied in revision r82887.
X-Git-Tag: 1.4.12~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ac8d79a5d10ad239092f02403db4e9733b40a07;p=thirdparty%2Fasterisk.git

Corrected patch applied in revision r82887.


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

diff --git a/main/manager.c b/main/manager.c
index 6bd4a4e156..1964bfdfd8 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1985,16 +1985,13 @@ static int process_events(struct mansession *s)
 			if (s->fd > -1) {
 				if (!ret && ast_carefulwrite(s->fd, eqe->eventdata, strlen(eqe->eventdata), s->writetimeout) < 0)
 					ret = -1;
-			} else {
-				if (!s->outputstr && !(s->outputstr = ast_calloc(1, sizeof(*s->outputstr)))) {
-					ast_mutex_unlock(&s->__lock);
-					return;
-				}
-				ast_dynamic_str_append(&s->outputstr, 0, "%s", buf->str);
-			}
-				   }
-				   unuse_eventqent(s->eventq);
-				   s->eventq = eqe;
+			} else if (!s->outputstr && !(s->outputstr = ast_calloc(1, sizeof(*s->outputstr)))) 
+				ret = -1;
+			else 
+				ast_dynamic_str_append(&s->outputstr, 0, "%s", eqe->eventdata);
+		}
+		unuse_eventqent(s->eventq);
+		s->eventq = eqe;
 	}
 	ast_mutex_unlock(&s->__lock);
 	return ret;