From 4a9e26c4ac98b9c24daa3adf5d41d4533a5b16c7 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 19 Feb 2018 10:59:31 +0100 Subject: [PATCH] Add assertions to clarify our assumptions about msg != NULL --- lightningd/pay.c | 5 +++-- lightningd/payalgo.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lightningd/pay.c b/lightningd/pay.c index 5cc9af9b230d..713b9a1e488d 100644 --- a/lightningd/pay.c +++ b/lightningd/pay.c @@ -636,8 +636,8 @@ static void json_sendpay_on_resolve(const struct sendpay_result *r, { struct command *cmd = (struct command*) vcmd; - struct json_result *data; - const char *msg; + struct json_result *data = NULL; + const char *msg = NULL; struct routing_failure *fail; if (r->succeeded) @@ -693,6 +693,7 @@ static void json_sendpay_on_resolve(const struct sendpay_result *r, break; } + assert(msg); command_fail_detailed(cmd, r->errorcode, data, "%s", msg); } } diff --git a/lightningd/payalgo.c b/lightningd/payalgo.c index 83e2c72d85e3..9921ec9a4ee4 100644 --- a/lightningd/payalgo.c +++ b/lightningd/payalgo.c @@ -51,8 +51,8 @@ json_pay_success(struct command *cmd, static void json_pay_failure(struct command *cmd, const struct sendpay_result *r) { - struct json_result *data; - const char *msg; + struct json_result *data = NULL; + const char *msg = NULL; struct routing_failure *fail; assert(!r->succeeded); @@ -109,6 +109,7 @@ static void json_pay_failure(struct command *cmd, break; } + assert(msg); command_fail_detailed(cmd, r->errorcode, data, "%s", msg); }