isl_basic_set_opt: avoid invalid access on error path

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

diff --git a/isl_vertices.c b/isl_vertices.c
index 535bc5f..efd534b 100644 (file)
--- a/isl_vertices.c
+++ b/isl_vertices.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2010      INRIA Saclay
  *
- * 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, INRIA Saclay - Ile-de-France,
  * Parc Club Orsay Universite, ZAC des vignes, 4 rue Jacques Monod,
@@ -101,7 +101,7 @@ static __isl_give isl_vertices *vertices_from_list(__isl_keep isl_basic_set *bse
 
        return vertices;
 error:
-       free(vertices);
+       isl_vertices_free(vertices);
        free_vertex_list(list);
        return NULL;
 }
@@ -199,7 +199,8 @@ static __isl_give isl_vertices *vertices_0D(__isl_keep isl_basic_set *bset)
                goto error;
        vertices->n_vertices = 1;
        vertices->v[0].vertex = isl_basic_set_copy(bset);
-       if (!vertices->v[0].vertex)
+       vertices->v[0].dom = isl_basic_set_params(isl_basic_set_copy(bset));
+       if (!vertices->v[0].vertex || !vertices->v[0].dom)
                goto error;
 
        vertices->c = isl_calloc_array(bset->ctx, struct isl_chamber, 1);
@@ -210,7 +211,7 @@ static __isl_give isl_vertices *vertices_0D(__isl_keep isl_basic_set *bset)
        vertices->c[0].vertices = isl_calloc_array(bset->ctx, int, 1);
        if (!vertices->c[0].vertices)
                goto error;
-       vertices->c[0].dom = isl_basic_set_params(isl_basic_set_copy(bset));
+       vertices->c[0].dom = isl_basic_set_copy(vertices->v[0].dom);
        if (!vertices->c[0].dom)
                goto error;
 
@@ -494,6 +495,7 @@ __isl_give isl_vertices *isl_basic_set_compute_vertices(
 
        return vertices;
 error:
+       free_vertex_list(list);
        isl_mat_free(facets);
        free(selection);
        free(snap);