From f3d87b067714835b97cd2ae88fd631a5eecf1b8a Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 23 Dec 2015 18:08:43 -0500 Subject: [PATCH] valgrind findings --- c/mapping/mapper_stats1.c | 10 ++++++++++ c/mapping/mapper_stats2.c | 4 ++++ c/mapping/mapper_step.c | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/c/mapping/mapper_stats1.c b/c/mapping/mapper_stats1.c index a105bf9c8..cad6462de 100644 --- a/c/mapping/mapper_stats1.c +++ b/c/mapping/mapper_stats1.c @@ -502,6 +502,7 @@ static void stats1_count_emit(void* pvstate, char* value_field_name, char* stats static void stats1_count_free(stats1_t* pstats1) { stats1_count_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_count_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -553,6 +554,7 @@ static void stats1_mode_free(stats1_t* pstats1) { stats1_mode_state_t* pstate = pstats1->pvstate; lhmsi_free(pstate->pcounts_for_value); free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_mode_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -588,6 +590,7 @@ static void stats1_sum_emit(void* pvstate, char* value_field_name, char* stats1_ static void stats1_sum_free(stats1_t* pstats1) { stats1_sum_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_sum_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -629,6 +632,7 @@ static void stats1_mean_emit(void* pvstate, char* value_field_name, char* stats1 static void stats1_mean_free(stats1_t* pstats1) { stats1_mean_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_mean_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -679,6 +683,7 @@ static void stats1_stddev_var_meaneb_emit(void* pvstate, char* value_field_name, static void stats1_stddev_var_meaneb_free(stats1_t* pstats1) { stats1_stddev_var_meaneb_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } @@ -738,6 +743,7 @@ static void stats1_skewness_emit(void* pvstate, char* value_field_name, char* st static void stats1_skewness_free(stats1_t* pstats1) { stats1_skewness_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } @@ -790,6 +796,7 @@ static void stats1_kurtosis_emit(void* pvstate, char* value_field_name, char* st static void stats1_kurtosis_free(stats1_t* pstats1) { stats1_kurtosis_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_kurtosis_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -831,6 +838,7 @@ static void stats1_min_emit(void* pvstate, char* value_field_name, char* stats1_ static void stats1_min_free(stats1_t* pstats1) { stats1_min_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_min_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -868,6 +876,7 @@ static void stats1_max_emit(void* pvstate, char* value_field_name, char* stats1_ static void stats1_max_free(stats1_t* pstats1) { stats1_max_state_t* pstate = pstats1->pvstate; free(pstate->output_field_name); + free(pstate); free(pstats1); } static stats1_t* stats1_max_alloc(char* value_field_name, char* stats1_name, int allow_int_float) { @@ -914,6 +923,7 @@ static void stats1_percentile_free(stats1_t* pstats1) { pstate->reference_count--; if (pstate->reference_count == 0) { percentile_keeper_free(pstate->ppercentile_keeper); + free(pstate); free(pstats1); } } diff --git a/c/mapping/mapper_stats2.c b/c/mapping/mapper_stats2.c index c4fcdb81d..91a003b45 100644 --- a/c/mapping/mapper_stats2.c +++ b/c/mapping/mapper_stats2.c @@ -550,6 +550,7 @@ static void stats2_linreg_ols_free(stats2_t* pstats2) { free(pstate->b_output_field_name); free(pstate->n_output_field_name); free(pstate->fit_output_field_name); + free(pstate); free(pstats2); } @@ -623,6 +624,7 @@ static void stats2_logireg_free(stats2_t* pstats2) { free(pstate->fit_output_field_name); dvector_free(pstate->pxs); dvector_free(pstate->pys); + free(pstate); free(pstats2); } @@ -708,6 +710,7 @@ static void stats2_r2_emit(void* pvstate, char* name1, char* name2, lrec_t* pout static void stats2_r2_free(stats2_t* pstats2) { stats2_r2_state_t* pstate = pstats2->pvstate; free(pstate->r2_output_field_name); + free(pstate); free(pstats2); } static stats2_t* stats2_r2_alloc(char* value_field_name_1, char* value_field_name_2, char* stats2_name, int do_verbose) { @@ -921,6 +924,7 @@ static void stats2_corr_cov_free(stats2_t* pstats2) { free(pstate->corr_output_field_name); free(pstate->cov_output_field_name); + free(pstate); free(pstats2); } diff --git a/c/mapping/mapper_step.c b/c/mapping/mapper_step.c index f89e533e3..f4fc1d499 100644 --- a/c/mapping/mapper_step.c +++ b/c/mapping/mapper_step.c @@ -302,6 +302,7 @@ static void step_delta_nprocess(void* pvstate, mv_t* pnumv, lrec_t* prec) { static void step_delta_free(step_t* pstep) { step_delta_state_t* pstate = pstep->pvstate; free(pstate->output_field_name); + free(pstate); free(pstep); } static step_t* step_delta_alloc(char* input_field_name, int allow_int_float) { @@ -338,6 +339,7 @@ static void step_from_first_nprocess(void* pvstate, mv_t* pnumv, lrec_t* prec) { static void step_from_first_free(step_t* pstep) { step_from_first_state_t* pstate = pstep->pvstate; free(pstate->output_field_name); + free(pstate); free(pstep); } static step_t* step_from_first_alloc(char* input_field_name, int allow_int_float) { @@ -375,6 +377,7 @@ static void step_ratio_dprocess(void* pvstate, double fltv, lrec_t* prec) { static void step_ratio_free(step_t* pstep) { step_ratio_state_t* pstate = pstep->pvstate; free(pstate->output_field_name); + free(pstate); free(pstep); } static step_t* step_ratio_alloc(char* input_field_name, int allow_int_float) { @@ -407,6 +410,7 @@ static void step_rsum_nprocess(void* pvstate, mv_t* pnumv, lrec_t* prec) { static void step_rsum_free(step_t* pstep) { step_rsum_state_t* pstate = pstep->pvstate; free(pstate->output_field_name); + free(pstate); free(pstep); } static step_t* step_rsum_alloc(char* input_field_name, int allow_int_float) { @@ -438,6 +442,7 @@ static void step_counter_sprocess(void* pvstate, char* strv, lrec_t* prec) { static void step_counter_free(step_t* pstep) { step_counter_state_t* pstate = pstep->pvstate; free(pstate->output_field_name); + free(pstate); free(pstep); } static step_t* step_counter_alloc(char* input_field_name, int allow_int_float) {