mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-01-11 00:48:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix localeconv values and implementation

Browse Source 
dynamic-allocation of the structure is not valid; it can crash an
application if malloc fails. since localeconv is not specified to have
failure conditions, the object needs to have static storage duration.

need to review whether all the values are right or not still..
This commit is contained in:
Rich Felker 2012-06-19 22:44:08 -04:00
parent ee96c50d4b
commit 85a3ba3a28
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/locale/localeconv.c
View File

@ -2,21 +2,34 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
static const struct lconv posix_lconv = {
.decimal_point = ".",
.thousands_sep = "",
.grouping = "",
.int_curr_symbol = "",
.currency_symbol = "",
.mon_decimal_point = "",
.mon_thousands_sep = "",
.mon_grouping = "",
.positive_sign = "",
.negative_sign = "",
.int_frac_digits = -1,
.frac_digits = -1,
.p_cs_precedes = -1,
.p_sep_by_space = -1,
.n_cs_precedes = -1,
.n_sep_by_space = -1,
.p_sign_posn = -1,
.n_sign_posn = -1,
.int_p_cs_precedes = -1,
.int_p_sep_by_space = -1,
.int_n_cs_precedes = -1,
.int_n_sep_by_space = -1,
.int_p_sign_posn = -1,
.int_n_sign_posn = -1,
};
struct lconv *localeconv(void) struct lconv *localeconv(void)
{ {
static struct lconv *posix_lconv; return (void *)&posix_lconv;
if (posix_lconv) return posix_lconv;
posix_lconv = malloc(sizeof *posix_lconv);
memset(posix_lconv, -1, sizeof *posix_lconv);
posix_lconv->decimal_point = ".";
posix_lconv->thousands_sep = "";
posix_lconv->grouping = "\xff";
posix_lconv->int_curr_symbol = ""; //"\xc2\xa4";
posix_lconv->currency_symbol = "";
posix_lconv->mon_decimal_point = "";
posix_lconv->mon_thousands_sep = "";
posix_lconv->mon_grouping = "\xff";
posix_lconv->positive_sign = ""; // "+";
posix_lconv->negative_sign = ""; // "-";
return posix_lconv;
} }