Changeset 779a21 in git

Timestamp:

Mar 22, 2000, 6:14:56 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3c49a46bb44fc187a6364954e04cc7833458140b

Parents:

4301a7d4e7af18768ce85c52e3d7744fa3c51348

Message:

*hannes: NULL access fixed


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

File:

• Singular/polys-impl.cc (modified) (7 diffs)

Singular/polys-impl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.cc,v 1.38 2000-03-22 17:07:25 Singular Exp $ */
+/* $Id: polys-impl.cc,v 1.39 2000-03-22 17:14:56 Singular Exp $ */
 
 /***************************************************************
@@ -1004 +1004 @@
   int i,j;
   // check fur syzcomp - special case, not visible in currRing->order
-  if ((currRing->typ[0].ord_typ==ro_syz)
+  if ((currRing->typ!=NULL)
+  && (currRing->typ[0].ord_typ==ro_syz)
   && (pGetComp(p1)!=pGetComp(p2)))
   {
@@ -1087 +1088 @@
         r=rComp_deg(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
-        r=rComp_lex(p1,p2,i);
+        r=rComp_lex(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
         break;
@@ -1101 +1102 @@
         r= -rComp_deg(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
-        r=rComp_lex(p1,p2,i);
+        r=rComp_lex(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
         break;
@@ -1115 +1116 @@
         r=rComp_a(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
-        r=rComp_lex(p1,p2,i);
+        r=rComp_lex(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
         break;
@@ -1129 +1130 @@
         r= -rComp_a(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
-        r=rComp_lex(p1,p2,i);
+        r=rComp_lex(p1,p2,i);
         if (r!=0) { assume(r==rr);return rr;}
         break;
@@ -1139 +1140 @@
       case ringorder_s:
         /*  ro_syz */
-        // shall not appear:
-        assume(0);
-        #if 0
-        if ((pGetComp(p1) > pDBsyzComp) && (pGetComp(p2) > pDBsyzComp)) break;
-        if ((pGetComp(p1) <= pDBsyzComp) && (pGetComp(p2) <= pDBsyzComp)) break;
-        if (pGetComp(p1) <= pDBsyzComp) { assume(rr==1); return rr;}
-        /* if (pGetComp(p2) <= pDBsyzComp) */ { assume (rr== -1); return rr; }
-        #endif
-        return rr;
+        // shall not appear:
+        assume(0);
+        #if 0
+        if ((pGetComp(p1) > pDBsyzComp) && (pGetComp(p2) > pDBsyzComp)) break;
+        if ((pGetComp(p1) <= pDBsyzComp) && (pGetComp(p2) <= pDBsyzComp)) break;
+        if (pGetComp(p1) <= pDBsyzComp) { assume(rr==1); return rr;}
+        /* if (pGetComp(p2) <= pDBsyzComp) */ { assume (rr== -1); return rr; }
+        #endif
+        return rr;
 
       case ringorder_unspec: