Changeset 1614 for zzufTweet

Timestamp:

Jan 7, 2007, 7:34:50 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Merged chars.c and fuzz.c.

Location:

zzuf/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• chars.c (deleted)
• chars.h (deleted)
• fuzz.c (modified) (4 diffs)
• fuzz.h (modified) (1 diff)
• libzzuf.c (modified) (3 diffs)
• libzzuf.h (modified) (1 diff)
• zzuf.c (modified) (3 diffs)

zzuf/trunk/src/Makefile.am

@@ -1 +1 @@
 
 bin_PROGRAMS = zzuf
-zzuf_SOURCES = zzuf.c random.c random.h chars.c chars.h fd.c fd.h fuzz.c fuzz.h
+zzuf_SOURCES = zzuf.c random.c random.h fd.c fd.h fuzz.c fuzz.h
 zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\"
 
@@ -7 +7 @@
 libzzuf_la_SOURCES = libzzuf.c libzzuf.h fuzz.c fuzz.h debug.c debug.h \
                      load-fd.c load-signal.c load-stream.c load.h \
-                     fd.c fd.h chars.c chars.h random.c random.h
+                     fd.c fd.h random.c random.h
 libzzuf_la_LDFLAGS = -avoid-version -no-undefined
 libzzuf_la_LIBADD = @GETOPT_LIBS@ @DL_LIBS@

zzuf/trunk/src/fuzz.c

@@ -37 +37 @@
 #define MAGIC2 0x783bc31f
 
-static float _zz_ratio = 0.004f;
-static int   _zz_seed  = 0;
-
-void _zz_setseed(int seed)
-{
-    _zz_seed = seed;
-}
-
-void _zz_setratio(float ratio)
-{
-    _zz_ratio = ratio;
-    if(_zz_ratio < 0.0f)
-        _zz_ratio = 0.0f;
-    else if(_zz_ratio > 5.0f)
-        _zz_ratio = 5.0f;
+/* Fuzzing variables */
+static int   protect[256];
+static int   refuse[256];
+static float ratio = 0.004f;
+static int   seed  = 0;
+
+static void readchars(int *, char const *);
+
+void _zz_protect(char const *list)
+{
+    readchars(protect, list);
+}
+
+void _zz_refuse(char const *list)
+{
+    readchars(refuse, list);
+}
+
+void _zz_setseed(int s)
+{
+    seed = s;
+}
+
+void _zz_setratio(float r)
+{
+    if(r < 0.0f)
+        r = 0.0f;
+    else if(r > 5.0f)
+        r = 5.0f;
+    ratio = r;
 }
 
@@ -82 +97 @@
 
             /* Add some random dithering to handle ratio < 1.0/CHUNKBYTES */
-            _zz_srand(_zz_seed ^ chunkseed);
-            todo = (int)((_zz_ratio * (8 * CHUNKBYTES * 1000)
-                                                + _zz_rand(1000)) / 1000.0);
-            _zz_srand(_zz_seed ^ chunkseed ^ (todo * MAGIC2));
+            _zz_srand(seed ^ chunkseed);
+            todo = (int)((ratio * (8 * CHUNKBYTES * 1000)
+                                             + _zz_rand(1000)) / 1000.0);
+            _zz_srand(seed ^ chunkseed ^ (todo * MAGIC2));
 
             while(todo--)
@@ -108 +123 @@
             uint8_t byte = aligned_buf[j];
 
-            if(_zz_protect[byte])
+            if(protect[byte])
                 continue;
 
             byte ^= fuzz->data[j % CHUNKBYTES];
 
-            if(_zz_refuse[byte])
+            if(refuse[byte])
                 continue;
 
@@ -121 +136 @@
 }
 
