Merge pull request #214 from pfalcon/compile-mem-leaks

dpgeorge · dpgeorge · commit d552db426b3b · 2014-01-23T14:27:40.000-08:00
Memory leaks in lexer/compiler
diff --git a/py/compile.c b/py/compile.c
@@ -3156,18 +3156,24 @@ mp_obj_t mp_compile(mp_parse_node_t pn, qstr source_file, bool is_repl) {
 
     bool had_error = comp->had_error;
     m_del_obj(compiler_t, comp);
+    uint unique_code_id = module_scope->unique_code_id;
+    for (scope_t *s = module_scope; s;) {
+        scope_t *next = s->next;
+        scope_free(s);
+        s = next;
+    }
 
     if (had_error) {
         // TODO return a proper error message
         return mp_const_none;
     } else {
 #if MICROPY_EMIT_CPYTHON
         // can't create code, so just return true
-        (void)module_scope; // to suppress warning that module_scope is unused
+        (void)unique_code_id; // to suppress warning that module_scope is unused
         return mp_const_true;
 #else
         // return function that executes the outer module
-        return rt_make_function_from_id(module_scope->unique_code_id);
+        return rt_make_function_from_id(unique_code_id);
 #endif
     }
 }
diff --git a/py/lexer.c b/py/lexer.c
@@ -691,6 +691,7 @@ void mp_lexer_free(mp_lexer_t *lex) {
             lex->stream_close(lex->stream_data);
         }
         vstr_clear(&lex->vstr);
+        m_del(uint16_t, lex->indent_level, lex->alloc_indent_level);
         m_del_obj(mp_lexer_t, lex);
     }
 }
diff --git a/py/scope.c b/py/scope.c
@@ -60,6 +60,11 @@ scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, uint
     return scope;
 }
 
+void scope_free(scope_t *scope) {
+    m_del(id_info_t, scope->id_info, scope->id_info_alloc);
+    m_del(scope_t, scope, 1);
+}
+
 id_info_t *scope_find_or_add_id(scope_t *scope, qstr qstr, bool *added) {
     for (int i = 0; i < scope->id_info_len; i++) {
         if (scope->id_info[i].qstr == qstr) {
diff --git a/py/scope.h b/py/scope.h
@@ -56,6 +56,7 @@ typedef struct _scope_t {
 } scope_t;
 
 scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, uint unique_code_id, uint emit_options);
+void scope_free(scope_t *scope);
 id_info_t *scope_find_or_add_id(scope_t *scope, qstr qstr, bool *added);
 id_info_t *scope_find(scope_t *scope, qstr qstr);
 id_info_t *scope_find_global(scope_t *scope, qstr qstr);

Original file line number	Diff line number	Diff line change
`@@ -691,6 +691,7 @@ void mp_lexer_free(mp_lexer_t *lex) {`
`691`	`691`	`lex->stream_close(lex->stream_data);`
`692`	`692`	`}`
`693`	`693`	`vstr_clear(&lex->vstr);`
	`694`	`+ m_del(uint16_t, lex->indent_level, lex->alloc_indent_level);`
`694`	`695`	`m_del_obj(mp_lexer_t, lex);`
`695`	`696`	`}`
`696`	`697`	`}`