vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

strings.builder: fix a memory leak

pull/4758/head
Alexander Medvednikov 2020-05-06 11:11:57 +00:00
parent e87289f24d
commit 25db5e96a3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/strings/builder.c.v
View File

@ -106,7 +106,7 @@ pub fn (b mut Builder) free() {
} }
// QTODO checker bug // QTODO checker bug
s := b.initial_size s := b.initial_size
b.buf = []byte{cap: s} //b.buf = []byte{cap: s}
b.len = 0 b.len = 0
b.str_calls = 0 b.str_calls = 0
} }

7
vlib/v/gen/cgen.v
View File

@ -3310,7 +3310,7 @@ fn (mut g Gen) gen_str_for_array(info table.Array, styp, str_fn_name string) {
g.auto_str_funcs.writeln('\t\tstring x = ${field_styp}_str(it);') g.auto_str_funcs.writeln('\t\tstring x = ${field_styp}_str(it);')
} }
g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, x);') g.auto_str_funcs.writeln('\t\tstrings__Builder_write(&sb, x);')
if info.elem_type != table.bool_type { if g.pref.autofree && info.elem_type != table.bool_type {
// no need to free "true"/"false" literals // no need to free "true"/"false" literals
g.auto_str_funcs.writeln('\t\tstring_free(x);') g.auto_str_funcs.writeln('\t\tstring_free(x);')
} }
@ -3319,7 +3319,10 @@ fn (mut g Gen) gen_str_for_array(info table.Array, styp, str_fn_name string) {
g.auto_str_funcs.writeln('\t\t}') g.auto_str_funcs.writeln('\t\t}')
g.auto_str_funcs.writeln('\t}') g.auto_str_funcs.writeln('\t}')
g.auto_str_funcs.writeln('\tstrings__Builder_write(&sb, tos3("]"));') g.auto_str_funcs.writeln('\tstrings__Builder_write(&sb, tos3("]"));')
g.auto_str_funcs.writeln('\treturn strings__Builder_str(&sb);') g.auto_str_funcs.writeln('\tstring res = strings__Builder_str(&sb);')
g.auto_str_funcs.writeln('\tstrings__Builder_free(&sb);')
// g.auto_str_funcs.writeln('\treturn strings__Builder_str(&sb);')
g.auto_str_funcs.writeln('\treturn res;')
g.auto_str_funcs.writeln('}') g.auto_str_funcs.writeln('}')
} }