From e7fd161254656759e3e9cd25bf18ec9d2f0c1aac Mon Sep 17 00:00:00 2001
Message-Id: <e7fd161254656759e3e9cd25bf18ec9d2f0c1aac.1717482009.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 4 Oct 2007 11:33:57 +0100
Subject: [PATCH] more conservative about read() result
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 server/normalize.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/server/normalize.c b/server/normalize.c
index c16c70f..073b869 100644
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -127,12 +127,18 @@ int main(int argc, char attribute((unused)) **argv) {
   }
   memset(&latest_format, 0, sizeof latest_format);
   for(;;) {
-    if((n = read(0, &header, sizeof header)) < 0)
-      fatal(errno, "read error");
-    else if(n == 0)
-      exit(0);
-    else if((size_t)n < sizeof header)
-      fatal(0, "short header");
+    n = 0;
+    while((size_t)n < sizeof header) {
+      int r = read(0, (char *)&header + n, sizeof header - n);
+
+      if(r < 0) {
+        if(errno != EINTR)
+          fatal(errno, "error reading header");
+      } else if(r == 0)
+        fatal(0, "EOF reading header");
+      else
+        n += r;
+    }
     /* Sanity check the header */
     if(header.rate < 100 || header.rate > 1000000)
       fatal(0, "implausible rate %"PRId32"Hz (%#"PRIx32")",
-- 
[mdw]