diff options
| author | backporting[bot] <42222807+backporting[bot]@users.noreply.github.com> | 2019-10-18 22:40:53 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-10-18 22:40:53 +0200 |
| commit | f94f1ddeaa83bab4f6f3f9d5720a777e569c781b (patch) | |
| tree | a5961d70cbefceba5f7f5e6ec08cbfa0fd2abb3c /src/ell_set.cpp | |
| parent | 117ddfdc7f4ad49648abd0e717703ad97bb4f606 (diff) | |
| download | PROJ-f94f1ddeaa83bab4f6f3f9d5720a777e569c781b.tar.gz PROJ-f94f1ddeaa83bab4f6f3f9d5720a777e569c781b.zip | |
[Backport 6.2] Fix segfaults in case of out-of-memory situations (#1684) (fixes #1678)
Diffstat (limited to 'src/ell_set.cpp')
| -rw-r--r-- | src/ell_set.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ell_set.cpp b/src/ell_set.cpp index d2930ca4..bb46b3a4 100644 --- a/src/ell_set.cpp +++ b/src/ell_set.cpp @@ -1,5 +1,6 @@ /* set ellipsoid parameters a and es */ +#include <errno.h> #include <math.h> #include <stddef.h> #include <string.h> @@ -156,7 +157,14 @@ static int ellps_ellps (PJ *P) { err = proj_errno_reset (P); paralist* new_params = pj_mkparam (ellps->major); + if (nullptr == new_params) + return proj_errno_set (P, ENOMEM); new_params->next = pj_mkparam (ellps->ell); + if (nullptr == new_params->next) + { + pj_dealloc(new_params); + return proj_errno_set (P, ENOMEM); + } paralist* old_params = P->params; P->params = new_params; |