diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2019-10-17 07:54:24 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2019-10-17 07:54:24 -0700 |
commit | e61bfc41ed9d522b8f679e758fe79f20b326b76b (patch) | |
tree | 187f81f89351609fb940056b858d8424c0e35ad9 /lib.h | |
parent | 24f59dc6fd38aeba9a10099c8b7a1243b18392a3 (diff) | |
download | txr-e61bfc41ed9d522b8f679e758fe79f20b326b76b.tar.gz txr-e61bfc41ed9d522b8f679e758fe79f20b326b76b.tar.bz2 txr-e61bfc41ed9d522b8f679e758fe79f20b326b76b.zip |
vm: prevent overflow of fixparam field in function.
Functions can only have 127 fixed parameters; some code
ignores this when assigning to the bitfield.
* lib.h (FIXPARAM_BITS, FIXPARAM_MAX): New preprocessor
symbols.
(struct func): Use FIXPARAM_BITS for defining fixparam and
optargs bitfields instead of hard-coded 7.
* lib.c (func_vm): Sanity check the fixparam and reqags
parameters: 0 <= reqargs <= fixparam <= FIXPARAM_MAX.
Diffstat (limited to 'lib.h')
-rw-r--r-- | lib.h | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -147,10 +147,13 @@ struct package { typedef struct args *varg; +#define FIXPARAM_BITS 7 +#define FIXPARAM_MAX ((1U << FIXPARAM_BITS) - 1) + struct func { obj_common; - unsigned fixparam : 7; /* total non-variadic parameters */ - unsigned optargs : 7; /* fixparam - optargs = required args */ + unsigned fixparam : FIXPARAM_BITS; /* total non-variadic parameters */ + unsigned optargs : FIXPARAM_BITS; /* fixparam - optargs = required args */ unsigned variadic : 1; unsigned : 1; unsigned functype : 16; |