From 5f583fe39ccfbb5c5981932f41c7980832f59418 Mon Sep 17 00:00:00 2001
From: James Noss <jnoss@stsci.edu>
Date: Fri, 19 May 2017 21:34:36 -0400
Subject: [PATCH] ACS CTE: allocateCTEParamsFast() needs to use free() & NOT
 delete()

relates to #135

Requires #147 to be merged into candidate-1.2.0 and then up-merged into
candidate-1.3.0. Without #147 this change will segfault

Signed-off-by: James Noss <jnoss@stsci.edu>
---
 ctegen2/ctehelpers.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ctegen2/ctehelpers.c b/ctegen2/ctehelpers.c
index 04772dec3..8421df9b1 100644
--- a/ctegen2/ctehelpers.c
+++ b/ctegen2/ctehelpers.c
@@ -99,7 +99,7 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
 
     void * tmp = NULL;
     tmp = newAndZero((void*)&pars->iz_data, pars->nScaleTableColumns, sizeof(*pars->iz_data));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
@@ -107,7 +107,7 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
         return OUT_OF_MEMORY;
     }
     tmp = newAndZero((void*)&pars->scale512, pars->nScaleTableColumns, sizeof(*pars->scale512));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
@@ -115,7 +115,7 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
         return OUT_OF_MEMORY;
     }
     tmp = newAndZero((void*)&pars->scale1024, pars->nScaleTableColumns, sizeof(*pars->scale1024));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
@@ -123,7 +123,7 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
         return OUT_OF_MEMORY;
     }
     tmp = newAndZero((void*)&pars->scale1536, pars->nScaleTableColumns, sizeof(*pars->scale1536));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
@@ -131,7 +131,7 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
         return OUT_OF_MEMORY;
     }
     tmp = newAndZero((void*)&pars->scale2048, pars->nScaleTableColumns, sizeof(*pars->scale2048));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
@@ -139,7 +139,7 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
         return OUT_OF_MEMORY;
     }
     tmp = newAndZero((void*)&pars->wcol_data, pars->nTraps, sizeof(*pars->wcol_data));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
@@ -147,14 +147,15 @@ int allocateCTEParamsFast(CTEParamsFast * pars)
         return OUT_OF_MEMORY;
     }
     tmp = newAndZero((void*)&pars->qlevq_data, pars->nTraps, sizeof(*pars->qlevq_data));
-    addPtr(&ptrReg, tmp, &delete);
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);
         trlerror ("Out of memory.\n");
         return OUT_OF_MEMORY;
     }
-    tmp = newAndZero((void*)& pars->dpdew_data, pars->nTraps, sizeof(*pars->dpdew_data));addPtr(&ptrReg, tmp, &delete);
+    tmp = newAndZero((void*)& pars->dpdew_data, pars->nTraps, sizeof(*pars->dpdew_data));
+    addPtr(&ptrReg, tmp, &free);
     if (!tmp)
     {
         freeOnExit(&ptrReg);