summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-03-31 02:16:25 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-03-31 02:23:57 +0300
commit96eec4f8a6721bc909415fd3c813757cc50eab7f (patch)
treef8615191612e8e50153b58bfd21ceea065471c5a
parent864038dab78afb01d7736faae0de58510d40e7c1 (diff)
downloadmicropython-96eec4f8a6721bc909415fd3c813757cc50eab7f.tar.gz
micropython-96eec4f8a6721bc909415fd3c813757cc50eab7f.zip
compile: Don't try to constant-fold division by zero.
The way it is, just crashes app. And optimizing to "raise ZeroDivisionError" is probably too much.
-rw-r--r--py/compile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/py/compile.c b/py/compile.c
index c6c6752d16..89ca380aab 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -145,7 +145,9 @@ mp_parse_node_t fold_constants(mp_parse_node_t pn) {
} else if (MP_PARSE_NODE_IS_TOKEN_KIND(pns->nodes[1], MP_TOKEN_OP_PERCENT)) {
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_SMALL_INT, python_modulo(arg0, arg1));
} else if (MP_PARSE_NODE_IS_TOKEN_KIND(pns->nodes[1], MP_TOKEN_OP_DBL_SLASH)) {
- pn = mp_parse_node_new_leaf(MP_PARSE_NODE_SMALL_INT, python_floor_divide(arg0, arg1));
+ if (arg1 != 0) {
+ pn = mp_parse_node_new_leaf(MP_PARSE_NODE_SMALL_INT, python_floor_divide(arg0, arg1));
+ }
} else {
// shouldn't happen
assert(0);