Changeset 4676

Timestamp:

10/07/10 00:44:47 (3 years ago)

Author:

sam

Message:

Implement ReOpenFile? and fix a few Win32 compilation warnings.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (1 diff)
• src/common/fd.c (modified) (2 diffs)
• src/common/fuzz.c (modified) (1 diff)
• src/common/ranges.c (modified) (3 diffs)
• src/common/ranges.h (modified) (1 diff)
• src/libzzuf/lib-win32.c (modified) (5 diffs)
• src/libzzuf/libzzuf.c (modified) (2 diffs)

zzuf/trunk/configure.ac

@@ -55 +55 @@
 AC_CHECK_FUNCS(__open64 __lseek64 __fopen64 __freopen64 __ftello64 __fseeko64 __fsetpos64)
 AC_CHECK_FUNCS(__fgets_chk __fgets_unlocked_chk __fread_chk __fread_unlocked_chk __read_chk __recv_chk __recvfrom_chk)
-AC_CHECK_FUNCS(CreateFileA CreateFileW ReadFile CloseHandle)
+AC_CHECK_FUNCS(CreateFileA CreateFileW ReOpenFile ReadFile CloseHandle)
 
 AC_CHECK_TYPES(sighandler_t, [], [],

zzuf/trunk/msvc/config.h

@@ -80 +80 @@
 /* #undef HAVE_RECVMSG */
 /* #undef HAVE_REGEX_H */
+#define HAVE_REOPENFILE 1
 /* #undef HAVE_SETENV */
 /* #undef HAVE_SETRLIMIT */

zzuf/trunk/src/common/fd.c

@@ -46 +46 @@
 
 /* File descriptor cherry picking */
-static int *list = NULL;
-static int static_list[512];
+static int64_t *list = NULL;
+static int64_t static_list[512];
 
 /* File descriptor stuff. When program is launched, we use the static array of
@@ -398 +398 @@
         return 0;
 
-    return files[fds[fd]].already_fuzzed + files[fds[fd]].already_pos
-                                         - files[fds[fd]].pos;
+    return (int)(files[fds[fd]].already_fuzzed + files[fds[fd]].already_pos
+                                               - files[fds[fd]].pos);
 }
 

zzuf/trunk/src/common/fuzz.c

@@ -47 +47 @@
 
 /* Per-offset byte protection */
-static int *ranges = NULL;
-static int static_ranges[512];
+static int64_t *ranges = NULL;
+static int64_t static_ranges[512];
 
 /* Per-value byte protection */

zzuf/trunk/src/common/ranges.c

@@ -33 +33 @@
  * the static array static_ranges is used. It is the caller's duty to call
  * free() if the returned value is not static_ranges. */
-int *_zz_allocrange(char const *list, int *static_ranges)
+int64_t *_zz_allocrange(char const *list, int64_t *static_ranges)
 {
     char const *parser;
-    int *ranges;
+    int64_t *ranges;
     unsigned int i, chunks;
 
@@ -45 +45 @@
 
     if(chunks >= 256)
-        ranges = malloc((chunks + 1) * 2 * sizeof(unsigned int));
+        ranges = malloc((chunks + 1) * 2 * sizeof(int64_t));
     else
         ranges = static_ranges;
@@ -70 +70 @@
 }
 
-int _zz_isinrange(int value, int const *ranges)
+int _zz_isinrange(int64_t value, int64_t const *ranges)
 {
-    int const *r;
+    int64_t const *r;
 
     if(!ranges)

zzuf/trunk/src/common/ranges.h

@@ -15 +15 @@
  */
 
-int *_zz_allocrange(char const *, int *);
-int _zz_isinrange(int, int const *);
+int64_t *_zz_allocrange(char const *, int64_t *);
+int _zz_isinrange(int64_t, int64_t const *);
 

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -28 +28 @@
 #   include <windows.h>
 #endif
+#if defined HAVE_IO_H
+#   include <io.h>
+#endif
 
 #include "common.h"
@@ -46 +49 @@
                                              LPSECURITY_ATTRIBUTES,
                                              DWORD, DWORD, HANDLE);
+#endif
+#if defined HAVE_REOPENFILE
+static HANDLE (__stdcall *ORIG(ReOpenFile))(HANDLE, DWORD,
+                                            DWORD, DWORD);
 #endif
 #if defined HAVE_READFILE
@@ -69 +76 @@
                             lpSecurityAttributes, dwCreationDisposition,
                             dwFlagsAndAttributes, hTemplateFile);
-    debug("CreateFileA(\"%s\", 0x%x, 0x%x, ..., 0x%x, 0x%x, ...) = [%i]",
+    debug("CreateFileA(\"%s\", 0x%x, 0x%x, {...}, 0x%x, 0x%x, {...}) = %i",
           lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition,
           dwFlagsAndAttributes, (int)ret);
@@ -86 +93 @@
                             lpSecurityAttributes, dwCreationDisposition,
                             dwFlagsAndAttributes, hTemplateFile);
-    debug("CreateFileW(\"%S\", 0x%x, 0x%x, ..., 0x%x, 0x%x, ...) = [%i]",
+    debug("CreateFileW(\"%S\", 0x%x, 0x%x, {...}, 0x%x, 0x%x, {...}) = %i",
           lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition,
           dwFlagsAndAttributes, (int)ret);
+    return ret;
+}
+#endif
+
+#if defined HAVE_REOPENFILE
+HANDLE __stdcall NEW(ReOpenFile)(HANDLE hOriginalFile, DWORD dwDesiredAccess,
+                                 DWORD dwShareMode, DWORD dwFlags)
+{
+    HANDLE ret;
+    ret = ORIG(ReOpenFile)(hOriginalFile, dwDesiredAccess,
+                           dwShareMode, dwFlags);
+    debug("ReOpenFile(%i, 0x%x, 0x%x, 0x%x) = %i", (int)hOriginalFile,
+          dwDesiredAccess, dwShareMode, dwFlags, (int)ret);
     return ret;
 }
@@ -114 +134 @@
 BOOL __stdcall NEW(CloseHandle)(HANDLE hObject)
 {
-    return ORIG(CloseHandle)(hObject);
+    BOOL ret;
+    ret = ORIG(CloseHandle)(hObject);
+    debug("CloseHandle(%i) = %i", (int)hObject, ret);
+    return ret;
 }
 #endif

zzuf/trunk/src/libzzuf/libzzuf.c

@@ -26 +26 @@
 #   include <windows.h>
 #endif
+#if defined HAVE_IO_H
+#   include <io.h>
+#endif
 #if defined HAVE_PROCESS_H
 #   include <process.h>
@@ -118 +121 @@
     if(tmp)
 #if defined _WIN32
-        _zz_debugfd = _open_osfhandle((HANDLE)atoi(tmp));
+        _zz_debugfd = _open_osfhandle((long)atoi(tmp), 0);
 #else
         _zz_debugfd = atoi(tmp);