From: Brett Bryant <bbryant@digium.com>
Date: Fri, 22 Jun 2007 14:53:08 +0000 (+0000)
Subject: Merged revisions 71064 via svnmerge from
X-Git-Tag: 1.4.6~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a835f994ecaf73380ca05616fa8e7718563404c1;p=thirdparty%2Fasterisk.git

Merged revisions 71064 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71064 | bbryant | 2007-06-22 09:39:34 -0500 (Fri, 22 Jun 2007) | 10 lines

Fixed infinite loop when controlling terminal was lost
and return value of input function wasn't checked for
errors. This would cause 100% cpu to be taken up.

(closes issue #9654, issue #10010)
Reported by: mnicholson, and eserra

Idea for the patch from mnicholson, patched by me


........


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

diff --git a/main/asterisk.c b/main/asterisk.c
index 0c36fda6a9..d0c3d2e4e6 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2282,6 +2282,9 @@ static void ast_remotecontrol(char * data)
 	for (;;) {
 		ebuf = (char *)el_gets(el, &num);
 
+		if (!ebuf)
+			break;
+
 		if (!ast_strlen_zero(ebuf)) {
 			if (ebuf[strlen(ebuf)-1] == '\n')
 				ebuf[strlen(ebuf)-1] = '\0';
@@ -2956,12 +2959,14 @@ int main(int argc, char *argv[])
 
 		for (;;) {
 			buf = (char *)el_gets(el, &num);
-			if (buf) {
-				if (buf[strlen(buf)-1] == '\n')
-					buf[strlen(buf)-1] = '\0';
+			if (!buf)
+				break;
+
+			if (buf[strlen(buf)-1] == '\n')
+				buf[strlen(buf)-1] = '\0';
+			consolehandler((char *)buf);
 
-				consolehandler((char *)buf);
-			} else if (ast_opt_remote && (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n",
+			if (!buf && ast_opt_remote && (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n",
 				   strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0)) {
 				/* Whoa, stdout disappeared from under us... Make /dev/null's */
 				int fd;