Fix segfaults in case of out-of-memory situations (fixes #1678) (#1679)

2 files changed, 20 insertions, 0 deletions

diff --git a/src/datum_set.cpp b/src/datum_set.cpp
index c1cb4cb9..873d7be5 100644
--- a/src/datum_set.cpp
+++ b/src/datum_set.cpp
@@ -85,10 +85,22 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef)
             entry[ sizeof(entry) - 1 ] = '\0';
 
             curr = curr->next = pj_mkparam(entry);
+            if (nullptr == curr)
+            {
+                pj_ctx_set_errno(ctx, ENOMEM);
+                return 1;
+            }
         }
         
         if( pj_datums[i].defn && strlen(pj_datums[i].defn) > 0 )
+        {
             curr = curr->next = pj_mkparam(pj_datums[i].defn);
+            if (nullptr == curr)
+            {
+                pj_ctx_set_errno(ctx, ENOMEM);
+                return 1;
+            }
+        }
 
         (void)curr; /* make clang static analyzer happy */
     }
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;