isl_basic_map_gist: avoid invalid access on error path

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

diff --git a/isl_input.c b/isl_input.c
index 3450d87..a19fe6e 100644 (file)
--- a/isl_input.c
+++ b/isl_input.c
@@ -343,6 +343,7 @@ static __isl_give isl_pw_aff *accept_affine_factor(struct isl_stream *s,
                if (pos < 0)
                        goto error;
                if (pos >= n) {
+                       vars_drop(v, v->n - n);
                        isl_stream_error(s, tok, "unknown identifier");
                        goto error;
                }
@@ -700,7 +701,7 @@ static __isl_give isl_pw_aff_list *accept_affine_list(struct isl_stream *s,
                list = isl_pw_aff_list_concat(list,
                                isl_pw_aff_list_from_pw_aff(pwaff));
                if (!list)
-                       return NULL;
+                       goto error;
        }
 
        isl_space_free(dim);
@@ -1043,6 +1044,8 @@ static __isl_give isl_map *read_map_tuple(struct isl_stream *s,
 
        n = isl_multi_pw_aff_dim(tuple, isl_dim_out);
        space = isl_space_range(isl_multi_pw_aff_get_space(tuple));
+       if (!space)
+               goto error;
 
        if (type == isl_dim_param) {
                if (isl_space_has_tuple_name(space, isl_dim_set) ||
@@ -1116,28 +1119,24 @@ static __isl_give isl_set *construct_constraints(
 {
        isl_set *cond;
 
+       left = isl_pw_aff_list_copy(left);
+       right = isl_pw_aff_list_copy(right);
        if (rational) {
                left = isl_pw_aff_list_set_rational(left);
                right = isl_pw_aff_list_set_rational(right);
        }
        if (type == ISL_TOKEN_LE)
-               cond = isl_pw_aff_list_le_set(isl_pw_aff_list_copy(left),
-                                             isl_pw_aff_list_copy(right));
+               cond = isl_pw_aff_list_le_set(left, right);
        else if (type == ISL_TOKEN_GE)
-               cond = isl_pw_aff_list_ge_set(isl_pw_aff_list_copy(left),
-                                             isl_pw_aff_list_copy(right));
+               cond = isl_pw_aff_list_ge_set(left, right);
        else if (type == ISL_TOKEN_LT)
-               cond = isl_pw_aff_list_lt_set(isl_pw_aff_list_copy(left),
-                                             isl_pw_aff_list_copy(right));
+               cond = isl_pw_aff_list_lt_set(left, right);
        else if (type == ISL_TOKEN_GT)
-               cond = isl_pw_aff_list_gt_set(isl_pw_aff_list_copy(left),
-                                             isl_pw_aff_list_copy(right));
+               cond = isl_pw_aff_list_gt_set(left, right);
        else if (type == ISL_TOKEN_NE)
-               cond = isl_pw_aff_list_ne_set(isl_pw_aff_list_copy(left),
-                                             isl_pw_aff_list_copy(right));
+               cond = isl_pw_aff_list_ne_set(left, right);
        else
-               cond = isl_pw_aff_list_eq_set(isl_pw_aff_list_copy(left),
-                                             isl_pw_aff_list_copy(right));
+               cond = isl_pw_aff_list_eq_set(left, right);
 
        return isl_set_intersect(set, cond);
 }
@@ -2586,7 +2585,6 @@ static __isl_give isl_set *read_aff_domain(struct isl_stream *s,
 error:
        if (tok)
                isl_stream_push_token(s, tok);
-       vars_free(v);
        isl_set_free(dom);
        return NULL;
 }