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

don't use variable-length arrays

This commit is contained in:
Yuichi Nishiwaki 2015-01-28 00:56:45 +09:00
parent fc6e724e8e
commit 70b2c23ff7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extlib/benz/number.c
View File

@ -525,6 +525,9 @@ pic_number_number_to_string(pic_state *pic)
double f; double f;
bool e; bool e;
int radix = 10; int radix = 10;
pic_str *str;
size_t s;
char *buf;
pic_get_args(pic, "F|i", &f, &e, &radix); pic_get_args(pic, "F|i", &f, &e, &radix);
@ -535,19 +538,24 @@ pic_number_number_to_string(pic_state *pic)
if (e) { if (e) {
int ival = (int) f; int ival = (int) f;
int ilen = number_string_length(ival, radix); int ilen = number_string_length(ival, radix);
char buf[ilen + 1]; s = ilen + 1;
buf = pic_malloc(pic, s);
number_string(ival, radix, ilen, buf); number_string(ival, radix, ilen, buf);
return pic_obj_value(pic_make_str(pic, buf, sizeof buf - 1));
} }
else { else {
char buf[snprintf(NULL, 0, "%f", f) + 1]; s = snprintf(NULL, 0, "%f", f) + 1;
snprintf(buf, sizeof buf, "%f", f); buf = pic_malloc(pic, s);
return pic_obj_value(pic_make_str(pic, buf, sizeof buf - 1)); snprintf(buf, s, "%f", f);
} }
str = pic_make_str(pic, buf, s - 1);
pic_free(pic, buf);
return pic_obj_value(str);
} }
static pic_value static pic_value