Changeset 2583

Timestamp:

07/24/08 01:40:06 (3 months ago)

Author:

sam

Message:

• zzuf.c: make the -B flag (max bytes) also work when fuzzing the standard input.

Location:

zzuf/trunk

Files:

• doc/zzuf.1 (modified) (1 diff)
• src/zzuf.c (modified) (2 diffs)

zzuf/trunk/doc/zzuf.1

@@ -58 +58 @@
 .TP
 \fB\-B\fR, \fB\-\-max\-bytes\fR=\fIn\fR
-Automatically terminate child processes that output more than \fIn\fR bytes
-on the standard output and standard error channels. This is useful to detect
-infinite loops. See also the \fB\-t\fR and \fB\-T\fR flags.
+Automatically stop after \fIn\fR bytes have been output.
+
+This either terminates child processes that output more than \fIn\fR bytes
+on the standard output and standard error channels, or stop reading from
+standard input if no program is being fuzzed.
+
+This is useful to detect infinite loops. See also the \fB\-t\fR and \fB\-T\fR
+flags.
 .TP
 \fB\-c\fR, \fB\-\-cmdline\fR

zzuf/trunk/src/zzuf.c

@@ -471 +471 @@
     uint8_t md5sum[16];
     struct md5 *ctx = NULL;
+    int total = 0;
 
     if(opts->md5)
@@ -494 +495 @@
     {
         uint8_t buf[BUFSIZ];
-        int ret, off = 0, nw = 0;
-
-        ret = read(0, buf, BUFSIZ);
+        int ret, toread = BUFSIZ, off = 0, nw = 0;
+
+        if(opts->maxbytes >= 0)
+        {
+            if(total >= opts->maxbytes)
+                break;
+            if(total + BUFSIZ >= opts->maxbytes)
+                toread = opts->maxbytes - total;
+        }
+
+        ret = read(0, buf, toread);
         if(ret <= 0)
             break;
+
+        total += ret;
 
         _zz_fuzz(0, buf, ret);