djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Routines related to terminal reading should use system malloc.

Browse Source 
Otherwise we have mixup between system and GC alloc.
This commit is contained in:
Paul Sokolovsky 2014-04-04 17:47:53 +03:00
parent a7752a4540
commit 70193b2b4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/main.c
View File

@ -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) { static char *strjoin(const char *s1, int sep_char, const char *s2) {
int l1 = strlen(s1); int l1 = strlen(s1);
int l2 = strlen(s2); int l2 = strlen(s2);
char *s = m_new(char, l1 + l2 + 2); char *s = malloc(l1 + l2 + 2);
memcpy(s, s1, l1); memcpy(s, s1, l1);
if (sep_char != 0) { if (sep_char != 0) {
s[l1] = sep_char; s[l1] = sep_char;