Changeset 1791 for zzuf/trunk/src/lib-stream.cTweet

Timestamp:

Jul 6, 2007, 3:40:55 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Added -p flag to cherry pick file descriptors that get fuzzed.

File:

• zzuf/trunk/src/lib-stream.c (modified) (9 diffs)

zzuf/trunk/src/lib-stream.c

@@ -176 +176 @@
         LOADSYM(fn); \
         fd = fileno(stream); \
-        if(!_zz_ready || !_zz_iswatched(fd)) \
+        if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd)) \
             return ORIG(fn)(stream, offset, whence); \
         _zz_lock(fd); \
@@ -204 +204 @@
     LOADSYM(rewind);
     fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd))
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
     {
         ORIG(rewind)(stream);
@@ -234 +234 @@
     LOADSYM(fread);
     fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd))
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
         return ORIG(fread)(ptr, size, nmemb, stream);
 
@@ -295 +295 @@
         LOADSYM(fn); \
         fd = fileno(stream); \
-        if(!_zz_ready || !_zz_iswatched(fd)) \
+        if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd)) \
             return ORIG(fn)(stream); \
         _zz_lock(fd); \
@@ -333 +333 @@
     LOADSYM(fgetc);
     fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd))
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
         return ORIG(fgets)(s, size, stream);
 
@@ -386 +386 @@
     LOADSYM(ungetc);
     fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd))
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
         return ORIG(ungetc)(c, stream);
 
@@ -440 +440 @@
         LOADSYM(fgetc); \
         fd = fileno(stream); \
-        if(!_zz_ready || !_zz_iswatched(fd)) \
+        if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd)) \
             return ORIG(getdelim)(lineptr, n, delim, stream); \
         line = *lineptr; \
@@ -522 +522 @@
     LOADSYM(fgetc);
     fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd))
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
         return ORIG(fgetln)(stream, len);
 
@@ -571 +571 @@
     LOADSYM(__srefill);
     fd = fileno(fp);
-    if(!_zz_ready || !_zz_iswatched(fd))
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
         return ORIG(__srefill)(fp);