Merge pull request #920 from jphickey/fix-919-fdset-check-id

astrogeco · web-flow · commit 1583e1602bb8 · 2021-03-22T10:45:48.000-04:00
Fix #919, check index inside fdset conversions
diff --git a/src/os/portable/os-impl-bsd-select.c b/src/os/portable/os-impl-bsd-select.c
@@ -88,9 +88,9 @@ static int32 OS_FdSet_ConvertIn_Impl(int *os_maxfd, fd_set *os_set, const OS_FdS
         bit    = 0;
         while (objids != 0)
         {
-            if (objids & 0x01)
+            id = OSAL_INDEX_C((offset * 8) + bit);
+            if ((objids & 0x01) != 0 && id < OS_MAX_NUM_OPEN_FILES)
             {
-                id   = OSAL_INDEX_C((offset * 8) + bit);
                 osfd = OS_impl_filehandle_table[id].fd;
                 if (osfd >= 0 && OS_impl_filehandle_table[id].selectable)
                 {
@@ -142,9 +142,9 @@ static void OS_FdSet_ConvertOut_Impl(fd_set *output, OS_FdSet *Input)
         bit    = 0;
         while (objids != 0)
         {
-            if (objids & 0x01)
+            id = OSAL_INDEX_C((offset * 8) + bit);
+            if ((objids & 0x01) != 0 && id < OS_MAX_NUM_OPEN_FILES)
             {
-                id   = OSAL_INDEX_C((offset * 8) + bit);
                 osfd = OS_impl_filehandle_table[id].fd;
                 if (osfd < 0 || !FD_ISSET(osfd, output))
                 {

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,9 @@ static int32 OS_FdSet_ConvertIn_Impl(int os_maxfd, fd_set os_set, const OS_FdS`
`88`	`88`	`bit = 0;`
`89`	`89`	`while (objids != 0)`
`90`	`90`	`{`
`91`		`- if (objids & 0x01)`
	`91`	`+ id = OSAL_INDEX_C((offset * 8) + bit);`
	`92`	`+ if ((objids & 0x01) != 0 && id < OS_MAX_NUM_OPEN_FILES)`
`92`	`93`	`{`
`93`		`- id = OSAL_INDEX_C((offset * 8) + bit);`
`94`	`94`	`osfd = OS_impl_filehandle_table[id].fd;`
`95`	`95`	`if (osfd >= 0 && OS_impl_filehandle_table[id].selectable)`
`96`	`96`	`{`
`@@ -142,9 +142,9 @@ static void OS_FdSet_ConvertOut_Impl(fd_set output, OS_FdSet Input)`
`142`	`142`	`bit = 0;`
`143`	`143`	`while (objids != 0)`
`144`	`144`	`{`
`145`		`- if (objids & 0x01)`
	`145`	`+ id = OSAL_INDEX_C((offset * 8) + bit);`
	`146`	`+ if ((objids & 0x01) != 0 && id < OS_MAX_NUM_OPEN_FILES)`
`146`	`147`	`{`
`147`		`- id = OSAL_INDEX_C((offset * 8) + bit);`
`148`	`148`	`osfd = OS_impl_filehandle_table[id].fd;`
`149`	`149`	`if (osfd < 0 \|\| !FD_ISSET(osfd, output))`
`150`	`150`	`{`