aboutsummaryrefslogtreecommitdiff
path: root/src/4D_api.cpp
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-01-18 07:25:00 +0100
committerGitHub <noreply@github.com>2019-01-18 07:25:00 +0100
commitd75f2efbba70ccdf1a9630d7cb8bc705ec151a8c (patch)
tree4ed4fb1eea4233dd80042b620261e792a13559bd /src/4D_api.cpp
parent8584dcd50777355b460b38418cae0db05dcf91bc (diff)
parentd6403c450a00a036787c9dbca73c1db2faaad9c0 (diff)
downloadPROJ-d75f2efbba70ccdf1a9630d7cb8bc705ec151a8c.tar.gz
PROJ-d75f2efbba70ccdf1a9630d7cb8bc705ec151a8c.zip
Merge pull request #1225 from aaronpuchert/add-null-check
Handle allocation failure in pj_trim_argv
Diffstat (limited to 'src/4D_api.cpp')
-rw-r--r--src/4D_api.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp
index 5502c96f..37afd289 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -607,6 +607,11 @@ PJ *pj_create_internal (PJ_CONTEXT *ctx, const char *definition) {
}
argv = pj_trim_argv (argc, args);
+ if (!argv) {
+ pj_dealloc(args);
+ proj_context_errno_set(ctx, ENOMEM);
+ return nullptr;
+ }
/* ...and let pj_init_ctx do the hard work */
/* New interface: forbid init=epsg:XXXX syntax by default */