Bug 1782740 - Update to NSPR 4.34.1 RTM. r=bbeurdouche UPGRADE_NSPR_R…

…ELEASE Differential Revision: https://phabricator.services.mozilla.com/D153800
dothq · Aug 5, 2022 · 965d146 · 965d146
1 parent 4157897
commit 965d146
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_34_RTM
+NSPR_4_34_1_RTM
diff --git a/nsprpub/configure b/nsprpub/configure
@@ -2487,7 +2487,7 @@ test -n "$target_alias" &&
 
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=34
-MOD_PATCH_VERSION=0
+MOD_PATCH_VERSION=1
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=

diff --git a/nsprpub/configure.in b/nsprpub/configure.in
@@ -16,7 +16,7 @@ dnl = Defaults
 dnl ========================================================
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=34
-MOD_PATCH_VERSION=0
+MOD_PATCH_VERSION=1
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=

diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h
@@ -31,10 +31,10 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.34"
+#define PR_VERSION  "4.34.1"
 #define PR_VMAJOR   4
 #define PR_VMINOR   34
-#define PR_VPATCH   0
+#define PR_VPATCH   1
 #define PR_BETA     PR_FALSE
 
 /*

diff --git a/nsprpub/pr/src/md/unix/unix.c b/nsprpub/pr/src/md/unix/unix.c
@@ -3641,7 +3641,8 @@ int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
         int events = filedes[i].events;
         PRBool fdHasEvent = PR_FALSE;
 
-        if (osfd < 0) {
+        PR_ASSERT(osfd < FD_SETSIZE);
+        if (osfd < 0 || osfd >= FD_SETSIZE) {
             continue;  /* Skip this osfd. */
         }
 
@@ -3686,6 +3687,10 @@ int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
             if (filedes[i].fd < 0) {
                 continue;
             }
+            if (filedes[i].fd >= FD_SETSIZE) {
+                filedes[i].revents |= POLLNVAL;
+                continue;
+            }
             if (FD_ISSET(filedes[i].fd, &rd)) {
                 if (filedes[i].events & POLLIN) {
                     filedes[i].revents |= POLLIN;

diff --git a/nsprpub/pr/tests/vercheck.c b/nsprpub/pr/tests/vercheck.c
@@ -42,7 +42,7 @@ static char *compatible_version[] = {
     "4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15",
     "4.16", "4.17", "4.18", "4.19", "4.20", "4.21", "4.22",
     "4.23", "4.24", "4.25", "4,26", "4.27", "4.28", "4.29",
-    "4.30", "4.31", "4.32", "4.33",
+    "4.30", "4.31", "4.32", "4.33", "4.34",
     PR_VERSION
 };
 
@@ -58,7 +58,7 @@ static char *incompatible_version[] = {
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2", "3.1.3",
     "3.5", "3.5.1",
-    "4.34.1",
+    "4.34.2",
     "4.35", "4.35.1",
     "10.0", "11.1", "12.14.20"
 };