isl_basic_set_opt: avoid invalid access on error path

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

diff --git a/basis_reduction_tab.c b/basis_reduction_tab.c
index c4075a7..6c7b040 100644 (file)
--- a/basis_reduction_tab.c
+++ b/basis_reduction_tab.c
@@ -1,5 +1,15 @@
+/*
+ * Copyright 2008-2009 Katholieke Universiteit Leuven
+ *
+ * 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
+ */
+
 #include <assert.h>
-#include "isl_seq.h"
+#include <isl_map_private.h>
+#include <isl/seq.h>
 #include "isl_tab.h"
 
 struct tab_lp {
@@ -20,14 +30,14 @@ struct tab_lp {
        int              is_fixed;
 };
 
-static struct tab_lp *init_lp(struct isl_basic_set *bset);
+static struct tab_lp *init_lp(struct isl_tab *tab);
 static void set_lp_obj(struct tab_lp *lp, isl_int *row, int dim);
 static int solve_lp(struct tab_lp *lp);
 static void get_obj_val(struct tab_lp* lp, mpq_t *F);
 static void delete_lp(struct tab_lp *lp);
 static int add_lp_row(struct tab_lp *lp, isl_int *row, int dim);
 static void get_alpha(struct tab_lp* lp, int row, mpq_t *alpha);
-static void del_lp_row(struct tab_lp *lp);
+static int del_lp_row(struct tab_lp *lp) WARN_UNUSED;
 static int cut_lp_to_hyperplane(struct tab_lp *lp, isl_int *row);
 
 #define GBR_LP                             struct tab_lp
@@ -58,44 +68,31 @@ static int cut_lp_to_hyperplane(struct tab_lp *lp, isl_int *row);
  * This could be optimized by first setting up a tableau for bset
  * and then performing the Cartesian product on the tableau.
  */
-static struct isl_tab *gbr_tab(struct isl_basic_set *bset,
-       struct isl_vec *row)
+static struct isl_tab *gbr_tab(struct isl_tab *tab, struct isl_vec *row)
 {
-       int i, j;
        unsigned dim;
-       struct isl_tab *tab;
+       struct isl_tab *prod;
 
-       if (!bset || !row)
+       if (!tab || !row)
                return NULL;
 
-       dim = isl_basic_set_total_dim(bset);
-       tab = isl_tab_alloc(bset->ctx, 2 * bset->n_ineq + 3 * dim + 1, 2 * dim, 0);
-
-       for (i = 0; i < 2; ++i) {
-               isl_seq_clr(row->el + 1 + (1 - i) * dim, dim);
-               for (j = 0; j < bset->n_ineq; ++j) {
-                       isl_int_set(row->el[0], bset->ineq[j][0]);
-                       isl_seq_cpy(row->el + 1 + i * dim,
-                                   bset->ineq[j] + 1, dim);
-                       tab = isl_tab_add_ineq(tab, row->el);
-                       if (!tab || tab->empty)
-                               return tab;
-               }
+       dim = tab->n_var;
+       prod = isl_tab_product(tab, tab);
+       if (isl_tab_extend_cons(prod, 3 * dim + 1) < 0) {
+               isl_tab_free(prod);
+               return NULL;
        }
-
-       return tab;
+       return prod;
 }
 
-static struct tab_lp *init_lp(struct isl_basic_set *bset)
+static struct tab_lp *init_lp(struct isl_tab *tab)
 {
        struct tab_lp *lp = NULL;
 
-       if (!bset)
+       if (!tab)
                return NULL;
 
-       isl_assert(bset->ctx, bset->n_eq == 0, return NULL);
-
-       lp = isl_calloc_type(bset->ctx, struct tab_lp);
+       lp = isl_calloc_type(tab->mat->ctx, struct tab_lp);
        if (!lp)
                return NULL;
 
@@ -104,9 +101,9 @@ static struct tab_lp *init_lp(struct isl_basic_set *bset)
        isl_int_init(lp->tmp);
        isl_int_init(lp->tmp2);
 
-       lp->dim = isl_basic_set_total_dim(bset);
+       lp->dim = tab->n_var;
 
-       lp->ctx = bset->ctx;
+       lp->ctx = tab->mat->ctx;
        isl_ctx_ref(lp->ctx);
 
        lp->stack = isl_alloc_array(lp->ctx, struct isl_tab_undo *, lp->dim);
@@ -114,7 +111,7 @@ static struct tab_lp *init_lp(struct isl_basic_set *bset)
        lp->row = isl_vec_alloc(lp->ctx, 1 + 2 * lp->dim);
        if (!lp->row)
                goto error;
-       lp->tab = gbr_tab(bset, lp->row);
+       lp->tab = gbr_tab(tab, lp->row);
        if (!lp->tab)
                goto error;
        lp->con_offset = lp->tab->n_con;
@@ -183,11 +180,13 @@ static int cut_lp_to_hyperplane(struct tab_lp *lp, isl_int *row)
                return -1;
 
        isl_int_neg(lp->row->el[0], lp->tmp);
-       lp->tab = isl_tab_add_eq(lp->tab, lp->row->el);
+       if (isl_tab_add_eq(lp->tab, lp->row->el) < 0)
+               return -1;
 
        isl_seq_cpy(lp->row->el + 1 + lp->dim, row, lp->dim);
        isl_seq_clr(lp->row->el + 1, lp->dim);
-       lp->tab = isl_tab_add_eq(lp->tab, lp->row->el);
+       if (isl_tab_add_eq(lp->tab, lp->row->el) < 0)
+               return -1;
 
        lp->con_offset += 2;
 
@@ -224,7 +223,8 @@ static int add_lp_row(struct tab_lp *lp, isl_int *row, int dim)
        isl_seq_cpy(lp->row->el + 1, row, lp->dim);
        isl_seq_neg(lp->row->el + 1 + lp->dim, row, lp->dim);
 
-       lp->tab = isl_tab_add_valid_eq(lp->tab, lp->row->el);
+       if (isl_tab_add_valid_eq(lp->tab, lp->row->el) < 0)
+               return -1;
 
        return lp->neq++;
 }
@@ -236,8 +236,8 @@ static void get_alpha(struct tab_lp* lp, int row, mpq_t *alpha)
        isl_int_set(mpq_denref(*alpha), lp->tab->dual->el[0]);
 }
 
-static void del_lp_row(struct tab_lp *lp)
+static int del_lp_row(struct tab_lp *lp)
 {
        lp->neq--;
-       isl_tab_rollback(lp->tab, lp->stack[lp->neq]);
+       return isl_tab_rollback(lp->tab, lp->stack[lp->neq]);
 }