adafruit · tannewt · Mar 3, 2020 · Mar 1, 2020 · Mar 1, 2020 · Mar 2, 2020
diff --git a/locale/ID.po b/locale/ID.po
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
diff --git a/locale/de_DE.po b/locale/de_DE.po
diff --git a/locale/en_US.po b/locale/en_US.po
diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po
diff --git a/locale/es.po b/locale/es.po
diff --git a/locale/fil.po b/locale/fil.po
diff --git a/locale/fr.po b/locale/fr.po
diff --git a/locale/it_IT.po b/locale/it_IT.po
diff --git a/locale/ko.po b/locale/ko.po
diff --git a/locale/pl.po b/locale/pl.po
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
diff --git a/py/compile.c b/py/compile.c
@@ -1711,6 +1711,16 @@ STATIC void compile_yield_from(compiler_t *comp) {
 }
 
 #if MICROPY_PY_ASYNC_AWAIT
+STATIC bool compile_require_async_context(compiler_t *comp, mp_parse_node_struct_t *pns) {
+    int scope_flags = comp->scope_cur->scope_flags;
+    if(scope_flags & MP_SCOPE_FLAG_GENERATOR) {
+        return true;
+    }
+    compile_syntax_error(comp, (mp_parse_node_t)pns,
+        translate("'async for' or 'async with' outside async function"));
+    return false;
+}
+
 STATIC void compile_await_object_method(compiler_t *comp, qstr method) {
     EMIT_ARG(load_method, method, false);
     EMIT_ARG(call_method, 0, 0, 0);
@@ -1720,6 +1730,10 @@ STATIC void compile_await_object_method(compiler_t *comp, qstr method) {
 STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // comp->break_label |= MP_EMIT_BREAK_FROM_FOR;
 
+    if(!compile_require_async_context(comp, pns)) {
+        return;
+    }
+
     qstr context = MP_PARSE_NODE_LEAF_ARG(pns->nodes[1]);
     uint while_else_label = comp_next_label(comp);
     uint try_exception_label = comp_next_label(comp);
@@ -1857,6 +1871,9 @@ STATIC void compile_async_with_stmt_helper(compiler_t *comp, int n, mp_parse_nod
 }
 
 STATIC void compile_async_with_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
+    if(!compile_require_async_context(comp, pns)) {
+        return;
+    }
     // get the nodes for the pre-bit of the with (the a as b, c as d, ... bit)
     mp_parse_node_t *nodes;
     int n = mp_parse_node_extract_list(&pns->nodes[0], PN_with_stmt_list, &nodes);

diff --git a/py/parse.c b/py/parse.c
@@ -477,6 +477,9 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
     mp_parse_node_t pn;
     mp_lexer_t *lex = parser->lexer;
     if (lex->tok_kind == MP_TOKEN_NAME) {
+        if(lex->vstr.len >= (1 << (8 * MICROPY_QSTR_BYTES_IN_LEN))) {
+            mp_raise_msg(&mp_type_SyntaxError, translate("Name too long"));
+        }
         qstr id = qstr_from_strn(lex->vstr.buf, lex->vstr.len);
         #if MICROPY_COMP_CONST
         // if name is a standalone identifier, look it up in the table of dynamic constants