Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
10e37839
Unverified
Commit
10e37839
authored
Feb 06, 2024
by
Yiheng Cao
Committed by
GitHub
Feb 05, 2024
Browse files
Fix potential integer overflow in getnum and fix the negation overflow in lua (#3634)
parent
6798f027
Changes
2
Hide whitespace changes
Inline
Side-by-side
components/lua/lua-5.3/ldebug.c
View file @
10e37839
...
...
@@ -132,10 +132,11 @@ static const char *upvalname (Proto *p, int uv) {
static
const
char
*
findvararg
(
CallInfo
*
ci
,
int
n
,
StkId
*
pos
)
{
int
nparams
=
getnumparams
(
clLvalue
(
ci
->
func
)
->
p
);
if
(
n
>=
cast_int
(
ci
->
u
.
l
.
base
-
ci
->
func
)
-
nparams
)
int
nvararg
=
cast_int
(
ci
->
u
.
l
.
base
-
ci
->
func
)
-
nparams
;
if
(
n
<=
-
nvararg
)
return
NULL
;
/* no such vararg */
else
{
*
pos
=
ci
->
func
+
nparams
+
n
;
*
pos
=
ci
->
func
+
nparams
-
n
;
return
"(*vararg)"
;
/* generic name for any vararg */
}
}
...
...
@@ -147,7 +148,7 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n,
StkId
base
;
if
(
isLua
(
ci
))
{
if
(
n
<
0
)
/* access to vararg values? */
return
findvararg
(
ci
,
-
n
,
pos
);
return
findvararg
(
ci
,
n
,
pos
);
else
{
base
=
ci
->
u
.
l
.
base
;
name
=
luaF_getlocalname
(
ci_func
(
ci
)
->
p
,
n
,
currentpc
(
ci
));
...
...
components/modules/struct.c
View file @
10e37839
...
...
@@ -93,12 +93,14 @@ typedef struct Header {
}
Header
;
static
int
getnum
(
const
char
**
fmt
,
int
df
)
{
static
int
getnum
(
lua_State
*
L
,
const
char
**
fmt
,
int
df
)
{
if
(
!
isdigit
((
unsigned
char
)
**
fmt
))
/* no number? */
return
df
;
/* return default value */
else
{
int
a
=
0
;
do
{
if
(
a
>
(
INT_MAX
/
10
)
||
a
*
10
>
(
INT_MAX
-
(
**
fmt
-
'0'
)))
luaL_error
(
L
,
"integral size overflow"
);
a
=
a
*
10
+
*
((
*
fmt
)
++
)
-
'0'
;
}
while
(
isdigit
((
unsigned
char
)
**
fmt
));
return
a
;
...
...
@@ -121,9 +123,9 @@ static size_t optsize (lua_State *L, char opt, const char **fmt) {
case
'd'
:
return
sizeof
(
double
);
#endif
case
'x'
:
return
1
;
case
'c'
:
return
getnum
(
fmt
,
1
);
case
'c'
:
return
getnum
(
L
,
fmt
,
1
);
case
'i'
:
case
'I'
:
{
int
sz
=
getnum
(
fmt
,
sizeof
(
int
));
int
sz
=
getnum
(
L
,
fmt
,
sizeof
(
int
));
if
(
sz
>
MAXINTSIZE
)
luaL_error
(
L
,
"integral size %d is larger than limit of %d"
,
sz
,
MAXINTSIZE
);
...
...
@@ -156,7 +158,7 @@ static void controloptions (lua_State *L, int opt, const char **fmt,
case
'>'
:
h
->
endian
=
BIG
;
return
;
case
'<'
:
h
->
endian
=
LITTLE
;
return
;
case
'!'
:
{
int
a
=
getnum
(
fmt
,
MAXALIGN
);
int
a
=
getnum
(
L
,
fmt
,
MAXALIGN
);
if
(
!
isp2
(
a
))
luaL_error
(
L
,
"alignment %d is not a power of 2"
,
a
);
h
->
align
=
a
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment