Changeset ea66a97 in git

Timestamp:

Mar 3, 2010, 1:56:29 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

ae77062adc4e3f82b5ef276c021d7d6bfa30ca9e

Parents:

9fda8098fc505f72b3e5041b8a00a7c9a8c1ac50

Message:

memory leak in nlGCD fixed

git-svn-id: file:///usr/local/Singular/svn/trunk@12585 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/longrat.cc (modified) (2 diffs)

kernel/longrat.cc

@@ -1137 +1137 @@
   if (((!(SR_HDL(a) & SR_INT))&&(a->s<2))
   ||  ((!(SR_HDL(b) & SR_INT))&&(b->s<2))) return INT_TO_SR(1);
-  result=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG)
-  result->debug=123456;
-#endif
-  mpz_init(&result->z);
   if (SR_HDL(a) & SR_INT)
   {
@@ -1155 +1150 @@
   else
   {
+    result=(number)omAllocBin(rnumber_bin);
+    mpz_init(&result->z);
     mpz_gcd(&result->z,&a->z,&b->z);
-  }
-  result->s = 3;
-  if (mpz_size1(&result->z)<=MP_SMALL)
-  {
-    int ui=(int)mpz_get_si(&result->z);
-    if ((((ui<<3)>>3)==ui)
-    && (mpz_cmp_si(&result->z,(long)ui)==0))
-    {
-      mpz_clear(&result->z);
-      omFreeBin((ADDRESS)result, rnumber_bin);
-      result=INT_TO_SR(ui);
-    }
-  }
-#ifdef LDEBUG
-  nlTest(result);
-#endif
+    if (mpz_size1(&result->z)<=MP_SMALL)
+    {
+      int ui=(int)mpz_get_si(&result->z);
+      if ((((ui<<3)>>3)==ui)
+      && (mpz_cmp_si(&result->z,(long)ui)==0))
+      {
+        mpz_clear(&result->z);
+        omFreeBin((ADDRESS)result, rnumber_bin);
+        return INT_TO_SR(ui);
+      }
+    }
+    result->s = 3;
+  #ifdef LDEBUG
+    result->debug=123456;
+    nlTest(result);
+  #endif
+  }
   return result;
 }