From d8a87b633cf12650272f964e855ef8e2605b34de Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 10 Jul 2007 17:40:02 -0400 Subject: [PATCH] [PATCH] fix the sanity check in evaluate_ptr_sub() We are checking the wrong thing - the arguments have already degenerated, so we won't see SYM_FN there (or SYM_ARRAY, for that matter). That check should be done to the target of pointer, not to the pointer itself and it should simply check for SYM_FN - that's what we'll get there both from decayed functions _and_ pointers to functions. Signed-off-by: Al Viro --- evaluate.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/evaluate.c b/evaluate.c index 44a4da4a..8df2042a 100644 --- a/evaluate.c +++ b/evaluate.c @@ -785,24 +785,25 @@ static struct symbol *evaluate_ptr_sub(struct expression *expr) struct symbol *ltype, *rtype; struct expression *l = expr->left; struct expression *r = expr->right; + struct symbol *lbase, *rbase; - ltype = degenerate(l); - rtype = degenerate(r); + classify_type(degenerate(l), <ype); + classify_type(degenerate(r), &rtype); - ctype = ltype; + lbase = get_base_type(ltype); + rbase = get_base_type(rtype); typediff = type_difference(ltype, rtype, ~MOD_SIZE, ~MOD_SIZE); if (typediff) expression_error(expr, "subtraction of different types can't work (%s)", typediff); - examine_symbol_type(ctype); + ctype = lbase; /* Figure out the base type we point to */ if (ctype->type == SYM_NODE) ctype = ctype->ctype.base_type; - if (ctype->type != SYM_PTR && ctype->type != SYM_ARRAY) { + if (ctype->type == SYM_FN) { expression_error(expr, "subtraction of functions? Share your drugs"); return NULL; } - ctype = get_base_type(ctype); expr->ctype = ssize_t_ctype; if (ctype->bit_size > bits_in_char) { -- 2.11.4.GIT