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

common/bolt11: fix 32-bit compilation.

Browse Source 
Fixes d9fed06b90:

```
common/bolt11.c:868:31: error: format specifies type 'size_t' (aka 'unsigned long') but the argument has type 'u64' (aka 'unsigned long long') [-Werror,-Wformat]
                                           bech32_charset[type], field_len);
                                                                 ^~~~~~~~~
```

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-01-30 14:59:57 +10:30
parent 2dec805465
commit a3ca3fb047
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/bolt11.c
View File

@@ -826,7 +826,8 @@ struct bolt11 *bolt11_decode_nosig(const tal_t *ctx, const char *str,
while (data_len > 520 / 5) { while (data_len > 520 / 5) {
const char *problem = NULL; const char *problem = NULL;
u64 type, field_len; u64 type, field_len64;
size_t field_len;
const struct decoder *decoder; const struct decoder *decoder;
/* BOLT #11: /* BOLT #11:
@@ -841,15 +842,21 @@ struct bolt11 *bolt11_decode_nosig(const tal_t *ctx, const char *str,
if (err) if (err)
return decode_fail(b11, fail, return decode_fail(b11, fail,
"Can't get tag: %s", err); "Can't get tag: %s", err);
err = pull_uint(&hu5, &data, &data_len, &field_len, 10); err = pull_uint(&hu5, &data, &data_len, &field_len64, 10);
if (err) if (err)
return decode_fail(b11, fail, return decode_fail(b11, fail,
"Can't get length: %s", err); "Can't get length: %s", err);
/* Can't exceed total data remaining. */ /* Can't exceed total data remaining. */
if (field_len > data_len) if (field_len64 > data_len)
return decode_fail(b11, fail, "%c: truncated", return decode_fail(b11, fail, "%c: truncated",
bech32_charset[type]); bech32_charset[type]);
/* These are different types on 32 bit! But since data_len is
* also size_t, above check ensures this will fit. */
field_len = field_len64;
assert(field_len == field_len64);
/* Do this now: the decode function fixes up the data ptr */ /* Do this now: the decode function fixes up the data ptr */
data_len -= field_len; data_len -= field_len;