mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-26 20:30:59 +01:00
Code Issues Projects Releases Wiki Activity

common/gossmap: don't memcpy NULL, 0, and don't add 0 to NULL pointer.

Browse source 
Of course, NULL and length 0 are natural partners, but We Can't Have Nice Things.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-04-01 14:10:23 +10:30
parent 3be36a66e3
commit 2005ca436e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/gossmap.c
View file

@ -808,7 +808,9 @@ bool gossmap_local_addchan(struct gossmap_localmods *localmods,
be16 = cpu_to_be16(tal_bytelen(features)); be16 = cpu_to_be16(tal_bytelen(features));
memcpy(localmods->local + off, &be16, sizeof(be16)); memcpy(localmods->local + off, &be16, sizeof(be16));
off += sizeof(be16); off += sizeof(be16);
memcpy(localmods->local + off, features, tal_bytelen(features)); /* Damn you, C committee! */
if (features)
memcpy(localmods->local + off, features, tal_bytelen(features));
off += tal_bytelen(features); off += tal_bytelen(features);
/* Skip chain_hash */ /* Skip chain_hash */

6
wire/fromwire.c
View file

@ -32,9 +32,11 @@ const u8 *fromwire(const u8 **cursor, size_t *max, void *copy, size_t n)
SUPERVERBOSE("less than encoding length"); SUPERVERBOSE("less than encoding length");
return fromwire_fail(cursor, max); return fromwire_fail(cursor, max);
} }
*cursor += n; /* ubsan: runtime error: applying zero offset to null pointer */
if (*cursor)
*cursor += n;
*max -= n; *max -= n;
if (copy) if (copy && n)
memcpy(copy, p, n); memcpy(copy, p, n);
return memcheck(p, n); return memcheck(p, n);
} }