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

common/json: remove asserts() which may trigger from user input.

Browse Source 
They don't currently, since callers check, but be safe.  In addition,
handle NULL returns from these in the bitcoind code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-10-24 12:53:43 +10:30
committed by Christian Decker
parent 11b43a422b
commit 81db5896e1
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/json.c
View File

@@ -157,7 +157,8 @@ const jsmntok_t *json_get_member(const char *buffer, const jsmntok_t tok[],
{ {
const jsmntok_t *t, *end; const jsmntok_t *t, *end;
assert(tok->type == JSMN_OBJECT); if (tok->type != JSMN_OBJECT)
return NULL;
end = json_next(tok); end = json_next(tok);
for (t = tok + 1; t < end; t = json_next(t+1)) for (t = tok + 1; t < end; t = json_next(t+1))
@@ -171,7 +172,8 @@ const jsmntok_t *json_get_arr(const jsmntok_t tok[], size_t index)
{ {
const jsmntok_t *t, *end; const jsmntok_t *t, *end;
assert(tok->type == JSMN_ARRAY); if (tok->type != JSMN_ARRAY)
return NULL;
end = json_next(tok); end = json_next(tok);
for (t = tok + 1; t < end; t = json_next(t)) { for (t = tok + 1; t < end; t = json_next(t)) {
@@ -235,8 +237,8 @@ bool json_get_params(const char *buffer, const jsmntok_t param[], ...)
else else
p = param + 1; p = param + 1;
end = json_next(param); end = json_next(param);
} else } else if (param->type != JSMN_OBJECT)
assert(param->type == JSMN_OBJECT); return false;
va_start(ap, param); va_start(ap, param);
while ((name = va_arg(ap, const char *)) != NULL) { while ((name = va_arg(ap, const char *)) != NULL) {

8
lightningd/bitcoind.c
View File

@@ -342,6 +342,14 @@ static void process_chaintips(struct bitcoin_cli *bcli)
const jsmntok_t *status = json_get_member(bcli->output, t, "status"); const jsmntok_t *status = json_get_member(bcli->output, t, "status");
const jsmntok_t *hash = json_get_member(bcli->output, t, "hash"); const jsmntok_t *hash = json_get_member(bcli->output, t, "hash");
if (!status || !hash) {
log_broken(bcli->bitcoind->log,
"%s: No status & hash: %.*s",
bcli_args(bcli),
(int)bcli->output_bytes, bcli->output);
continue;
}
if (!json_tok_streq(bcli->output, status, "active")) { if (!json_tok_streq(bcli->output, status, "active")) {
log_debug(bcli->bitcoind->log, log_debug(bcli->bitcoind->log,
"Ignoring chaintip %.*s status %.*s", "Ignoring chaintip %.*s status %.*s",