Commit 72f6536

committed

Check table requested capacity limits before enabling unprotected mode.

Lua tables have limits and can overflow, which must be captured in protected mode.

1 parent 646827a commit 72f6536Copy full SHA for 72f6536

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ impl Drop for StackGuard {`
`88`	`88`	`#[inline(always)]`
`89`	`89`	`pub(crate) unsafe fn push_string(state: *mut ffi::lua_State, s: &[u8], protect: bool) -> Result<()> {`
`90`	`90`	`// Always use protected mode if the string is too long`
`91`		`- if protect \|\| s.len() >(1 << 30) {`
	`91`	`+ if protect \|\| s.len() >= const{1 << 30} {`
`92`	`92`	`protect_lua!(state, 0, 1, \|state\| {`
`93`	`93`	`ffi::lua_pushlstring(state, s.as_ptr() as *const c_char, s.len());`
`94`	`94`	`})`
`@@ -122,7 +122,7 @@ pub(crate) unsafe fn push_table(`
`122`	`122`	`) -> Result<()> {`
`123`	`123`	`let narr: c_int = narr.try_into().unwrap_or(c_int::MAX);`
`124`	`124`	`let nrec: c_int = nrec.try_into().unwrap_or(c_int::MAX);`
`125`		`- if protect {`
	`125`	`+ if protect \|\| narr >= const{1 << 30} \|\| nrec >= const{1 << 27}{`
`126`	`126`	`protect_lua!(state, 0, 1, \|state\| ffi::lua_createtable(state, narr, nrec))`
`127`	`127`	`} else {`
`128`	`128`	`ffi::lua_createtable(state, narr, nrec);`

Comments

(0)