diff options
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/fuzzer.c | 22 | ||||
| -rw-r--r-- | programs/lz4io.c | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/programs/fuzzer.c b/programs/fuzzer.c index de12478..f1da1a8 100644 --- a/programs/fuzzer.c +++ b/programs/fuzzer.c @@ -208,12 +208,12 @@ static int FUZ_AddressOverflow(void) int i, nbBuff=0; int highAddress = 0; - printf("Overflow tests : "); + DISPLAY("Overflow tests : "); /* Only possible in 32-bits */ if (sizeof(void*)==8) { - printf("64 bits mode : no overflow \n"); + DISPLAY("64 bits mode : no overflow \n"); fflush(stdout); return 0; } @@ -222,23 +222,23 @@ static int FUZ_AddressOverflow(void) buffers[1] = (char*)malloc(BLOCKSIZE_I134); if ((!buffers[0]) || (!buffers[1])) { - printf("not enough memory for tests \n"); + DISPLAY("not enough memory for tests \n"); return 0; } + for (nbBuff=2; nbBuff < MAX_NB_BUFF_I134; nbBuff++) { - printf("%3i \b\b\b\b", nbBuff); + DISPLAY("%3i \b\b\b\b", nbBuff); buffers[nbBuff] = (char*)malloc(BLOCKSIZE_I134); - //printf("%08X ", (U32)(size_t)(buffers[nbBuff])); - fflush(stdout); + if (buffers[nbBuff]==NULL) goto _endOfTests; + //DISPLAY("%08X ", (U32)(size_t)(buffers[nbBuff])); fflush(stdout); if (((size_t)buffers[nbBuff] > (size_t)0x80000000) && (!highAddress)) { - printf("high address detected : "); + DISPLAY("high address detected : "); fflush(stdout); highAddress=1; } - if (buffers[nbBuff]==NULL) goto _endOfTests; { size_t sizeToGenerateOverflow = (size_t)(- ((size_t)buffers[nbBuff-1]) + 512); @@ -279,12 +279,12 @@ static int FUZ_AddressOverflow(void) nbBuff++; _endOfTests: for (i=0 ; i<nbBuff; i++) free(buffers[i]); - if (!highAddress) printf("high address not possible \n"); - else printf("all overflows correctly detected \n"); + if (!highAddress) DISPLAY("high address not possible \n"); + else DISPLAY("all overflows correctly detected \n"); return 0; _overflowError: - printf("Address space overflow error !! \n"); + DISPLAY("Address space overflow error !! \n"); exit(1); } diff --git a/programs/lz4io.c b/programs/lz4io.c index be2dc5d..14bbf0e 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -65,7 +65,7 @@ # include <fcntl.h> /* _O_BINARY */ # include <io.h> /* _setmode, _fileno, _get_osfhandle */ # if !defined(__DJGPP__) -# define SET_BINARY_MODE(file) _setmode(_fileno(file), _O_BINARY) +# define SET_BINARY_MODE(file) { int unused=_setmode(_fileno(file), _O_BINARY); (void)unused; } # include <Windows.h> /* DeviceIoControl, HANDLE, FSCTL_SET_SPARSE */ # define SET_SPARSE_FILE_MODE(file) { DWORD dw; DeviceIoControl((HANDLE) _get_osfhandle(_fileno(file)), FSCTL_SET_SPARSE, 0, 0, 0, 0, &dw, 0); } # if defined(_MSC_VER) && (_MSC_VER >= 1400) /* Avoid MSVC fseek()'s 2GiB barrier */ |