Changeset 1792 for zzufTweet

Timestamp:

Jul 6, 2007, 4:39:39 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Factored common range-parsing code.

Location:

zzuf/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• fd.c (modified) (4 diffs)
• fuzz.c (modified) (4 diffs)
• ranges.c (added)
• ranges.h (added)

zzuf/trunk/src/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-COMMON = random.c random.h fd.c fd.h fuzz.c fuzz.h
+COMMON = random.c random.h ranges.c ranges.h fd.c fd.h fuzz.c fuzz.h
 if NEED_GETOPT_LONG
 GETOPT = mygetopt.c mygetopt.h

zzuf/trunk/src/fd.c

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2006-2007 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
  *
@@ -36 +36 @@
 #include "fd.h"
 #include "fuzz.h"
+#include "ranges.h"
 
 /* Regex stuff */
@@ -98 +99 @@
 void _zz_pick(char const *list)
 {   
-    char const *parser;
-    unsigned int i, chunks;
-
-    /* Count commas */ 
-    for(parser = list, chunks = 1; *parser; parser++)
-        if(*parser == ',')
-            chunks++;
-
     /* TODO: free(ranges) if ranges != ranges_static */
-    if(chunks >= 256)
-        ranges = malloc((chunks + 1) * 2 * sizeof(unsigned int));
-    else
-        ranges = ranges_static;
-
-    /* Fill ranges list */ 
-    for(parser = list, i = 0; i < chunks; i++)
-    {
-        char const *comma = strchr(parser, ',');
-        char const *dash = strchr(parser, '-');
-
-        ranges[i * 2] = (dash == parser) ? 0 : atoi(parser);
-        if(dash && (dash + 1 == comma || dash[1] == '\0'))
-            ranges[i * 2 + 1] = ranges[i * 2]; /* special case */
-        else if(dash && (!comma || dash < comma))
-            ranges[i * 2 + 1] = atoi(dash + 1) + 1;
-        else
-            ranges[i * 2 + 1] = ranges[i * 2] + 1;
-        parser = comma + 1;
-    }
-
-    ranges[i * 2] = ranges[i * 2 + 1] = 0;
+    ranges = _zz_allocrange(list, ranges_static);
 }
 
@@ -304 +276 @@
     {
         static int idx = 0;
-        int *r;
-
-        idx++;
-
-        for(r = ranges; r[1]; r += 2)
-            if(idx >= r[0] && (r[0] == r[1] || idx < r[1]))
-                goto range_ok;
-
-        files[i].active = 0;
+
+        files[i].active = _zz_isinrange(++idx, ranges);
     }
     else
-    {
-    range_ok:
         files[i].active = 1;
-    }
 
     if(autoinc)

zzuf/trunk/src/fuzz.c

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2006-2007 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
  *
@@ -33 +33 @@
 #include "fuzz.h"
 #include "fd.h"
+#include "ranges.h"
 
 #define MAGIC1 0x33ea84f7
@@ -68 +69 @@
 void _zz_bytes(char const *list)
 {
-    char const *parser;
-    unsigned int i, chunks;
-
-    /* Count commas */
-    for(parser = list, chunks = 1; *parser; parser++)
-        if(*parser == ',')
-            chunks++;
-
     /* TODO: free(ranges) if ranges != ranges_static */
-    if(chunks >= 256)
-        ranges = malloc((chunks + 1) * 2 * sizeof(unsigned int));
-    else
-        ranges = ranges_static;
-
-    /* Fill ranges list */
-    for(parser = list, i = 0; i < chunks; i++)
-    {
-        char const *comma = strchr(parser, ',');
-        char const *dash = strchr(parser, '-');
-
-        ranges[i * 2] = (dash == parser) ? 0 : atoi(parser);
-        if(dash && (dash + 1 == comma || dash[1] == '\0'))
-            ranges[i * 2 + 1] = ranges[i * 2]; /* special case */
-        else if(dash && (!comma || dash < comma))
-            ranges[i * 2 + 1] = atoi(dash + 1) + 1;
-        else
-            ranges[i * 2 + 1] = ranges[i * 2] + 1;
-        parser = comma + 1;
-    }
-
-    ranges[i * 2] = ranges[i * 2 + 1] = 0;
+    ranges = _zz_allocrange(list, ranges_static);
 }
 
@@ -162 +134 @@
         for(j = start; j < stop; j++)
         {
-            int *r;
             uint8_t byte, fuzzbyte;
 
-            if(!ranges)
-                goto range_ok;
-
-            for(r = ranges; r[1]; r += 2)
-                if(j >= r[0] && (r[0] == r[1] || j < r[1]))
-                    goto range_ok;
-
-            continue; /* Not in one of the ranges, skip byte */
-
-        range_ok:
+            if(ranges && !_zz_isinrange(j, ranges))
+                continue; /* Not in one of the ranges, skip byte */
+
             byte = aligned_buf[j];