evaluate: fix hash expression maxval

It needs to account for the offset too.

Fixes: 9bee0c86f179 ("src: add offset attribute for hash expression")
Fixes: d4f9a8fb9e9a ("src: add offset attribute for numgen expression")
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/evaluate.c b/src/evaluate.c
index 35ef8a37617083011358c6d6caea1121f8aa8a0f..c24fee4c8acc314f62757031570faa86b60fe556 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1677,17 +1677,20 @@ static void expr_dtype_integer_compatible(struct eval_ctx *ctx,
 static int expr_evaluate_numgen(struct eval_ctx *ctx, struct expr **exprp)
 {
        struct expr *expr = *exprp;
+       unsigned int maxval;
 
        expr_dtype_integer_compatible(ctx, expr);
 
+       maxval = expr->numgen.mod + expr->numgen.offset - 1;
        __expr_set_context(&ctx->ectx, expr->dtype, expr->byteorder, expr->len,
-                          expr->numgen.mod - 1);
+                          maxval);
        return 0;
 }
 
 static int expr_evaluate_hash(struct eval_ctx *ctx, struct expr **exprp)
 {
        struct expr *expr = *exprp;
+       unsigned int maxval;
 
        expr_dtype_integer_compatible(ctx, expr);
 
@@ -1700,8 +1703,9 @@ static int expr_evaluate_hash(struct eval_ctx *ctx, struct expr **exprp)
          * expression to be hashed. Since this input is transformed to a 4 bytes
         * integer, restore context to the datatype that results from hashing.
         */
+       maxval = expr->hash.mod + expr->hash.offset - 1;
        __expr_set_context(&ctx->ectx, expr->dtype, expr->byteorder, expr->len,
-                          expr->hash.mod - 1);
+                          maxval);
 
        return 0;
 }