+static void readchars(int *table, char const *list)
+{
+    static char const hex[] = "0123456789abcdef0123456789ABCDEF";
+    char const *tmp;
+    int a, b;
+
+    memset(table, 0, 256 * sizeof(int));
+
+    for(tmp = list, a = b = -1; *tmp; tmp++)
+    {
+        int new;
+
+        if(*tmp == '\\' && tmp[1] == '\0')
+            new = '\\';
+        else if(*tmp == '\\')
+        {
+            tmp++;
+            if(*tmp == 'n')
+                new = '\n';
+            else if(*tmp == 'r')
+                new = '\r';
+            else if(*tmp == 't')
+                new = '\t';
+            else if(tmp[0] >= '0' && tmp[0] <= '7' && tmp[1] >= '0'
+                     && tmp[1] <= '7' && tmp[2] >= '0' && tmp[2] <= '7')
+            {
+                new = tmp[2] - '0';
+                new |= (int)(tmp[1] - '0') << 3;
+                new |= (int)(tmp[0] - '0') << 6;
+                tmp += 2;
+            }
+            else if((*tmp == 'x' || *tmp == 'X')
+                     && tmp[1] && strchr(hex, tmp[1])
+                     && tmp[2] && strchr(hex, tmp[2]))
+            {
+                new = ((strchr(hex, tmp[1]) - hex) & 0xf) << 4;
+                new |= (strchr(hex, tmp[2]) - hex) & 0xf;
+                tmp += 2;
+            }
+            else
+                new = (unsigned char)*tmp; /* XXX: OK for \\, but what else? */
+        }
+        else
+            new = (unsigned char)*tmp;
+
+        if(a != -1 && b == '-' && a <= new)
+        {
+            while(a <= new)
+                table[a++] = 1;
+            a = b = -1;
+        }
+        else
+        {
+            if(a != -1)
+                table[a] = 1;
+            a = b;
+            b = new;
+        }
+    }
+
+    if(a != -1)
+        table[a] = 1;
+    if(b != -1)
+        table[b] = 1;
+}
+

zzuf/trunk/src/fuzz.h

@@ -17 +17 @@
  */
 
+extern void _zz_protect(char const *);
+extern void _zz_refuse(char const *);
 extern void _zz_setseed(int);
 extern void _zz_setratio(float);
+
 extern void _zz_fuzz(int, uint8_t *, uint64_t);
 

zzuf/trunk/src/libzzuf.c

@@ -38 +38 @@
 #include "debug.h"
 #include "load.h"
-#include "chars.h"
 #include "fd.h"
 #include "fuzz.h"
@@ -48 +47 @@
 int   _zz_signal   = 0;
 int   _zz_network  = 0;
-
-/* Global tables */
-int   _zz_protect[256];
-int   _zz_refuse[256];
 
 /* Library initialisation shit */
@@ -72 +67 @@
     tmp = getenv("ZZUF_PROTECT");
     if(tmp && *tmp)
-        _zz_readchars(_zz_protect, tmp);
+        _zz_protect(tmp);
 
     tmp = getenv("ZZUF_REFUSE");
     if(tmp && *tmp)
-        _zz_readchars(_zz_refuse, tmp);
+        _zz_refuse(tmp);
 
     tmp = getenv("ZZUF_INCLUDE");

zzuf/trunk/src/libzzuf.h

@@ -42 +42 @@
 extern int   _zz_network;
 
-/* Internal tables TODO: merge them and use bitmasks */
-extern int   _zz_protect[256];
-extern int   _zz_refuse[256];
-
 /* Library initialisation shit */
 extern void _zz_init(void) __attribute__((constructor));

zzuf/trunk/src/zzuf.c

@@ -40 +40 @@
 #include "libzzuf.h"
 #include "random.h"
-#include "chars.h"
 #include "fd.h"
 #include "fuzz.h"
@@ -55 +54 @@
 static void usage(void);
 #endif
-
-/* Global tables */
-int   _zz_protect[256];
-int   _zz_refuse[256];
 
 static struct child_list
@@ -234 +229 @@
 
         if(protect)
-            _zz_readchars(_zz_protect, protect);
+            _zz_protect(protect);
         if(refuse)
-            _zz_readchars(_zz_refuse, protect);
+            _zz_refuse(refuse);
 
         _zz_fd_init();