isl_basic_set_opt: avoid invalid access on error path

[platform/upstream/isl.git] / isl_equalities.c

diff --git a/isl_equalities.c b/isl_equalities.c
index fa8ee58..4447d9b 100644 (file)
--- a/isl_equalities.c
+++ b/isl_equalities.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2009 Katholieke Universiteit Leuven
  *
- * Use of this software is governed by the GNU LGPLv2.1 license
+ * Use of this software is governed by the MIT license
  *
  * Written by Sven Verdoolaege, K.U.Leuven, Departement
  * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
@@ -575,7 +575,7 @@ int isl_basic_set_dim_residue_class(struct isl_basic_set *bset,
        if (!bset || !modulo || !residue)
                return -1;
 
-       if (isl_basic_set_fast_dim_is_fixed(bset, pos, residue)) {
+       if (isl_basic_set_plain_dim_is_fixed(bset, pos, residue)) {
                isl_int_set_si(*modulo, 0);
                return 0;
        }
@@ -670,20 +670,15 @@ int isl_set_dim_residue_class(struct isl_set *set,
        isl_int_init(r);
 
        for (i = 1; i < set->n; ++i) {
-               if (isl_basic_set_dim_residue_class(set->p[0], pos, &m, &r) < 0)
+               if (isl_basic_set_dim_residue_class(set->p[i], pos, &m, &r) < 0)
                        goto error;
                isl_int_gcd(*modulo, *modulo, m);
+               isl_int_sub(m, *residue, r);
+               isl_int_gcd(*modulo, *modulo, m);
                if (!isl_int_is_zero(*modulo))
                        isl_int_fdiv_r(*residue, *residue, *modulo);
                if (isl_int_is_one(*modulo))
                        break;
-               if (!isl_int_is_zero(*modulo))
-                       isl_int_fdiv_r(r, r, *modulo);
-               if (isl_int_ne(*residue, r)) {
-                       isl_int_set_si(*modulo, 1);
-                       isl_int_set_si(*residue, 0);
-                       break;
-               }
        }
 
        isl_int_clear(m);