diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-25 08:34:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 08:34:16 +0100 |
| commit | 56784e70f3903cd1a0a7a3d47dfef7f837400d28 (patch) | |
| tree | be1b9edddd34449a542d4da15c1a4c021d95a849 /src/projections/vandg.cpp | |
| parent | e1e0cfdf88b17b1e9fc5e9f81e0619a4cf1a511b (diff) | |
| parent | 2e60df106deba4455089143e5ae0a4ea1858a3e1 (diff) | |
| download | PROJ-56784e70f3903cd1a0a7a3d47dfef7f837400d28.tar.gz PROJ-56784e70f3903cd1a0a7a3d47dfef7f837400d28.zip | |
Merge pull request #1359 from rouault/fix_ossfuzz_13892_and_others
Fix ossfuzz 13892, 13893, 13894, 13895
Diffstat (limited to 'src/projections/vandg.cpp')
| -rw-r--r-- | src/projections/vandg.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/projections/vandg.cpp b/src/projections/vandg.cpp index 89620356..c669f8fa 100644 --- a/src/projections/vandg.cpp +++ b/src/projections/vandg.cpp @@ -80,7 +80,14 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ al = c1 / c3 - THIRD * c2 * c2; m = 2. * sqrt(-THIRD * al); d = C2_27 * c2 * c2 * c2 + (c0 * c0 - THIRD * c2 * c1) / c3; - if (((t = fabs(d = 3. * d / (al * m))) - TOL) <= 1.) { + const double al_mul_m = al * m; + if( al_mul_m == 0 ) { + proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION); + return proj_coord_error().lp; + } + d = 3. * d /al_mul_m; + t = fabs(d); + if ((t - TOL) <= 1.) { d = t > 1. ? (d > 0. ? 0. : M_PI) : acos(d); lp.phi = M_PI * (m * cos(d * THIRD + PI4_3) - THIRD * c2); if (xy.y < 0.) lp.phi = -lp.phi; |