isl_basic_set_opt: avoid invalid access on error path

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

diff --git a/isl_mat.c b/isl_mat.c
index 02e10b6..cff8123 100644 (file)
--- a/isl_mat.c
+++ b/isl_mat.c
@@ -1,18 +1,18 @@
 /*
  * Copyright 2008-2009 Katholieke Universiteit Leuven
  *
- * 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, K.U.Leuven, Departement
  * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
  */
 
 #include <isl_ctx_private.h>
-#include <isl/dim.h>
+#include <isl/space.h>
 #include <isl/seq.h>
 #include <isl_mat_private.h>
 #include "isl_map_private.h"
-#include <isl_dim_private.h>
+#include <isl_space_private.h>
 
 isl_ctx *isl_mat_get_ctx(__isl_keep isl_mat *mat)
 {
@@ -909,6 +909,9 @@ struct isl_mat *isl_mat_transpose(struct isl_mat *mat)
        struct isl_mat *transpose = NULL;
        int i, j;
 
+       if (!mat)
+               return NULL;
+
        if (mat->n_col == mat->n_row) {
                mat = isl_mat_cow(mat);
                if (!mat)
@@ -1071,7 +1074,7 @@ struct isl_basic_set *isl_basic_set_preimage(struct isl_basic_set *bset,
                if (!bset)
                        goto error;
        } else if (mat->n_col < mat->n_row) {
-               bset->dim = isl_dim_cow(bset->dim);
+               bset->dim = isl_space_cow(bset->dim);
                if (!bset->dim)
                        goto error;
                bset->dim->n_out -= mat->n_row - mat->n_col;
@@ -1122,7 +1125,7 @@ struct isl_set *isl_set_preimage(struct isl_set *set, struct isl_mat *mat)
                        goto error;
        }
        if (mat->n_col != mat->n_row) {
-               set->dim = isl_dim_cow(set->dim);
+               set->dim = isl_space_cow(set->dim);
                if (!set->dim)
                        goto error;
                set->dim->n_out += mat->n_col;
@@ -1589,6 +1592,21 @@ __isl_give isl_mat *isl_mat_scale_down(__isl_take isl_mat *mat, isl_int m)
        return mat;
 }
 
+__isl_give isl_mat *isl_mat_scale_down_row(__isl_take isl_mat *mat, int row,
+       isl_int m)
+{
+       if (isl_int_is_one(m))
+               return mat;
+
+       mat = isl_mat_cow(mat);
+       if (!mat)
+               return NULL;
+
+       isl_seq_scale_down(mat->row[row], mat->row[row], m, mat->n_col);
+
+       return mat;
+}
+
 __isl_give isl_mat *isl_mat_normalize(__isl_take isl_mat *mat)
 {
        isl_int gcd;