From 4e8d2f60b10e311ac89ac56131891ea7a5d81567 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Fri, 3 Jun 2005 02:41:59 +0000
Subject: [PATCH] don't call poll() with an unitialized structure (bug #4387)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
asterisk.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/asterisk.c b/asterisk.c
index 6edb01e487..4bb6c17423 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -467,7 +467,7 @@ static int ast_makesocket(void)
if (perms!=NULL) {
mode_t p;
- sscanf(perms,"%o",&p);
+ sscanf(perms, "%o", (int *) &p);
if ((chmod(ast_config_AST_SOCKET,p))<0)
ast_log(LOG_WARNING, "Unable to change file permissions of %s: %s\n", ast_config_AST_SOCKET,strerror(errno));
}
@@ -1690,7 +1690,6 @@ int main(int argc, char *argv[])
int num;
char *buf;
char *runuser=NULL, *rungroup=NULL;
- struct pollfd silly_macos[1];
/* Remember original args for restart */
if (argc > sizeof(_argv) / sizeof(_argv[0]) - 1) {
@@ -2060,7 +2059,9 @@ int main(int argc, char *argv[])
}
/* Do nothing */
- for(;;)
- poll(silly_macos,0, -1);
+ for(;;) { /* apparently needed for the MACos */
+ struct pollfd p = { -1 /* no descriptor */, 0, 0 };
+ poll(&p, 0, -1);
+ }
return 0;
}
--
GitLab