浏览代码

projlib: fix small memory leak in GPJ_osr_to_grass()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71548 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 7 年之前
父节点
当前提交
e56b0db84f
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      lib/proj/convert.c

+ 5 - 0
lib/proj/convert.c

@@ -390,6 +390,9 @@ int GPJ_osr_to_grass(struct Cell_head *cellhd, struct Key_Value **projinfo,
     struct gpj_datum dstruct;
     const char *ograttr;
 
+    *projinfo = NULL;
+    *projunits = NULL;
+
     if (hSRS == NULL)
 	goto default_to_xy;
 
@@ -837,6 +840,8 @@ int GPJ_osr_to_grass(struct Cell_head *cellhd, struct Key_Value **projinfo,
 	cellhd->proj = PROJECTION_XY;
 	cellhd->zone = 0;
     }
+    if (*projinfo)
+	G_free_key_value(*projinfo);
 
     *projinfo = NULL;
     *projunits = NULL;