Changeset 3542

Timestamp:

Jan 29, 2022, 2:36:00 AM (3 years ago)

Author:

bird

Message:

kash: GetStdHandle can return NULL and we must not treat it as a valid handle as that'll cause trouble when forking a child later on.

File:

• trunk/src/kash/shfile.c (modified) (5 diffs)

trunk/src/kash/shfile.c

@@ -477 +477 @@
     while (new_size < fdMin)
         new_size += SHFILE_GROW;
+    TRACE2((NULL, "shfile_grow_tab_locked: old %p / %d entries; new size: %d\n", pfdtab->tab, pfdtab->size, new_size));
     new_tab = sh_realloc(shthread_get_shell(), pfdtab->tab, new_size * sizeof(shfile));
     if (new_tab)
@@ -498 +499 @@
         pfdtab->tab = new_tab;
         pfdtab->size = new_size;
+
+        TRACE2((NULL, "shfile_grow_tab_locked: new %p / %d entries\n", pfdtab->tab, pfdtab->size));
     }
 
@@ -1025 +1028 @@
                         ph -= dwPerH;
 
-                        if (    (paf[i] & (FOPEN | FNOINHERIT)) == FOPEN
-                            &&  *ph != (uint32_t)INVALID_HANDLE_VALUE)
+                        if (   (paf[i] & (FOPEN | FNOINHERIT)) == FOPEN
+                            && *ph != (uint32_t)INVALID_HANDLE_VALUE
+                            && *ph != 0)
                         {
                             HANDLE  h = (HANDLE)(intptr_t)*ph;
@@ -1042 +1046 @@
                                 if (dwErr == ERROR_INVALID_HANDLE)
                                     continue;
-                                else if (dwErr == NO_ERROR)
+                                if (dwErr == NO_ERROR)
                                 {
                                     fFlags = 0;
@@ -1082 +1086 @@
                     {
                         HANDLE hFile = GetStdHandle(aStdHandles[i].dwStdHandle);
-                        if (hFile != INVALID_HANDLE_VALUE)
+                        if (   hFile != INVALID_HANDLE_VALUE
+                            && hFile != NULL)
                         {
                             DWORD       dwType  = GetFileType(hFile);