conservatory
/
femtolisp
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #47 from jniewerth/patch-1 

gc_handle buf earlier in fl_string to prevent segfaults
This commit is contained in:
Jeff Bezanson 2017-07-13 15:43:18 -04:00 committed by GitHub
parent d96227948b d49122bb81
commit db4982b0ed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
string.c
View File

@ -126,6 +126,7 @@ value_t fl_string(value_t *args, u_int32_t nargs)
if (nargs == 1 && fl_isstring(args[0])) if (nargs == 1 && fl_isstring(args[0]))
return args[0]; return args[0];
value_t arg, buf = fl_buffer(NULL, 0); value_t arg, buf = fl_buffer(NULL, 0);
fl_gc_handle(&buf);
ios_t *s = value2c(ios_t*,buf); ios_t *s = value2c(ios_t*,buf);
uint32_t i; uint32_t i;
value_t oldpr = symbol_value(printreadablysym); value_t oldpr = symbol_value(printreadablysym);
@ -137,7 +138,6 @@ value_t fl_string(value_t *args, u_int32_t nargs)
} }
set(printreadablysym, oldpr); set(printreadablysym, oldpr);
set(printprettysym, oldpp); set(printprettysym, oldpp);
fl_gc_handle(&buf);
value_t outp = stream_to_string(&buf); value_t outp = stream_to_string(&buf);
fl_free_gc_handles(1); fl_free_gc_handles(1);
return outp; return outp;