aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

common: avoid locale dependent strtod(3)

Browse Source 
Replace `json_to_double()` (which uses `strtod(3)`) with our own
floating-point parsing function `json_to_millionths()` that
specifically expects to receive such a number that can fit in a
64 bit integer after being multiplied by 1 million.

The main piece of the code in this patch comes from
https://github.com/ElementsProject/lightning/pull/3535#discussion_r381041419

Changelog-None
This commit is contained in:
Rusty Russell
2020-02-19 11:11:36 +01:00
parent 89ceb273f5
commit 73ad9b5c0a
4 changed files with 104 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
common/test/run-json.c
View File

@@ -46,6 +46,62 @@ static int test_json_tok_bitcoin_amount(void)
return 0;
}
static void do_json_tok_millionths(const char *val, bool ok, uint64_t expected)
{
uint64_t amount;
jsmntok_t tok;
tok.start = 0;
tok.end = strlen(val);
assert(json_to_millionths(val, &tok, &amount) == ok);
if (ok)
assert(amount == expected);
}
static int test_json_tok_millionths(void)
{
do_json_tok_millionths("", false, 0);
do_json_tok_millionths("0..0", false, 0);
do_json_tok_millionths("0.0.", false, 0);
do_json_tok_millionths(".", false, 0);
do_json_tok_millionths("..", false, 0);
do_json_tok_millionths("0", true, 0);
do_json_tok_millionths(".0", true, 0);
do_json_tok_millionths("0.", true, 0);
do_json_tok_millionths("100", true, 100 * 1000000);
do_json_tok_millionths("100.0", true, 100 * 1000000);
do_json_tok_millionths("100.", true, 100 * 1000000);
do_json_tok_millionths("100.000001", true, 100 * 1000000 + 1);
do_json_tok_millionths("100.0000001", true, 100 * 1000000);
do_json_tok_millionths(".000009", true, 9);
do_json_tok_millionths(".0000099", true, 9);
do_json_tok_millionths("18446744073709.551615", true,
18446744073709551615ULL);
do_json_tok_millionths("18446744073709.551616", false, 0);
do_json_tok_millionths("18446744073709.551625", false, 0);
do_json_tok_millionths("18446744073709.551715", false, 0);
do_json_tok_millionths("18446744073709.552615", false, 0);
do_json_tok_millionths("18446744073709.561615", false, 0);
do_json_tok_millionths("18446744073709.651615", false, 0);
do_json_tok_millionths("18446744073710.551615", false, 0);
do_json_tok_millionths("18446744073809.551615", false, 0);
do_json_tok_millionths("18446744074709.551615", false, 0);
do_json_tok_millionths("18446744083709.551615", false, 0);
do_json_tok_millionths("18446744173709.551615", false, 0);
do_json_tok_millionths("18446745073709.551615", false, 0);
do_json_tok_millionths("18446754073709.551615", false, 0);
do_json_tok_millionths("18446844073709.551615", false, 0);
do_json_tok_millionths("18447744073709.551615", false, 0);
do_json_tok_millionths("18456744073709.551615", false, 0);
do_json_tok_millionths("18546744073709.551615", false, 0);
do_json_tok_millionths("19446744073709.551615", false, 0);
do_json_tok_millionths("28446744073709.551615", false, 0);
return 0;
}
static void test_json_tok_size(void)
{
const jsmntok_t *toks;
@@ -190,6 +246,7 @@ int main(void)
test_json_tok_size();
test_json_tok_bitcoin_amount();
test_json_tok_millionths();
test_json_delve();
assert(!taken_any());
take_cleanup();