From ae87d9697ce445eaa3221750fc5e18553f879498 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 30 May 2016 15:59:48 +0200 Subject: [PATCH 1/1] [xbt] xbt_assert(level >= 0) in xbt_lib --- src/xbt/lib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/xbt/lib.c b/src/xbt/lib.c index cf672028c8..6709ed4a90 100644 --- a/src/xbt/lib.c +++ b/src/xbt/lib.c @@ -6,6 +6,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include #include #include #include @@ -53,6 +54,7 @@ int xbt_lib_add_level(xbt_lib_t lib, void_f_pvoid_t free_f) void xbt_lib_set(xbt_lib_t lib, const char *key, int level, void *obj) { XBT_DEBUG("xbt_lib_set key '%s:%d' with object %p", key, level, obj); + xbt_assert(level >= 0); void **elts = xbt_dict_get_or_null(lib->dict, key); if (!elts) { elts = xbt_new0(void *, lib->levels); @@ -68,6 +70,7 @@ void xbt_lib_set(xbt_lib_t lib, const char *key, int level, void *obj) void xbt_lib_unset(xbt_lib_t lib, const char *key, int level, int invoke_callback) { + xbt_assert(level >= 0); void **elts = xbt_dict_get_or_null(lib->dict, key); if (!elts) { XBT_WARN("no key %s", key); @@ -100,6 +103,7 @@ void xbt_lib_unset(xbt_lib_t lib, const char *key, int level, int invoke_callbac void *xbt_lib_get_or_null(xbt_lib_t lib, const char *key, int level) { + xbt_assert(level >= 0); void **elts = xbt_dict_get_or_null(lib->dict, key); return elts ? elts[level] : NULL; } @@ -109,7 +113,9 @@ xbt_dictelm_t xbt_lib_get_elm_or_null(xbt_lib_t lib, const char *key) return xbt_dict_get_elm_or_null(lib->dict, key); } -void *xbt_lib_get_level(xbt_dictelm_t elm, int level){ +void *xbt_lib_get_level(xbt_dictelm_t elm, int level) +{ + xbt_assert(level >= 0); void **elts = elm->content; return elts ? elts[level] : NULL; } -- 2.20.1