Bug 168993: PR_Poll should clear out_flags for null fd's. r=jgmyers.PAVLOV_20020924_TAG

Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
Modified files: bfile.c os2poll.c uxpoll.c w32poll.c ptio.c

5 files changed, 22 insertions, 0 deletions

diff --git a/pr/src/md/beos/bfile.c b/pr/src/md/beos/bfile.c
index 38da1f33..6fd6cce9 100644
--- a/pr/src/md/beos/bfile.c
+++ b/pr/src/md/beos/bfile.c
@@ -673,6 +673,10 @@ _MD_pr_poll(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
 				}
 			}
 		}
+		else
+		{
+			pd->out_flags = 0;
+		}
 	}
 
 	if (0 != ready) return ready;  /* no need to block */
diff --git a/pr/src/md/os2/os2poll.c b/pr/src/md/os2/os2poll.c
index da477b1b..0b9c0de6 100644
--- a/pr/src/md/os2/os2poll.c
+++ b/pr/src/md/os2/os2poll.c
@@ -214,6 +214,10 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
                 }
             }
         }
+        else
+        {
+            pd->out_flags = 0;
+        }
     }
 
     if (0 != ready)
diff --git a/pr/src/md/unix/uxpoll.c b/pr/src/md/unix/uxpoll.c
index 56a0d3dc..c504cd4d 100644
--- a/pr/src/md/unix/uxpoll.c
+++ b/pr/src/md/unix/uxpoll.c
@@ -173,6 +173,7 @@ static PRInt32 NativeThreadPoll(
         {
             /* make poll() ignore this entry */
             syspoll[index].fd = -1;
+            pds[index].out_flags = 0;
         }
     }
 
@@ -384,6 +385,10 @@ static PRInt32 NativeThreadSelect(
                 }
             }
         }
+        else
+        {
+            pd->out_flags = 0;
+        }
     }
 
     if (0 != ready) return ready;  /* no need to block */
diff --git a/pr/src/md/windows/w32poll.c b/pr/src/md/windows/w32poll.c
index 2747a040..9c4836f3 100644
--- a/pr/src/md/windows/w32poll.c
+++ b/pr/src/md/windows/w32poll.c
@@ -223,6 +223,10 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
                 }
             }
         }
+        else
+        {
+            pd->out_flags = 0;
+        }
     }
 
     if (0 != ready) return ready;  /* no need to block */
diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c
index 29344491..65ba6254 100644
--- a/pr/src/pthreads/ptio.c
+++ b/pr/src/pthreads/ptio.c
@@ -3824,6 +3824,7 @@ static PRInt32 _pr_poll_with_poll(
             {
                 /* make poll() ignore this entry */
                 syspoll[index].fd = -1;
+                pds[index].out_flags = 0;
             }
         }
         if (0 == ready)
@@ -4085,6 +4086,10 @@ static PRInt32 _pr_poll_with_select(
                     }
                 }
             }
+            else
+            {
+                pds[index].out_flags = 0;
+            }
         }
         if (0 == ready)
         {