aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2011-05-31 14:36:47 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2011-05-31 14:36:47 +0000
commit4f86e502dc5c4c8dd5d8ef834346f1982463937b (patch)
treea58abf1d5646a05d8de3aa08e43cf2318a80f3eb
parent284daac6710f8ac777eefd3accf5f6fcbfe1e6e9 (diff)
downloadPROJ-4f86e502dc5c4c8dd5d8ef834346f1982463937b.tar.gz
PROJ-4f86e502dc5c4c8dd5d8ef834346f1982463937b.zip
use pj_dalloc() instead of free in FREEUP for IGH (#112)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2046 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog7
-rw-r--r--src/PJ_igh.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03edf069..dbb5502d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-31 Frank Warmerdam <warmerdam@pobox.com>
+
+ * src/PJ_igh.c: use pj_dalloc() instead of free() in FREEUP (#112).
+
+ * src/projects.h: memset PJ structure to zeros after allocation to
+ avoid problems getting everything initialized properly (#112).
+
2011-05-23 Frank Warmerdam <warmerdam@pobox.com>
* nad/esri.extra, nad/other.extra: moved 900913 definition from
diff --git a/src/PJ_igh.c b/src/PJ_igh.c
index 6f8b6c40..b5ad7de2 100644
--- a/src/PJ_igh.c
+++ b/src/PJ_igh.c
@@ -116,8 +116,8 @@ FREEUP;
if (P) {
int i;
for (i = 0; i < 12; ++i)
- if (P->pj[i]) free(P->pj[i]);
- free(P);
+ if (P->pj[i]) pj_dalloc(P->pj[i]);
+ pj_dalloc(P);
}
}
ENTRY0(igh)