This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7034

fuzz: new target to fuzz jsonescapeu8fast
ClosedPublic

Authored by durin42 on Oct 9 2019, 12:19 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG741fb1a95da2: fuzz: new target to fuzz jsonescapeu8fast
rHG2b11fe679a5d: fuzz: new target to fuzz jsonescapeu8fast
Summary

This code just feels complicated enough we should go ahead and give it
a dedicated fuzzer: we've found bugs in similar things before.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 9 2019, 12:19 PM
indygreg accepted this revision.Oct 9 2019, 11:21 PM
This revision is now accepted and ready to land.Oct 9 2019, 11:21 PM
durin42 added a commit: rHG2b11fe679a5d: fuzz: new target to fuzz jsonescapeu8fast.Oct 9 2019, 11:23 PM
Closed by commit rHG2b11fe679a5d: fuzz: new target to fuzz jsonescapeu8fast (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/fuzz/Makefile (10 lines)
AMcontrib/fuzz/jsonescapeu8fast.cc (57 lines)

Diff 17035

contrib/fuzz/Makefile

fncache_fuzzer: fncache.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o fncache_fuzzer: fncache.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \ $(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
-Wno-register -Wno-macro-redefined \ -Wno-register -Wno-macro-redefined \
-I../../mercurial fncache.cc \ -I../../mercurial fncache.cc \
manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \ manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
-lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \ -lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \
-o $$OUT/fncache_fuzzer -o $$OUT/fncache_fuzzer
jsonescapeu8fast_fuzzer: jsonescapeu8fast.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
-Wno-register -Wno-macro-redefined \
-I../../mercurial jsonescapeu8fast.cc \
manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
-lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \
-o $$OUT/jsonescapeu8fast_fuzzer
manifest_corpus.zip: manifest_corpus.zip:
python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip
manifest_fuzzer: manifest.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o manifest_fuzzer: manifest.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \ $(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
-Wno-register -Wno-macro-redefined \ -Wno-register -Wno-macro-redefined \
-I../../mercurial manifest.cc \ -I../../mercurial manifest.cc \
manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \ manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
python fm1readmarkers_corpus.py $$OUT/fm1readmarkers_fuzzer_seed_corpus.zip python fm1readmarkers_corpus.py $$OUT/fm1readmarkers_fuzzer_seed_corpus.zip
clean: clean:
$(RM) *.o *_fuzzer \ $(RM) *.o *_fuzzer \
bdiff \ bdiff \
mpatch \ mpatch \
xdiff xdiff
oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer dirs_fuzzer fncache_fuzzer manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer fm1readmarkers_corpus.zip oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer dirs_fuzzer fncache_fuzzer jsonescapeu8fast_fuzzer manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer fm1readmarkers_corpus.zip
.PHONY: all clean oss-fuzz .PHONY: all clean oss-fuzz

contrib/fuzz/jsonescapeu8fast.cc

  • This file was added.
#include <Python.h>
#include <assert.h>
#include <stdlib.h>
#include <unistd.h>
#include "pyutil.h"
#include <iostream>
#include <string>
#include <fuzzer/FuzzedDataProvider.h>
extern "C" {
static PyCodeObject *code;
extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
{
contrib::initpy(*argv[0]);
code = (PyCodeObject *)Py_CompileString(R"py(
from parsers import jsonescapeu8fast
try:
jsonescapeu8fast(data, paranoid)
except Exception as e:
pass
# uncomment this print if you're editing this Python code
# to debug failures.
# print(e)
)py",
"fuzzer", Py_file_input);
if (!code) {
std::cerr << "failed to compile Python code!" << std::endl;
}
return 0;
}
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
FuzzedDataProvider provider(Data, Size);
bool paranoid = provider.ConsumeBool();
std::string remainder = provider.ConsumeRemainingBytesAsString();
PyObject *mtext =
PyBytes_FromStringAndSize((const char *)remainder.c_str(), remainder.size());
PyObject *locals = PyDict_New();
PyDict_SetItemString(locals, "data", mtext);
PyDict_SetItemString(locals, "paranoid", paranoid ? Py_True : Py_False);
PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);
if (!res) {
PyErr_Print();
}
Py_XDECREF(res);
Py_DECREF(locals);
Py_DECREF(mtext);
return 0; // Non-zero return values are reserved for future use.
}
}