[postgis-tickets] r17286 - Catch Proj null returns in lwerror

[Paul Ramsey]

Author: pramsey
Date: 2019-02-27 09:25:48 -0800 (Wed, 27 Feb 2019)
New Revision: 17286

Modified:
   trunk/liblwgeom/lwgeom_transform.c
Log:
Catch Proj null returns in lwerror


Modified: trunk/liblwgeom/lwgeom_transform.c
===================================================================
--- trunk/liblwgeom/lwgeom_transform.c	2019-02-27 16:03:59 UTC (rev 17285)
+++ trunk/liblwgeom/lwgeom_transform.c	2019-02-27 17:25:48 UTC (rev 17286)
@@ -304,7 +304,7 @@
 	if (proj_get_type(pj_crs) == PJ_TYPE_COMPOUND_CRS)
 	{
 		PJ *pj_horiz_crs = proj_crs_get_sub_crs(NULL, pj_crs, 0);
-		assert(pj_horiz_crs);
+		if (!pj_horiz_crs) lwerror("%s: proj_crs_get_sub_crs returned NULL", __func__);
 		pj_cs = proj_crs_get_coordinate_system(NULL, pj_horiz_crs);
 		proj_destroy(pj_horiz_crs);
 	}
@@ -311,7 +311,7 @@
 	else if (proj_get_type(pj_crs) == PJ_TYPE_BOUND_CRS)
 	{
 		PJ *pj_src_crs = proj_get_source_crs(NULL, pj_crs);
-		assert(pj_src_crs);
+		if (!pj_src_crs) lwerror("%s: proj_get_source_crs returned NULL", __func__);
 		pj_cs = proj_crs_get_coordinate_system(NULL, pj_src_crs);
 		proj_destroy(pj_src_crs);
 	}
@@ -319,7 +319,7 @@
 	{
 		pj_cs = proj_crs_get_coordinate_system(NULL, pj_crs);
 	}
-	assert(pj_cs);
+	if (!pj_cs) lwerror("%s: proj_crs_get_coordinate_system returned NULL", __func__);
 	int axis_count = proj_cs_get_axis_count(NULL, pj_cs);
 	if (axis_count > 0)
 	{