about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2007-09-05 21:20:45 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2007-09-05 21:20:45 +0000
commitb7d21df6a6dfd2c27fd15cbef65deb4bbb39a2c0 (patch)
tree1b65b5fd3e24e65f97742eb2cdd3c8c4d6a32296
parent1a2d580a1262fb08d36e0c4be0e51d28be3c2eac (diff)
downloadnetpbm-mirror-b7d21df6a6dfd2c27fd15cbef65deb4bbb39a2c0.tar.gz
netpbm-mirror-b7d21df6a6dfd2c27fd15cbef65deb4bbb39a2c0.tar.xz
netpbm-mirror-b7d21df6a6dfd2c27fd15cbef65deb4bbb39a2c0.zip
fix pmdrain() to use the supplied limit
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@401 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY3
-rw-r--r--lib/libpm.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index ce424a6b..d8b62dcf 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -44,6 +44,9 @@ not yet  BJH  Release 10.40.00
 
               libnetpbm: pbm_readppminit: read PBM as maxval of 255, not 1.
 
+              libnetpbm: Fix pm_drain() to use the specified limit.
+              Thanks Paul Bolle <pebolle@tiscali.nl>.
+
               libnetpbm: Fix multi-line TUPLTYPE interpretation:
               separate lines with blank, not newline.  Thanks Paul
               Bolle <pebolle@tiscali.nl>.
diff --git a/lib/libpm.c b/lib/libpm.c
index 115d301c..1c31ce84 100644
--- a/lib/libpm.c
+++ b/lib/libpm.c
@@ -1681,7 +1681,7 @@ pm_drain(FILE *         const fileP,
     unsigned int bytesRead;
     bool eof;
 
-    for (bytesRead = 0, eof = false; !eof && bytesRead < 4096;) {
+    for (bytesRead = 0, eof = false; !eof && bytesRead < limit;) {
 
         int rc;