spawn: fix possible NULL dereferences

tvheadend · Nov 16, 2014 · 114298a · 114298a
1 parent b6fcb45
commit 114298a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/spawn.c b/src/spawn.c
@@ -108,14 +108,17 @@ spawn_reap(char *stxt, size_t stxtlen)
     if (stxt)
       snprintf(stxt, stxtlen, "exited, status=%d", WEXITSTATUS(status));
   } else if (WIFSIGNALED(status)) {
-    snprintf(stxt, stxtlen, "killed by signal %d, "
-                            "stopped by signal %d",
-                            WTERMSIG(status),
-                            WSTOPSIG(status));
+    if (stxt)
+      snprintf(stxt, stxtlen, "killed by signal %d, "
+                              "stopped by signal %d",
+                              WTERMSIG(status),
+                              WSTOPSIG(status));
   } else if (WIFCONTINUED(status)) {
-    snprintf(stxt, stxtlen, "continued");
+    if (stxt)
+      snprintf(stxt, stxtlen, "continued");
   } else {
-    snprintf(stxt, stxtlen, "unknown status");
+    if (stxt)
+      snprintf(stxt, stxtlen, "unknown status");
   }
 
   if(s != NULL) {