isl_bound: plug memory leak

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

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 23a7981..2895838 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -450,7 +450,6 @@ static __isl_give isl_mat *initial_facet_constraint(__isl_keep isl_set *set)
 {
        struct isl_set *slice = NULL;
        struct isl_basic_set *face = NULL;
-       struct isl_mat *m, *U, *Q;
        int i;
        unsigned dim = isl_set_n_dim(set);
        int is_bound;
@@ -869,13 +868,18 @@ static int isl_basic_set_is_bounded(struct isl_basic_set *bset)
        struct isl_tab *tab;
        int bounded;
 
+       if (!bset)
+               return -1;
+       if (isl_basic_set_fast_is_empty(bset))
+               return 1;
+
        tab = isl_tab_from_recession_cone(bset);
        bounded = isl_tab_cone_is_bounded(tab);
        isl_tab_free(tab);
        return bounded;
 }
 
-static int isl_set_is_bounded(struct isl_set *set)
+int isl_set_is_bounded(__isl_keep isl_set *set)
 {
        int i;
 
@@ -2050,7 +2054,7 @@ static int is_bound(struct sh_data *data, struct isl_set *set, int j,
 
        isl_int_clear(opt);
 
-       return res == isl_lp_ok ? 1 :
+       return (res == isl_lp_ok || res == isl_lp_empty) ? 1 :
               res == isl_lp_unbounded ? 0 : -1;
 }
 
@@ -2171,11 +2175,11 @@ static struct isl_basic_set *add_bounds(struct isl_basic_set *bset,
        for (j = 0; j < set->p[i]->n_eq; ++j) {
                for (k = 0; k < 2; ++k) {
                        isl_seq_neg(set->p[i]->eq[j], set->p[i]->eq[j], 1+dim);
-                       add_bound(bset, data, set, i, set->p[i]->eq[j]);
+                       bset = add_bound(bset, data, set, i, set->p[i]->eq[j]);
                }
        }
        for (j = 0; j < set->p[i]->n_ineq; ++j)
-               add_bound(bset, data, set, i, set->p[i]->ineq[j]);
+               bset = add_bound(bset, data, set, i, set->p[i]->ineq[j]);
        return bset;
 }