From 3c99b45f2c34d1bbdd752a51c1704e594f341c31 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 8 May 2019 17:36:39 +0200
Subject: proj_normalize_for_visualization(): fix crash when ctx == nullptr

---
 src/iso19111/c_api.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/iso19111/c_api.cpp')

diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index 85421fa0..ceb27111 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -35,6 +35,7 @@
 #include <cstdarg>
 #include <cstring>
 #include <map>
+#include <memory>
 #include <new>
 #include <utility>
 #include <vector>
@@ -6796,9 +6797,12 @@ int proj_cs_get_axis_info(PJ_CONTEXT *ctx, const PJ *cs, int index,
  */
 PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) {
 
+    SANITIZE_CTX(ctx);
     if (!obj->alternativeCoordinateOperations.empty()) {
         try {
-            auto pjNew = pj_new();
+            auto pjNew = std::unique_ptr<PJ>(pj_new());
+            if (!pjNew)
+                return nullptr;
             pjNew->ctx = ctx;
             for (const auto &alt : obj->alternativeCoordinateOperations) {
                 auto co = dynamic_cast<const CoordinateOperation *>(
@@ -6838,7 +6842,7 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) {
                         co->nameStr());
                 }
             }
-            return pjNew;
+            return pjNew.release();
         } catch (const std::exception &e) {
             proj_log_debug(ctx, __FUNCTION__, e.what());
             return nullptr;
-- 
cgit v1.2.3