isl_basic_set_opt: avoid invalid access on error path

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

diff --git a/isl_ctx.c b/isl_ctx.c
index 4ea7a70..6f02684 100644 (file)
--- a/isl_ctx.c
+++ b/isl_ctx.c
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -9,21 +9,44 @@
 
 #include <isl_ctx_private.h>
 #include <isl/vec.h>
+#include <isl_options_private.h>
 
-static struct isl_options *find_nested_options(struct isl_arg *arg,
-       void *opt, struct isl_arg *wanted)
+void isl_handle_error(isl_ctx *ctx, enum isl_error error, const char *msg,
+       const char *file, int line)
+{
+       if (!ctx)
+               return;
+
+       isl_ctx_set_error(ctx, error);
+
+       switch (ctx->opt->on_error) {
+       case ISL_ON_ERROR_WARN:
+               fprintf(stderr, "%s:%d: %s\n", file, line, msg);
+               return;
+       case ISL_ON_ERROR_CONTINUE:
+               return;
+       case ISL_ON_ERROR_ABORT:
+               fprintf(stderr, "%s:%d: %s\n", file, line, msg);
+               abort();
+               return;
+       }
+}
+
+static struct isl_options *find_nested_options(struct isl_args *args,
+       void *opt, struct isl_args *wanted)
 {
        int i;
        struct isl_options *options;
 
-       if (arg == wanted)
+       if (args == wanted)
                return opt;
 
-       for (i = 0; arg[i].type != isl_arg_end; ++i) {
-               if (arg[i].type != isl_arg_child)
+       for (i = 0; args->args[i].type != isl_arg_end; ++i) {
+               if (args->args[i].type != isl_arg_child)
                        continue;
-               options = find_nested_options(arg[i].u.child.child,
-                               *(void **)(((char *)opt) + arg->offset), wanted);
+               options = find_nested_options(args->args[i].u.child.child,
+                           *(void **)(((char *)opt) + args->args[i].offset),
+                           wanted);
                if (options)
                        return options;
        }
@@ -31,20 +54,22 @@ static struct isl_options *find_nested_options(struct isl_arg *arg,
        return NULL;
 }
 
-static struct isl_options *find_nested_isl_options(struct isl_arg *arg,
+static struct isl_options *find_nested_isl_options(struct isl_args *args,
        void *opt)
 {
-       return find_nested_options(arg, opt, isl_options_arg);
+       return find_nested_options(args, opt, &isl_options_args);
 }
 
-void *isl_ctx_peek_options(isl_ctx *ctx, struct isl_arg *arg)
+void *isl_ctx_peek_options(isl_ctx *ctx, struct isl_args *args)
 {
        if (!ctx)
                return NULL;
-       return find_nested_options(ctx->user_arg, ctx->user_opt, arg);
+       if (args == &isl_options_args)
+               return ctx->opt;
+       return find_nested_options(ctx->user_args, ctx->user_opt, args);
 }
 
-isl_ctx *isl_ctx_alloc_with_options(struct isl_arg *arg, void *user_opt)
+isl_ctx *isl_ctx_alloc_with_options(struct isl_args *args, void *user_opt)
 {
        struct isl_ctx *ctx = NULL;
        struct isl_options *opt = NULL;
@@ -53,7 +78,7 @@ isl_ctx *isl_ctx_alloc_with_options(struct isl_arg *arg, void *user_opt)
        if (!user_opt)
                return NULL;
 
-       opt = find_nested_isl_options(arg, user_opt);
+       opt = find_nested_isl_options(args, user_opt);
        if (!opt) {
                opt = isl_options_new_with_defaults();
                if (!opt)
@@ -65,14 +90,14 @@ isl_ctx *isl_ctx_alloc_with_options(struct isl_arg *arg, void *user_opt)
        if (!ctx)
                goto error;
 
-       if (isl_hash_table_init(ctx, &ctx->name_hash, 0))
+       if (isl_hash_table_init(ctx, &ctx->id_table, 0))
                goto error;
 
        ctx->stats = isl_calloc_type(ctx, struct isl_stats);
        if (!ctx->stats)
                goto error;
 
-       ctx->user_arg = arg;
+       ctx->user_args = args;
        ctx->user_opt = user_opt;
        ctx->opt_allocated = opt_allocated;
        ctx->opt = opt;
@@ -93,12 +118,13 @@ isl_ctx *isl_ctx_alloc_with_options(struct isl_arg *arg, void *user_opt)
        isl_int_init(ctx->normalize_gcd);
 
        ctx->n_cached = 0;
+       ctx->n_miss = 0;
 
        ctx->error = isl_error_none;
 
        return ctx;
 error:
-       isl_arg_free(arg, user_opt);
+       isl_args_free(args, user_opt);
        if (opt_allocated)
                isl_options_free(opt);
        free(ctx);
@@ -111,7 +137,7 @@ struct isl_ctx *isl_ctx_alloc()
 
        opt = isl_options_new_with_defaults();
 
-       return isl_ctx_alloc_with_options(isl_options_arg, opt);
+       return isl_ctx_alloc_with_options(&isl_options_args, opt);
 }
 
 void isl_ctx_ref(struct isl_ctx *ctx)
@@ -129,17 +155,21 @@ void isl_ctx_free(struct isl_ctx *ctx)
 {
        if (!ctx)
                return;
-       isl_assert(ctx, ctx->ref == 0, return);
-       isl_hash_table_clear(&ctx->name_hash);
+       if (ctx->ref != 0)
+               isl_die(ctx, isl_error_invalid,
+                       "isl_ctx freed, but some objects still reference it",
+                       return);
+
+       isl_hash_table_clear(&ctx->id_table);
        isl_blk_clear_cache(ctx);
        isl_int_clear(ctx->zero);
        isl_int_clear(ctx->one);
        isl_int_clear(ctx->two);
        isl_int_clear(ctx->negone);
        isl_int_clear(ctx->normalize_gcd);
-       isl_arg_free(ctx->user_arg, ctx->user_opt);
+       isl_args_free(ctx->user_args, ctx->user_opt);
        if (ctx->opt_allocated)
-               free(ctx->opt);
+               isl_options_free(ctx->opt);
        free(ctx->stats);
        free(ctx);
 }
@@ -183,3 +213,10 @@ int isl_ctx_aborted(isl_ctx *ctx)
 {
        return ctx ? ctx->abort : -1;
 }
+
+int isl_ctx_parse_options(isl_ctx *ctx, int argc, char **argv, unsigned flags)
+{
+       if (!ctx)
+               return -1;
+       return isl_args_parse(ctx->user_args, argc, argv, ctx->user_opt, flags);
+}