Changeset 23553

Timestamp:

Mar 26, 2009, 9:20:04 AM (17 years ago)

Author:

eugene

Message:

a little more careful about overfilling the buffer

File:

• trunk/Ohana/src/libohana/src/IOBufferOps.c (modified) (3 diffs)

trunk/Ohana/src/libohana/src/IOBufferOps.c

@@ -27 +27 @@
 int ReadtoIOBuffer (IOBuffer *buffer, int fd) {
 
-  int Nread, Nfree;
+  int Nread, Nfree, Nwant;
 
   if (fd == 0) {
@@ -34 +34 @@
   }
 
+  // if we run out of space, double Nblock
   Nfree = buffer[0].Nalloc - buffer[0].Nbuffer;
   if (Nfree < buffer[0].Nblock) {
@@ -44 +45 @@
   }
 
-  Nread = read (fd, &buffer[0].buffer[buffer[0].Nbuffer], buffer[0].Nblock);
-  if (DEBUG) fprintf (stderr, "read IO buffer: (%lx) %d from %d\n", (unsigned long) buffer, Nread, buffer[0].Nblock); 
+  // ensure we never read more than space available
+  Nwant = MIN (Nfree, buffer[0].Nblock);
+  Nread = read (fd, &buffer[0].buffer[buffer[0].Nbuffer], Nwant);
+  if (DEBUG) fprintf (stderr, "read IO buffer: (%lx) %d from %d\n", (unsigned long) buffer, Nread, Nwant); 
 
   /* on success, increase the block size for the next read */