Browse Source

daemon: add memcheck() in various places where we expect things to be initialized.

This just causes valgrind to warn sooner.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 9 years ago
parent
commit
c1d1b360bf
  1. 3
      bitcoin/script.c
  2. 5
      daemon/packets.c
  3. 4
      funding.c

3
bitcoin/script.c

@ -7,6 +7,7 @@
#include <ccan/crypto/ripemd160/ripemd160.h> #include <ccan/crypto/ripemd160/ripemd160.h>
#include <ccan/crypto/sha256/sha256.h> #include <ccan/crypto/sha256/sha256.h>
#include <ccan/endian/endian.h> #include <ccan/endian/endian.h>
#include <ccan/mem/mem.h>
/* Some standard ops */ /* Some standard ops */
#define OP_PUSHBYTES(val) (val) #define OP_PUSHBYTES(val) (val)
@ -76,7 +77,7 @@ static void add_push_bytes(u8 **scriptp, const void *mem, size_t len)
add(scriptp, &v, 4); add(scriptp, &v, 4);
} }
add(scriptp, mem, len); add(scriptp, memcheck(mem, len), len);
} }
static void add_number(u8 **script, u32 num) static void add_number(u8 **script, u32 num)

5
daemon/packets.c

@ -469,9 +469,12 @@ Pkt *accept_pkt_htlc_update(const tal_t *ctx,
peer_get_revocation_hash(peer, peer->num_htlcs+1, peer_get_revocation_hash(peer, peer->num_htlcs+1,
&cur->our_revocation_hash); &cur->our_revocation_hash);
memcheck(&cur->their_revocation_hash, sizeof(cur->their_revocation_hash));
/* Now we create the commit tx pair. */ /* Now we create the commit tx pair. */
make_commit_txs(cur, peer, &cur->our_revocation_hash, make_commit_txs(cur, peer,
memcheck(&cur->our_revocation_hash,
sizeof(cur->our_revocation_hash)),
&cur->their_revocation_hash, &cur->their_revocation_hash,
cur->cstate, cur->cstate,
&cur->our_commit, &cur->their_commit); &cur->our_commit, &cur->their_commit);

4
funding.c

@ -1,5 +1,6 @@
#include "funding.h" #include "funding.h"
#include <assert.h> #include <assert.h>
#include <ccan/mem/mem.h>
#include <ccan/structeq/structeq.h> #include <ccan/structeq/structeq.h>
#include <string.h> #include <string.h>
@ -188,6 +189,9 @@ void funding_add_htlc(struct channel_oneside *creator,
creator->htlcs[n].msatoshis = msatoshis; creator->htlcs[n].msatoshis = msatoshis;
creator->htlcs[n].expiry = *expiry; creator->htlcs[n].expiry = *expiry;
creator->htlcs[n].rhash = *rhash; creator->htlcs[n].rhash = *rhash;
memcheck(&creator->htlcs[n].msatoshis,
sizeof(creator->htlcs[n].msatoshis));
memcheck(&creator->htlcs[n].rhash, sizeof(creator->htlcs[n].rhash));
} }
size_t funding_find_htlc(struct channel_oneside *creator, size_t funding_find_htlc(struct channel_oneside *creator,

Loading…
Cancel
Save