Merge pull request #218 from jerebertho/memory_leak_mulmat

Author: ederc

src/msolve/hilbert.c

@@ -1765,8 +1765,7 @@ build_matrixn_colon(int32_t *lmb, long dquot, int32_t bld,
       exps[(count_not_lm + i*suppsize+j)*nv+nv-1]=bht->ev[hm[j]][evi[nv-1]];
     }
   }
-  tbr = initialize_basis(st);
-  tbr->ht = bht;
+  tbr = initialize_basis(st, bht);
 #if REDUCTION_ALLINONE
   import_input_data(tbr, st, 0, tobereduced, lens, exps, (void *)cfs, NULL);
   tbr->ld = tbr->lml  =  tobereduced;
@@ -2000,8 +1999,7 @@ build_matrixn_colon(int32_t *lmb, long dquot, int32_t bld,
 			     tbr, bht, evi, st, nv, maxdeg);
   }
 #else /* the shifts of phi are now reduced */
-  tbr = initialize_basis(st);
-  tbr->ht = bht;
+  tbr = initialize_basis(st, bht);
   import_input_data(tbr, st, count_not_lm, tobereduced, lens, exps, (void *)cfs, NULL);
   tbr->ld = tbr->lml  =  2*nv-2;
   /* printf ("%d imported\n",2*nv-2); */
@@ -2215,8 +2213,7 @@ build_matrixn_colon_no_zero(int32_t *lmb, long dquot, int32_t bld,
       exps[(count_not_lm + i*suppsize+j)*nv+nv-1]=bht->ev[hm[j]][evi[nv-1]];
     }
   }
-  tbr = initialize_basis(st);
-  tbr->ht = bht;
+  tbr = initialize_basis(st, bht);
   import_input_data(tbr, st, 0, tobereduced, lens, exps, (void *)cfs, NULL);
   tbr->ld = tbr->lml  =  tobereduced;
   /* printf ("%ld imported\n",tobereduced); */
@@ -2859,7 +2856,7 @@ static inline sp_matfglm_t * build_matrixn_from_bs(int32_t *lmb, long dquot,
 static inline void compute_modular_matrix(sp_matfglm_t *matrix,
         trace_det_fglm_mat_t trace_det,
         uint32_t prime){
-  uint32_t len_xn = matrix->nrows; 
+  uint32_t len_xn = matrix->nrows;
   uint32_t dquot = matrix->ncols;
   matrix->charac = prime;
   int32_t len2 = dquot - matrix->nrows;
@@ -2925,7 +2922,7 @@ static inline void build_matrixn_from_bs_trace_application(sp_matfglm_t *matrix,
 							   const int nv,
                                                            const long fc){
 
-  uint32_t len_xn = matrix->nrows; 
+  uint32_t len_xn = matrix->nrows;
   matrix->charac = fc;
   uint64_t len1 = dquot * matrix->nrows;
   int32_t len2 = dquot - matrix->nrows;
@@ -3078,9 +3075,8 @@ static inline void build_matrixn_unstable_from_bs_trace_application(sp_matfglm_t
   long count_not_lm = matrix->nnfs;
   if (count_not_lm) {
     md_t *md = copy_meta_data(st,fc);
-    tbr = initialize_basis(md);
+    tbr = initialize_basis(md, ht);
     exp_t *mul = (exp_t *)calloc(ht->evl, sizeof(exp_t));
-    tbr->ht = ht;
     /* reduction */
     import_input_data(tbr, md, 0, count_not_lm, lens_extra_nf, exps_extra_nf,
 		      (void *)cfs_extra_nf, NULL);
@@ -3260,6 +3256,7 @@ static inline void build_matrixn_unstable_from_bs_trace_application(sp_matfglm_t
   if (count_not_lm) {
     free_basis_without_hash_table(&tbr);
   }
+  free(evi);
   /* if(st->info_level){ */
   /*   fprintf(stderr, "[%lu, %lu], Free / Dense = %.2f%%\n", */
   /*           len0, len_xn, */
@@ -3646,12 +3643,11 @@ static inline sp_matfglm_t * build_matrixn_unstable_from_bs_trace(int32_t **bdiv
     exps_extra_nf[i*nv+nv-1]=lmb[j*nv+nv-1]+1;
     cfs_extra_nf[i]=1;
   }
-  bs_t* tbr;
+  bs_t *tbr;
   if (count_not_lm) {
-    md_t* md = copy_meta_data(st,fc);
-    tbr = initialize_basis(md);
+    md_t *md = copy_meta_data(st,fc);
+    tbr = initialize_basis(md, ht);
     exp_t *mul = (exp_t *)calloc(bs->ht->evl, sizeof(exp_t));
-    tbr->ht = ht;
     /* reduction */
     import_input_data(tbr, md, 0, count_not_lm, lens_extra_nf, exps_extra_nf,
 		      (void *)cfs_extra_nf, NULL);
@@ -3851,6 +3847,7 @@ static inline sp_matfglm_t * build_matrixn_unstable_from_bs_trace(int32_t **bdiv
         free(len_gb_xn);
         free(start_cf_gb_xn);
         free(div_xn);
+	free(evi);
         return NULL;
       }
     }
@@ -3879,6 +3876,7 @@ static inline sp_matfglm_t * build_matrixn_unstable_from_bs_trace(int32_t **bdiv
 	     "multiplication matrix                               ");
     fprintf (stdout,"%15.2f | %-13.2f\n",rt_fglm,crt_fglm);
   }
+  free(evi);
   return matrix;
 }