diff options
| author | Michael Matz <matz@suse.de> | 2015-03-09 00:19:59 +0100 |
|---|---|---|
| committer | Michael Matz <matz@suse.de> | 2015-03-09 00:19:59 +0100 |
| commit | 50899e30abf3cbd71a09ecc03b2e172f6ba5d4f4 (patch) | |
| tree | 2451264d2ed2950fd232f5d4d4fed8ffe2f6538e /i386-gen.c | |
| parent | d73b48840115f0adc97d6a9e6fe2aeb88fcbfbdd (diff) | |
| download | tinycc-50899e30abf3cbd71a09ecc03b2e172f6ba5d4f4.tar.gz tinycc-50899e30abf3cbd71a09ecc03b2e172f6ba5d4f4.tar.bz2 | |
Fix stack overwrite on structure return
The common code to move a returned structure packed into
registers into memory on the caller side didn't take the
register size into account when allocating local storage,
so sometimes that lead to stack overwrites (e.g. in 73_arm64.c),
on x86_64. This fixes it by generally making gfunc_sret also return
the register size.
Diffstat (limited to 'i386-gen.c')
| -rw-r--r-- | i386-gen.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -376,12 +376,13 @@ static uint8_t fastcallw_regs[2] = { TREG_ECX, TREG_EDX }; /* Return the number of registers needed to return the struct, or 0 if returning via struct pointer. */ -ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, int *ret_align) +ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, int *ret_align, int *regsize) { #ifdef TCC_TARGET_PE int size, align; *ret_align = 1; // Never have to re-align return values for x86 + *regsize = 4; size = type_size(vt, &align); if (size > 8) { return 0; |
