isl_convex_hull.c: extend: fix error handling

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

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 1fd8143..f783671 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -623,11 +623,13 @@ static struct isl_basic_set *extend(struct isl_basic_set *hull,
                hull_facet = isl_basic_set_add_equality(hull_facet, hull->ineq[i]);
                hull_facet = isl_basic_set_gauss(hull_facet, NULL);
                hull_facet = isl_basic_set_normalize_constraints(hull_facet);
-               if (!facet)
+               if (!facet || !hull_facet)
                        goto error;
                hull = isl_basic_set_cow(hull);
                hull = isl_basic_set_extend_dim(hull,
                        isl_dim_copy(hull->dim), 0, 0, facet->n_ineq);
+               if (!hull)
+                       goto error;
                for (j = 0; j < facet->n_ineq; ++j) {
                        for (f = 0; f < hull_facet->n_ineq; ++f)
                                if (isl_seq_eq(facet->ineq[j],
@@ -1808,6 +1810,9 @@ static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
 {
        struct isl_basic_set *convex_hull = NULL;
 
+       if (!set)
+               goto error;
+
        if (isl_set_n_dim(set) == 0) {
                convex_hull = isl_basic_set_universe(isl_dim_copy(set->dim));
                isl_set_free(set);
@@ -1816,9 +1821,6 @@ static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
        }
 
        set = isl_set_set_rational(set);
-
-       if (!set)
-               goto error;
        set = isl_set_coalesce(set);
        if (!set)
                goto error;