Ything-RepoMirrors/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-01-25 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4842 from nelhage/fuzz-config-memory

Browse Source 
config: Port config_file_fuzzer to the new in-memory backend.
This commit is contained in:
Patrick Steinhardt
2018-10-12 12:38:06 +02:00
committed by GitHub
parent 838a2f2918 463c21e2c1
commit 814e7acbab
4 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fuzzers/config_file_fuzzer.c
View File

@@ -8,6 +8,7 @@
*/
#include <git2.h>
#include "config_backend.h"
#include <stdlib.h>
#include <stdio.h>
@@ -25,9 +26,6 @@ int foreach_cb(const git_config_entry *entry, void *payload)
return 0;
}
static char path[] = "/tmp/git.XXXXXX";
static int fd = -1;
int LLVMFuzzerInitialize(int *argc, char ***argv)
{
UNUSED(argc);
@@ -35,10 +33,6 @@ int LLVMFuzzerInitialize(int *argc, char ***argv)
if (git_libgit2_init() < 0)
abort();
fd = mkstemp(path);
if (fd < 0) {
abort();
}
return 0;
}
@@ -46,30 +40,26 @@ int LLVMFuzzerInitialize(int *argc, char ***argv)
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
git_config *cfg = NULL;
git_config_backend *backend = NULL;
int err = 0;
size_t total = 0;
if (ftruncate(fd, 0) !=0 ) {
abort();
}
if (lseek(fd, 0, SEEK_SET) != 0) {
abort();
if ((err = git_config_new(&cfg)) != 0) {
goto out;
}
while (total < size) {
ssize_t written = write(fd, data, size);
if (written < 0 && errno != EINTR)
abort();
if (written < 0)
continue;
total += written;
if ((err = git_config_backend_from_string(&backend, (const char*)data, size)) != 0) {
goto out;
}
if ((err = git_config_add_backend(cfg, backend, 0, NULL, 0)) != 0) {
goto out;
}
/* Now owned by the config */
backend = NULL;
err = git_config_open_ondisk(&cfg, path);
if (err == 0) {
git_config_foreach(cfg, foreach_cb, NULL);
git_config_free(cfg);
}
git_config_foreach(cfg, foreach_cb, NULL);
out:
git_config_backend_free(backend);
git_config_free(cfg);
return 0;
}

3
src/config_backend.h
View File

@@ -30,8 +30,9 @@ extern int git_config_backend_from_file(git_config_backend **out, const char *pa
*
* @param out the new backend
* @param cfg the configuration that is to be parsed
* @param len the length of the string pointed to by `cfg`
*/
extern int git_config_backend_from_string(git_config_backend **out, const char *cfg);
extern int git_config_backend_from_string(git_config_backend **out, const char *cfg, size_t len);
GIT_INLINE(int) git_config_backend_open(git_config_backend *cfg, unsigned int level, const git_repository *repo)
{

4
src/config_mem.c
View File

@@ -186,7 +186,7 @@ static void config_memory_free(git_config_backend *_backend)
git__free(backend);
}
int git_config_backend_from_string(git_config_backend **out, const char *cfg)
int git_config_backend_from_string(git_config_backend **out, const char *cfg, size_t len)
{
config_memory_backend *backend;
@@ -198,7 +198,7 @@ int git_config_backend_from_string(git_config_backend **out, const char *cfg)
return -1;
}
if (git_buf_sets(&backend->cfg, cfg) < 0) {
if (git_buf_set(&backend->cfg, cfg, len) < 0) {
git_config_entries_free(backend->entries);
git__free(backend);
return -1;

7
tests/config/memory.c
View File

@@ -61,7 +61,7 @@ static void assert_config_contains_all(git_config_backend *backend,
static void setup_backend(const char *cfg)
{
cl_git_pass(git_config_backend_from_string(&backend, cfg));
cl_git_pass(git_config_backend_from_string(&backend, cfg, strlen(cfg)));
cl_git_pass(git_config_backend_open(backend, 0, NULL));
}
@@ -85,9 +85,10 @@ void test_config_memory__simple(void)
void test_config_memory__malformed_fails_to_open(void)
{
cl_git_pass(git_config_backend_from_string(&backend,
const char *cfg =
"[general\n"
"foo=bar\n"));
"foo=bar\n";
cl_git_pass(git_config_backend_from_string(&backend, cfg, strlen(cfg)));
cl_git_fail(git_config_backend_open(backend, 0, NULL));
}