[Win32] Don't exceed handle array bounds. Warn if there would be too many

2003-08-15  Tor Lillqvist  <tml@iki.fi>

	* glib/gmain.c (g_poll): [Win32] Don't exceed handle array
	bounds. Warn if there would be too many handles to wait
	for. (WaitForMultipleObjects() has a relatively low limit of 64
	handles. The Win32 IO channel code should be fixed not to need to
	wait for one handle per file or socket being watched. Later.)

diff --git a/ChangeLog b/ChangeLog
index 83984b69e0057ce16c398a34994d38bfcb74d4f6..6b3a18ec0c56460d56ae9f1bfc827fb954537bf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-15  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gmain.c (g_poll): [Win32] Don't exceed handle array
+       bounds. Warn if there would be too many handles to wait
+       for. (WaitForMultipleObjects() has a relatively low limit of 64
+       handles. The Win32 IO channel code should be fixed not to need to
+       wait for one handle per file or socket being watched. Later.)
+
 2003-08-13  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 83984b69e0057ce16c398a34994d38bfcb74d4f6..6b3a18ec0c56460d56ae9f1bfc827fb954537bf0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2003-08-15  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gmain.c (g_poll): [Win32] Don't exceed handle array
+       bounds. Warn if there would be too many handles to wait
+       for. (WaitForMultipleObjects() has a relatively low limit of 64
+       handles. The Win32 IO channel code should be fixed not to need to
+       wait for one handle per file or socket being watched. Later.)
+
 2003-08-13  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 83984b69e0057ce16c398a34994d38bfcb74d4f6..6b3a18ec0c56460d56ae9f1bfc827fb954537bf0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2003-08-15  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gmain.c (g_poll): [Win32] Don't exceed handle array
+       bounds. Warn if there would be too many handles to wait
+       for. (WaitForMultipleObjects() has a relatively low limit of 64
+       handles. The Win32 IO channel code should be fixed not to need to
+       wait for one handle per file or socket being watched. Later.)
+
 2003-08-13  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 83984b69e0057ce16c398a34994d38bfcb74d4f6..6b3a18ec0c56460d56ae9f1bfc827fb954537bf0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2003-08-15  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gmain.c (g_poll): [Win32] Don't exceed handle array
+       bounds. Warn if there would be too many handles to wait
+       for. (WaitForMultipleObjects() has a relatively low limit of 64
+       handles. The Win32 IO channel code should be fixed not to need to
+       wait for one handle per file or socket being watched. Later.)
+
 2003-08-13  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 83984b69e0057ce16c398a34994d38bfcb74d4f6..6b3a18ec0c56460d56ae9f1bfc827fb954537bf0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2003-08-15  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gmain.c (g_poll): [Win32] Don't exceed handle array
+       bounds. Warn if there would be too many handles to wait
+       for. (WaitForMultipleObjects() has a relatively low limit of 64
+       handles. The Win32 IO channel code should be fixed not to need to
+       wait for one handle per file or socket being watched. Later.)
+
 2003-08-13  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 83984b69e0057ce16c398a34994d38bfcb74d4f6..6b3a18ec0c56460d56ae9f1bfc827fb954537bf0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2003-08-15  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gmain.c (g_poll): [Win32] Don't exceed handle array
+       bounds. Warn if there would be too many handles to wait
+       for. (WaitForMultipleObjects() has a relatively low limit of 64
+       handles. The Win32 IO channel code should be fixed not to need to
+       wait for one handle per file or socket being watched. Later.)
+
 2003-08-13  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am

diff --git a/glib/gmain.c b/glib/gmain.c
index 699c68b38493d88d9d5f9ad6ad9b13463d687fc9..a3a9dc9829ceaf29db1f980bd5ba43759496d48d 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -273,6 +273,11 @@ g_poll (GPollFD *fds,
       {
        if (f->fd == G_WIN32_MSG_HANDLE)
          poll_msgs = TRUE;
+       else if (nhandles == MAXIMUM_WAIT_OBJECTS)
+         {
+           g_warning (G_STRLOC ": Too many handles to wait for!\n");
+           break;
+         }
        else
          {
 #ifdef G_MAIN_POLL_DEBUG