moveconfig: replace unsafe eval with asteval
Commit b237d358b4
("moveconfig: expand simple expressions") added
support for expanding expressions in configs, but used the unsafe python
built-in "eval". This patch fixes this by replacing eval with the
asteval module.
Signed-off-by: Markus Klotzbuecher <mk@mkio.de>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
parent
080cc0b1b3
commit
b3192f48c1
@ -295,6 +295,7 @@ To see the complete list of supported options, run
|
||||
|
||||
"""
|
||||
|
||||
import asteval
|
||||
import collections
|
||||
import copy
|
||||
import difflib
|
||||
@ -808,10 +809,11 @@ def try_expand(line):
|
||||
return line
|
||||
|
||||
try:
|
||||
aeval = asteval.Interpreter( usersyms=SIZES, minimal=True )
|
||||
cfg, val = re.split("=", line)
|
||||
val= val.strip('\"')
|
||||
if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
|
||||
newval = hex(eval(val, SIZES))
|
||||
newval = hex(aeval(val))
|
||||
print("\tExpanded expression %s to %s" % (val, newval))
|
||||
return cfg+'='+newval
|
||||
except:
|
||||
|
Loading…
Reference in New Issue
Block a user