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

s2geometry: fix build (#7330) 

* s2geometry: fix build

* fix patch

* fix patch
This commit is contained in:
DavidKorczynski 2022-02-25 20:14:46 +00:00 committed by GitHub
parent 6611766ac0
commit 5f7d9aad5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/s2geometry/build.sh
View File

@ -16,7 +16,6 @@
################################################################################
cp $SRC/s2_fuzzer.cc $SRC/s2geometry/src/
export CXXFLAGS="${CXXFLAGS} -std=c++17"
cd $SRC/
git clone --depth=1 https://github.com/abseil/abseil-cpp

4
projects/s2geometry/project.patch
View File

@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d2b233..6b52d22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -418,6 +418,20 @@ install(TARGETS s2 s2testing
@@ -418,6 +418,22 @@ install(TARGETS s2 s2testing
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
@ -17,7 +17,9 @@ index 2d2b233..6b52d22 100644
+ absl::flags_reflection
+ absl::memory
+ absl::span
+ absl::str_format
+ absl::strings
+ absl::utility
+ absl::synchronization)
+
message("GTEST_ROOT: ${GTEST_ROOT}")

3
projects/s2geometry/s2_fuzzer.cc
View File

@ -88,7 +88,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
return 0;
}
if (isValidFormat(nt_string, size)) {
auto index = s2textformat::MakeIndex(nt_string);
auto index = absl::make_unique<MutableS2ShapeIndex>();
s2textformat::MakeIndex(nt_string, &index);
s2shapeutil::RangeIterator it(*index);
if (!it.done()) {
it.Next();