Changeset c4d7bc in git

Timestamp:

Apr 2, 2016, 7:52:19 AM (8 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

e0bdeb5142ac78b52e1fb069d1bda7ab5dce8565

Parents:

d1cc6662de56001c2e61d5c7c84a130b5011acca

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-04-02 07:52:19+02:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-12-15 12:17:07+01:00

Message:

fix: patch memory leaks in code from syzextra

File:

• kernel/GBEngine/syz4.cc (modified) (10 diffs)

kernel/GBEngine/syz4.cc

@@ -23 +23 @@
 static ideal m_idLeads_test;
 static ideal m_idTails_test;
+static ideal m_syzLeads_test;
 
 class CLCM_test: public std::vector<bool>
@@ -251 +252 @@
   int l;
   sBucketClearAdd(sum, &s, &l);
+  sBucketDestroy(&sum);
 #else   // BUCKETS == 2
   // nothing to do
@@ -406 +408 @@
 CReducerFinder_test::~CReducerFinder_test()
 {
-  for( CReducersHash::const_iterator it = m_hash.begin(); it != m_hash.end(); it++ )
-  {
-    const TReducers& v = it->second;
+  for( CReducersHash::iterator it = m_hash.begin(); it != m_hash.end(); it++ )
+  {
+    TReducers& v = it->second;
     for(TReducers::const_iterator vit = v.begin(); vit != v.end(); vit++ )
       delete const_cast<CLeadingTerm_test*>(*vit);
-  }
+    v.erase(v.begin(), v.end());
+  }
+  m_hash.erase(m_hash.begin(), m_hash.end());
 }
 
@@ -417 +421 @@
 {
   m_L = const_cast<ideal>(L); // for debug anyway
+  for( CReducersHash::iterator it = m_hash.begin(); it != m_hash.end(); it++ )
+  {
+    TReducers& v = it->second;
+    for(TReducers::const_iterator vit = v.begin(); vit != v.end(); vit++ )
+      delete const_cast<CLeadingTerm_test*>(*vit);
+    v.erase(v.begin(), v.end());
+  }
+  m_hash.erase(m_hash.begin(), m_hash.end());
   m_hash.clear();
   if( L != NULL )
@@ -422 +434 @@
 }
 
-CReducerFinder_test m_checker(NULL);
-CReducerFinder_test m_div(NULL);
+static CReducerFinder_test m_checker(NULL);
+static CReducerFinder_test m_div(NULL);
 
 class CDivisorEnumerator_test
@@ -610 +622 @@
   const int c = p_GetComp(s, r) - 1;
   const poly t = TraverseTail_test(b, c);
+  pDelete(&b);
   if( t != NULL )
     s = p_Add_q(s, t, r);
@@ -808 +821 @@
 static void setGlobalVariables(const resolvente res, const int index)
 {
+    idDelete(&m_idLeads_test);
+    idDelete(&m_idTails_test);
+    idDelete(&m_syzLeads_test);
     m_idLeads_test = idCopy(res[index-1]);
     m_idTails_test = idInit(IDELEMS(res[index-1]), 1);
@@ -816 +832 @@
     m_div.redefine(m_idLeads_test);
     m_lcm.redefine(m_idLeads_test);
-    ideal m_syzLeads_test = idCopy(res[index]);
+    m_syzLeads_test = idCopy(res[index]);
     for (int i = IDELEMS(res[index])-1; i >= 0; i--) {
         pDelete(&m_syzLeads_test->m[i]->next);
+        m_syzLeads_test->m[i]->next = NULL;
     }
     m_checker.redefine(m_syzLeads_test);
@@ -848 +865 @@
     for (int j = res[index]->ncols-1; j >= 0; j--) {
         p = res[index]->m[j];
+        pDelete(&res[index]->m[j]->next);
         p->next = NULL;
-        pDelete(&res[index]->m[j]->next);
         res[index]->m[j]->next = TraverseNF_test(p, NULL);
     }
@@ -913 +930 @@
     length = computeResolution(res, length, syzHead);
     sortPolys(res, length);
+
+    idDelete(&m_idLeads_test);
+    idDelete(&m_idTails_test);
+    idDelete(&m_syzLeads_test);
+
     result->fullres = res;
     result->length = length+1;