CID #1453692 - Check stack overrun *AFTER* incrementing ctx->stack_depth

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index be2306a26f7792357c2cd7ce571a2d34fec8bd6b..7e2fb319370235cb1b5475110c8e30532a8e3e6c 100644 (file)
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -423,12 +423,13 @@ static int dict_process_flag_field(dict_tokenize_ctx_t *ctx, char *name, fr_type
 
 static int dict_ctx_push(dict_tokenize_ctx_t *ctx, fr_dict_attr_t const *da)
 {
+       ctx->stack_depth++;
+
        if (ctx->stack_depth >= MAX_STACK) {
                fr_strerror_printf_push("Attribute definitions are nested too deep.");
                return -1;
        }
 
-       ctx->stack_depth++;
        memset(&ctx->stack[ctx->stack_depth], 0, sizeof(ctx->stack[ctx->stack_depth]));
 
        ctx->stack[ctx->stack_depth].dict = ctx->stack[ctx->stack_depth - 1].dict;