[GRASS-SVN] r69186 - grass/branches/releasebranch_7_2/general/g.proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-08-21 09:46:35 -0700 (Sun, 21 Aug 2016)
New Revision: 69186

Modified:
   grass/branches/releasebranch_7_2/general/g.proj/output.c
Log:
g.proj: fix segfault when pj_get_kv() return -1 (merge r69185 from trunk)

Modified: grass/branches/releasebranch_7_2/general/g.proj/output.c
===================================================================
--- grass/branches/releasebranch_7_2/general/g.proj/output.c	2016-08-21 16:44:06 UTC (rev 69185)
+++ grass/branches/releasebranch_7_2/general/g.proj/output.c	2016-08-21 16:46:35 UTC (rev 69186)
@@ -142,7 +142,8 @@
     if (check_xy(FALSE))
 	return;
 
-    pj_get_kv(&pjinfo, projinfo, projunits);
+    if (pj_get_kv(&pjinfo, projinfo, projunits) == -1)
+        G_fatal_error(_("Unable to convert projection information to PROJ.4 format"));
     proj4 = pj_get_def(pjinfo.pj, 0);
     pj_free(pjinfo.pj);