diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-09-18 16:57:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 16:57:19 +0200 |
| commit | 72203ca68e123a237c8c748d39131b702ea4b646 (patch) | |
| tree | 38d1214e399eaaf4e173ad5d13a3820364065c1d /test | |
| parent | d2f661fc99615a33d72bb0120a14bca2aaced221 (diff) | |
| parent | bc53524cfbde95ecf6bb134984e68eb715d11c2b (diff) | |
| download | PROJ-72203ca68e123a237c8c748d39131b702ea4b646.tar.gz PROJ-72203ca68e123a237c8c748d39131b702ea4b646.zip | |
Merge pull request #1620 from rouault/ossfuzz_17190_and_others
Assorted set of fixes for boring oss-fuzz related errors (mostly divisions by zero in odd situations)
Diffstat (limited to 'test')
| -rw-r--r-- | test/fuzzers/standard_fuzzer.cpp | 6 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 3 | ||||
| -rw-r--r-- | test/gie/ellipsoid.gie | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp index 11f8738e..29ea50f8 100644 --- a/test/fuzzers/standard_fuzzer.cpp +++ b/test/fuzzers/standard_fuzzer.cpp @@ -105,8 +105,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) { free(buf_dup); pj_free(pj_src); +#ifndef OMIT_DEALLOCATION pj_gc_unloadall(pj_get_default_ctx()); pj_deallocate_grids(); +#endif return 0; } double x = 0, y = 0, z = 9; @@ -133,8 +135,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) free(buf_dup); pj_free(pj_src); pj_free(pj_dst); +#ifndef OMIT_DEALLOCATION pj_gc_unloadall(pj_get_default_ctx()); pj_deallocate_grids(); +#endif return 0; } #ifdef STANDALONE @@ -157,8 +161,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) free(buf_dup); pj_free(pj_src); pj_free(pj_dst); +#ifndef OMIT_DEALLOCATION pj_gc_unloadall(pj_get_default_ctx()); pj_deallocate_grids(); +#endif return 0; } diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index df19efb6..3397090c 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -1321,6 +1321,9 @@ expect failure errno lat_larger_than_90 operation +proj=eqdc +R=6400000 +lat_2=91 expect failure errno lat_larger_than_90 +operation +proj=eqdc +R=1 +lat_1=1e-9 +expect failure errno conic_lat_equal + =============================================================================== Euler Conic, Sph diff --git a/test/gie/ellipsoid.gie b/test/gie/ellipsoid.gie index b84a512f..74fbe31d 100644 --- a/test/gie/ellipsoid.gie +++ b/test/gie/ellipsoid.gie @@ -116,6 +116,8 @@ accept 12 55 expect 1338073.2696101593 7374207.4801437631 ------------------------------------------------------------------------------- +operation proj=merc a=1E77 R_lat_a=90 b=1 +expect failure errno invalid_eccentricity ------------------------------------------------------------------------------- This one from testvarious failed at first version of the pull request |