Changeset 7ea6fa1 in git

Timestamp:

May 29, 2017, 3:50:31 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

b43dedb12355a94284934bc6be0f8ce8a6a11ea9

Parents:

20a0c6102b11f5f44136dda953630e2b29d59bbf

Message:

newstruct: more CleanUp() for args

File:

• Singular/newstruct.cc (modified) (8 diffs)

Singular/newstruct.cc

@@ -371 +371 @@
               else WerrorS("ring of this member is not set and no basering found");
             }
+            a1->CleanUp();
+            a2->CleanUp();
             return r==NULL;
           }
@@ -439 +441 @@
             sh->next=r;
           }
+          //a1->CleanUp();// see memset above
+          a2->CleanUp();
           return FALSE;
         }
@@ -495 +499 @@
       res->data=(void *)a->blackbox_String(a,args->Data());
       res->rtyp=STRING_CMD;
+      args->CleanUp();
       return FALSE;
     }
@@ -506 +511 @@
   if (p!=NULL)
   {
-    BOOLEAN sl;
-    sleftv tmp;
-    memset(&tmp,0,sizeof(sleftv));
-    tmp.Copy(args);
     idrec hh;
     memset(&hh,0,sizeof(hh));
@@ -515 +516 @@
     hh.typ=PROC_CMD;
     hh.data.pinf=p->p;
-    sl=iiMake_proc(&hh,NULL,&tmp);
+    BOOLEAN sl=iiMake_proc(&hh,NULL,args);
+    args->CleanUp();
     if (sl) return TRUE;
     else
@@ -638 +640 @@
     f->m->Write(f,&(ll->m[i]));
   }
+  omFreeSize(rings,Ll+1);
   if (ring_changed)
     f->m->SetRing(f,save_ring,FALSE);
@@ -651 +654 @@
   leftv l=f->m->Read(f); // int: length of list
   int Ll=(int)(long)(l->data);
-  omFree(l);
+  omFreeBin(l,sleftv_bin);
   lists L=(lists)omAllocBin(slists_bin);
   L->Init(Ll+1);
@@ -658 +661 @@
     l=f->m->Read(f);
     memcpy(&(L->m[i]),l,sizeof(sleftv));
-    omFree(l);
+    omFreeBin(l,sleftv_bin);
   }
   //newstruct_desc n=(newstruct_desc)b->data;