summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-10-09 16:48:55 +0100
committerDamien George <damien.p.george@gmail.com>2014-10-09 16:48:55 +0100
commita8202762f0092896c45378cea95076780b2c0aae (patch)
tree97f61588e14a7936e4d659d4cb923138a399290f /py
parent7989b076376900ee6fb0ab7a86875844b5c179aa (diff)
parente20cbbec7374be5003706ef243a3433a19a01841 (diff)
downloadmicropython-a8202762f0092896c45378cea95076780b2c0aae.tar.gz
micropython-a8202762f0092896c45378cea95076780b2c0aae.zip
Merge branch 'lexer-crash' of https://github.com/dhylands/micropython into dhylands-lexer-crash
Diffstat (limited to 'py')
-rw-r--r--py/lexerstr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/py/lexerstr.c b/py/lexerstr.c
index a919dc7e14..3a68441107 100644
--- a/py/lexerstr.c
+++ b/py/lexerstr.c
@@ -52,7 +52,10 @@ STATIC void str_buf_free(mp_lexer_str_buf_t *sb) {
}
mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, mp_uint_t len, mp_uint_t free_len) {
- mp_lexer_str_buf_t *sb = m_new_obj(mp_lexer_str_buf_t);
+ mp_lexer_str_buf_t *sb = m_new_maybe(mp_lexer_str_buf_t, 1);
+ if (sb == NULL) {
+ return NULL;
+ }
sb->free_len = free_len;
sb->src_beg = str;
sb->src_cur = str;