aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2015-08-25 17:16:02 +0200
committerEven Rouault <even.rouault@spatialys.com>2015-08-25 17:16:02 +0200
commit5d2af3a89be0898458e4f0fe272affc36642d304 (patch)
tree93fdfffc59354a9c435559b3497c41db7739f5f6 /src
parent6c16367e152747133bba7a8fbcdbabef1232cd93 (diff)
downloadPROJ-5d2af3a89be0898458e4f0fe272affc36642d304.tar.gz
PROJ-5d2af3a89be0898458e4f0fe272affc36642d304.zip
pj_transform(): fix crash with z == NULL if vertical grid shift is required (#292)
Diffstat (limited to 'src')
-rw-r--r--src/pj_transform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pj_transform.c b/src/pj_transform.c
index c8b68281..6fe571c6 100644
--- a/src/pj_transform.c
+++ b/src/pj_transform.c
@@ -208,7 +208,7 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset,
/* Do we need to translate from geoid to ellipsoidal vertical */
/* datum? */
/* -------------------------------------------------------------------- */
- if( srcdefn->has_geoid_vgrids )
+ if( srcdefn->has_geoid_vgrids && z != NULL )
{
if( pj_apply_vgridshift( srcdefn, "sgeoidgrids",
&(srcdefn->vgridlist_geoid),
@@ -233,7 +233,7 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset,
/* Do we need to translate from geoid to ellipsoidal vertical */
/* datum? */
/* -------------------------------------------------------------------- */
- if( dstdefn->has_geoid_vgrids )
+ if( dstdefn->has_geoid_vgrids && z != NULL )
{
if( pj_apply_vgridshift( dstdefn, "sgeoidgrids",
&(dstdefn->vgridlist_geoid),