This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5363

fuzz: grep away HAVE_GETC_UNLOCKED in pyconfig.h to avoid msan badness
ClosedPublic

Authored by durin42 on Dec 3 2018, 6:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0fecf70fa8d4: fuzz: grep away HAVE_GETC_UNLOCKED in pyconfig.h to avoid msan badness
rHG54554ed8d9bb: fuzz: grep away HAVE_GETC_UNLOCKED in pyconfig.h to avoid msan badness
Summary

Per discussion with Greg Smith and the patches on
https://bugs.python.org/issue35214. This, combined with the previous
patch, fixes msan builds on oss-fuzz.

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.Dec 3 2018, 6:19 PM
Closed by commit rHG54554ed8d9bb: fuzz: grep away HAVE_GETC_UNLOCKED in pyconfig.h to avoid msan badness (authored by durin42). · Explain WhyDec 4 2018, 7:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/fuzz/Makefile (4 lines)

Diff 12693

contrib/fuzz/Makefile

xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o
$(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial xdiff.cc \ $(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial xdiff.cc \
fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o \ fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o \
-lFuzzingEngine -o $$OUT/xdiff_fuzzer -lFuzzingEngine -o $$OUT/xdiff_fuzzer
# TODO use the $OUT env var instead of hardcoding /out # TODO use the $OUT env var instead of hardcoding /out
/out/sanpy/bin/python: /out/sanpy/bin/python:
cd /Python-2.7.15/ && ./configure --without-pymalloc --prefix=$$OUT/sanpy CFLAGS="$(CFLAGS)" LDFLAGS=$$PYLDFLAGS && ASAN_OPTIONS=detect_leaks=0 make && make install cd /Python-2.7.15/ ; ./configure --without-pymalloc --prefix=$$OUT/sanpy CFLAGS="$(CFLAGS)" LDFLAGS=$$PYLDFLAGS
cd /Python-2.7.15/ ; grep -v HAVE_GETC_UNLOCKED < pyconfig.h > tmp && mv tmp pyconfig.h
cd /Python-2.7.15/ ; ASAN_OPTIONS=detect_leaks=0 make && make install
sanpy: /out/sanpy/bin/python sanpy: /out/sanpy/bin/python
manifest.o: sanpy ../../mercurial/cext/manifest.c manifest.o: sanpy ../../mercurial/cext/manifest.c
$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \ $(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
-I../../mercurial \ -I../../mercurial \
-c -o manifest.o ../../mercurial/cext/manifest.c -c -o manifest.o ../../mercurial/cext/manifest.c