diff options
author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-04 17:47:53 +0300 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-04 17:50:02 +0300 |
commit | 70193b2b4c377c65d45cd1e6a9ab96d61c61f262 (patch) | |
tree | c510751061dd66117a572baea1daf7ec5f9c5cc0 | |
parent | a7752a4540958a3233f4754fb06986dcacb865b0 (diff) | |
download | micropython-70193b2b4c377c65d45cd1e6a9ab96d61c61f262.tar.gz micropython-70193b2b4c377c65d45cd1e6a9ab96d61c61f262.zip |
unix: Routines related to terminal reading should use system malloc.
Otherwise we have mixup between system and GC alloc.
-rw-r--r-- | unix/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/main.c b/unix/main.c index c3bd24cd98..911d908b1a 100644 --- a/unix/main.c +++ b/unix/main.c @@ -97,7 +97,7 @@ static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind static char *strjoin(const char *s1, int sep_char, const char *s2) { int l1 = strlen(s1); int l2 = strlen(s2); - char *s = m_new(char, l1 + l2 + 2); + char *s = malloc(l1 + l2 + 2); memcpy(s, s1, l1); if (sep_char != 0) { s[l1] = sep_char; |