From 3061122d8f5e53a4cee82f2534d47e8e812db988 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Sat, 11 Mar 2006 23:08:20 +0000
Subject: [PATCH] Added a check based on advise from Bisqwit.

---
 zsnes/src/linux/safelib.c | 2 +-
 zsnes/src/win/safelib.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/linux/safelib.c b/zsnes/src/linux/safelib.c
index e9a0fe39..4db87593 100644
--- a/zsnes/src/linux/safelib.c
+++ b/zsnes/src/linux/safelib.c
@@ -243,7 +243,7 @@ FILE *safe_popen(char *command, const char *mode)
   //filedes[1] is for writing.
   int filedes[2];
 
-  if ((*mode == 'r' || *mode == 'w') && !pipe(filedes))
+  if (mode && (*mode == 'r' || *mode == 'w') && !pipe(filedes))
   {
     pid_t childpid = parent_pause_fork();
     if (IS_PARENT(childpid))
diff --git a/zsnes/src/win/safelib.c b/zsnes/src/win/safelib.c
index 87fddba5..92a27892 100644
--- a/zsnes/src/win/safelib.c
+++ b/zsnes/src/win/safelib.c
@@ -36,7 +36,7 @@ FILE *safe_popen(char *command, const char *mode)
   {
     int filedes[2];
 
-    if ((*mode == 'r' || *mode == 'w') &&
+    if (mode && (*mode == 'r' || *mode == 'w') &&
         !pipe(filedes, 512, (mode[1] == 'b' ? O_BINARY : O_TEXT) | O_NOINHERIT))
     {
       int fd_original;