From 6e344a043ff5ab195c89774a9ca75d01e7e4053e Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 31 May 2009 15:02:22 -0500
Subject: [PATCH] Fixed NULL dereference on GLISTENPORT codepath.

---
 nph-offload.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nph-offload.c b/nph-offload.c
index d365250..bd86b60 100644
--- a/nph-offload.c
+++ b/nph-offload.c
@@ -1716,16 +1716,21 @@ static int serverMainline(int argc, char **argv, char **envp)
             char onebyte = 0;
             const ssize_t recvval = recv(GSocket, &onebyte, sizeof (onebyte), MSG_DONTWAIT);
             deadsocket = (recvval == 0);
+            if (deadsocket)
+                debugEcho("EOF on socket!");
             if ( ((recvval < 0) && (errno == EAGAIN)) || (deadsocket) )
                 break;
         } // while
+        #else
+        if ( (feof(stdout)) || (ferror(stdout)) )
+        {
+            debugEcho("EOF or error on stdout!");
+            deadsocket = 1;
+        } // if
         #endif
 
-        if (deadsocket || feof(stdout) || ferror(stdout))
-        {
-            debugEcho("EOF on stdout!");
+        if (deadsocket)
             break;
-        } // if
 
         if ((br >= startRange) && (br < endRange))
         {