Changeset b15cf85 in git

Timestamp:

Dec 12, 2012, 10:19:10 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

31d8dc47fbf92b0720715abf728f23bfb49965bb

Parents:

14e634edb64741be0fbc04c9c89e8523cb0c1cc5

git-author:

Martin Lee <martinlee84@web.de>2012-12-12 10:19:10+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-12-12 15:53:48+01:00

Message:

fix: memory leak

Conflicts:

	factory/canonicalform.h

Location:

factory

Files:

• FLINTconvert.cc (modified) (1 diff)
• NTLconvert.cc (modified) (1 diff)
• canonicalform.cc (modified) (1 diff)
• canonicalform.h (modified) (2 diffs)
• cf_factory.cc (modified) (1 diff)
• cf_factory.h (modified) (1 diff)
• int_int.h (modified) (1 diff)

factory/FLINTconvert.cc

@@ -57 +57 @@
   {
     mpz_t gmp_val;
-    gmp_val[0]= *getmpi(f.getval());
+    f.mpzval(gmp_val);
     fmpz_set_mpz (result, gmp_val);
     mpz_clear (gmp_val);

factory/NTLconvert.cc

@@ -670 +670 @@
     char* stringtemp;
 
-    gmp_val[0]=*getmpi(f.getval());
+    f.mpzval (gmp_val);
     int l=mpz_sizeinbase(gmp_val,10)+2;
     stringtemp=(char*)Alloc(l);

factory/canonicalform.cc

@@ -68 +68 @@
     else
         return CanonicalForm( value->deepCopyObject() );
+}
+
+void
+CanonicalForm::mpzval(mpz_t val) const
+{
+    ASSERT (!is_imm (value) && value->levelcoeff() == IntegerDomain, "non-immediate integer expected");
+    getmpi (value, val);
 }
 //}}}

factory/canonicalform.h

@@ -20 +20 @@
 #include "cf_defs.h"
 #include "variable.h"
+#include <factory/cf_gmp.h>
 #include <factory/templates/ftmpl_list.h>
 #include <factory/templates/ftmpl_array.h>
@@ -80 +81 @@
     CanonicalForm deepCopy() const;
 
+    void mpzval(mpz_t val) const;
     // predicates
     CF_NO_INLINE bool isOne() const;

factory/cf_factory.cc

@@ -283 +283 @@
     return dummy;
 }
+
+void getmpi ( InternalCF * value, mpz_t mpi)
+{
+    ASSERT( ! is_imm( value ) && (value->levelcoeff() == IntegerDomain ), "illegal operation" );
+    mpz_init_set (mpi, ((InternalInteger*)value)->thempi);
+}
+

factory/cf_factory.h

@@ -35 +35 @@
 
 mpz_ptr getmpi ( InternalCF * value, bool symmetric = true );
+void getmpi ( InternalCF * value, mpz_t mpi);
 
 #endif /* ! INCL_CF_FACTORY_H */

factory/int_int.h

@@ -126 +126 @@
     friend void gmp_denominator ( const CanonicalForm & f, mpz_ptr result );
     friend mpz_ptr getmpi ( InternalCF * value, bool symmetric );
+    friend void getmpi ( InternalCF * value, mpz_t mpi);
 };