diff options
| author | Mike Pall <mike> | 2014-02-20 15:09:02 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-02-20 15:09:02 +0100 |
| commit | 2863b1095699404693a50082dd8d19b6c4cad99f (patch) | |
| tree | 4c4626f4b8a342773fdd961f46eb39dc43616e5e /src/lj_cparse.c | |
| parent | 46ce03464b67935fb84ace1d0710a7f3cc62e132 (diff) | |
| parent | 998651fcdafc8b6f3d922e1e60864fec83409118 (diff) | |
| download | luajit-2863b1095699404693a50082dd8d19b6c4cad99f.tar.gz luajit-2863b1095699404693a50082dd8d19b6c4cad99f.tar.bz2 luajit-2863b1095699404693a50082dd8d19b6c4cad99f.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_cparse.c')
| -rw-r--r-- | src/lj_cparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_cparse.c b/src/lj_cparse.c index 05767e61..fd998adc 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c | |||
| @@ -1244,7 +1244,7 @@ static void cp_struct_layout(CPState *cp, CTypeID sid, CTInfo sattr) | |||
| 1244 | sinfo |= (info & (CTF_QUAL|CTF_VLA)); /* Merge pseudo-qualifiers. */ | 1244 | sinfo |= (info & (CTF_QUAL|CTF_VLA)); /* Merge pseudo-qualifiers. */ |
| 1245 | 1245 | ||
| 1246 | /* Check for size overflow and determine alignment. */ | 1246 | /* Check for size overflow and determine alignment. */ |
| 1247 | if (sz >= 0x20000000u || bofs + csz < bofs) { | 1247 | if (sz >= 0x20000000u || bofs + csz < bofs || (info & CTF_VLA)) { |
| 1248 | if (!(sz == CTSIZE_INVALID && ctype_isarray(info) && | 1248 | if (!(sz == CTSIZE_INVALID && ctype_isarray(info) && |
| 1249 | !(sinfo & CTF_UNION))) | 1249 | !(sinfo & CTF_UNION))) |
| 1250 | cp_err(cp, LJ_ERR_FFI_INVSIZE); | 1250 | cp_err(cp, LJ_ERR_FFI_INVSIZE); |