diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-09-19 13:08:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 13:08:02 +0200 |
| commit | a2a098dd9dc7f0d5acdb90e89612a4aa35b04101 (patch) | |
| tree | 8588cb33b5267f6bc78b7efbd3de02ad715ee6df /src/transformations/helmert.cpp | |
| parent | ae6f1a1760e8393b673b6e63600c4842f4fde261 (diff) | |
| parent | 02919fb712a84d83780bffd5f2ebdc44451f48b4 (diff) | |
| download | PROJ-a2a098dd9dc7f0d5acdb90e89612a4aa35b04101.tar.gz PROJ-a2a098dd9dc7f0d5acdb90e89612a4aa35b04101.zip | |
Merge pull request #1622 from OSGeo/backport-1620-to-6.2
[Backport 6.2] Assorted set of fixes for boring oss-fuzz related errors (mostly divisions by zero in odd situations)
Diffstat (limited to 'src/transformations/helmert.cpp')
| -rw-r--r-- | src/transformations/helmert.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp index 63785ea5..7a3e64d0 100644 --- a/src/transformations/helmert.cpp +++ b/src/transformations/helmert.cpp @@ -612,6 +612,8 @@ PJ *TRANSFORMATION(helmert, 0) { /* Scale */ if (pj_param (P->ctx, P->params, "ts").i) { Q->scale_0 = pj_param (P->ctx, P->params, "ds").f; + if( Q->scale_0 <= -1.0e6 ) + return pj_default_destructor (P, PJD_ERR_INVALID_SCALE); if (pj_param (P->ctx, P->params, "ttheta").i && Q->scale_0 == 0.0) return pj_default_destructor (P, PJD_ERR_INVALID_SCALE); } |