diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-25 09:54:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 09:54:39 +0200 |
| commit | 939d78d1c3b294ee12bc9ac34d90b9a2d6a35c2f (patch) | |
| tree | 80b96a870bb0d39c3781de54a3663da440a45419 /src | |
| parent | 19aef5185f5b39f6c90956da146d26eba142d2a0 (diff) | |
| parent | 20392cf7e95d090d6c8b4e43e116588bc90bb6e1 (diff) | |
| download | PROJ-939d78d1c3b294ee12bc9ac34d90b9a2d6a35c2f.tar.gz PROJ-939d78d1c3b294ee12bc9ac34d90b9a2d6a35c2f.zip | |
Merge pull request #893 from schwehr/horner-overflow
horner: Fail if the order is unreasonably large.
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_horner.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/PJ_horner.c b/src/PJ_horner.c index 76ccf336..24e1cbe9 100644 --- a/src/PJ_horner.c +++ b/src/PJ_horner.c @@ -448,9 +448,14 @@ PJ *PROJECTION(horner) { P->destructor = horner_freeup; /* Polynomial degree specified? */ - if (pj_param (P->ctx, P->params, "tdeg").i) /* degree specified? */ - degree = pj_param(P->ctx, P->params, "ideg").i; - else { + if (pj_param (P->ctx, P->params, "tdeg").i) { /* degree specified? */ + degree = pj_param(P->ctx, P->params, "ideg").i; + if (degree > 10000) { + /* What is a reasonable maximum for the degree? */ + proj_log_debug (P, "Horner: Degree too large: %d", degree); + return horner_freeup (P, PJD_ERR_INVALID_ARG); + } + } else { proj_log_debug (P, "Horner: Must specify polynomial degree, (+deg=n)"); return horner_freeup (P, PJD_ERR_MISSING_ARGS); } |