Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

giflib: Fix bug in test harness that led to low coverage. (#2172)

This commit is contained in:
Bhargava Shastry 2019-02-16 19:36:03 +01:00 committed by Kostya Serebryany
parent e04fe0c39f
commit c205defe5f
2 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/giflib/build.sh
View File

@ -10,7 +10,7 @@ done
ar rc libgif.a *.o
cd $SRC
$CC $CFLAGS -c -I giflib-code dgif_target.c -o dgif_target.o
$CC $CFLAGS -Wall -c -I giflib-code dgif_target.c -o dgif_target.o
$CXX $CXXFLAGS -std=c++11 -I giflib-code dgif_target.o \
-o $OUT/dgif_target -lFuzzingEngine giflib-code/libgif.a

61
projects/giflib/dgif_target.c
View File

@ -1,76 +1,37 @@
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <stdbool.h>
#include <fcntl.h>
#include <stdint.h>
#include <string.h>
#include "gif_lib.h"
struct gifUserData {
size_t gifLen;
void *gifData;
uint8_t *gifData;
};
int stub_input_reader (GifFileType *gifFileType, GifByteType *gifByteType, int len) {
struct gifUserData *gud = gifFileType->UserData;
if (gud->gifLen == 0)
return 0;
int read_len = (len > gud->gifLen ? gud->gifLen : len);
memcpy(gifByteType, gud->gifData, read_len);
gud->gifData += read_len;
gud->gifLen -= read_len;
return read_len;
}
void sponge(GifFileType *GifFileIn, int *ErrorCode) {
GifFileType *GifFileOut = (GifFileType *)NULL;
if ((GifFileOut = EGifOpenFileHandle(1, ErrorCode)) == NULL) {
return;
}
/*
* Your operations on in-core structures go here.
* This code just copies the header and each image from the incoming file.
*/
GifFileOut->SWidth = GifFileIn->SWidth;
GifFileOut->SHeight = GifFileIn->SHeight;
GifFileOut->SColorResolution = GifFileIn->SColorResolution;
GifFileOut->SBackGroundColor = GifFileIn->SBackGroundColor;
if (GifFileIn->SColorMap) {
GifFileOut->SColorMap = GifMakeMapObject(
GifFileIn->SColorMap->ColorCount,
GifFileIn->SColorMap->Colors);
} else {
GifFileOut->SColorMap = NULL;
}
for (int i = 0; i < GifFileIn->ImageCount; i++)
(void) GifMakeSavedImage(GifFileOut, &GifFileIn->SavedImages[i]);
// We ignore error since it is irrelevant in the context of this
// test harness.
EGifSpew(GifFileOut);
return;
}
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
GifFileType *GifFile;
int Error;
void *gifData = malloc(Size);
memcpy(gifData, (void *)Data, Size);
uint8_t *gifData = (uint8_t *)malloc(Size);
memcpy(gifData, Data, Size);
struct gifUserData gUData = {Size, gifData};
GifFile = DGifOpen((void *)&gUData, stub_input_reader, &Error);
if (GifFile == NULL){
goto freebuf;
if (GifFile != NULL) {
DGifSlurp(GifFile);
DGifCloseFile(GifFile, &Error);
}
if (DGifSlurp(GifFile) == GIF_ERROR) {
goto cleanup;
}
sponge(GifFile, &Error);
cleanup:
DGifCloseFile(GifFile, &Error);
freebuf:
free(gifData);
return 0;
}