mirror of
https://github.com/asterisk/asterisk.git
synced 2025-08-28 17:08:59 +00:00
revert a change that caused more problems than it fixed and fix the real
problem in this code. fds was declared as an array of zero size which caused some weird problems, some of which would only be seen when compiling without optimizations. (fixes issues #7071, #7326, and #7305) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@33753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
15
asterisk.c
15
asterisk.c
@@ -1803,17 +1803,12 @@ static void ast_remotecontrol(char * data)
|
||||
|
||||
if (option_exec && data) { /* hack to print output then exit if asterisk -rx is used */
|
||||
char tempchar;
|
||||
#ifdef __Darwin__
|
||||
struct pollfd fds[0];
|
||||
fds[0].fd = ast_consock;
|
||||
fds[0].events = POLLIN;
|
||||
fds[0].revents = 0;
|
||||
while (poll(fds, 1, 100) > 0) {
|
||||
struct pollfd fds;
|
||||
fds.fd = ast_consock;
|
||||
fds.events = POLLIN;
|
||||
fds.revents = 0;
|
||||
while (poll(&fds, 1, 100) > 0)
|
||||
ast_el_read_char(el, &tempchar);
|
||||
}
|
||||
#else
|
||||
while (!ast_el_read_char(el, &tempchar));
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
for(;;) {
|
||||
|
Reference in New Issue
Block a user