aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
authorAl Viro <viro@zeniv.linux.org.uk>2007-07-10 17:40:02 -0400
committerJosh Triplett <josh@freedesktop.org>2007-07-14 12:16:52 -0700
commitd8a87b633cf12650272f964e855ef8e2605b34de (patch)
treebd2f15bf64bf2f2e2353388c493ad63b6639ec2f
parentb1bb92a1b27673988c8561b42b69e7acbc7cbaf3 (diff)
downloadsparse-dev-d8a87b633cf12650272f964e855ef8e2605b34de.tar.gz
[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 <viro@zeniv.linux.org.uk>
-rw-r--r--evaluate.c13
1 files 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), &ltype);
+ 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) {