From: Libor Peltan <libor.peltan@nic.cz>
Date: Wed, 6 Feb 2019 11:35:04 +0000 (+0100)
Subject: nitpicks
X-Git-Tag: v2.8.0~69^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4315eb28ee60c3a7eff65dec8868fe34322e26d;p=thirdparty%2Fknot-dns.git

nitpicks
---

diff --git a/src/knot/journal/journal_read.c b/src/knot/journal/journal_read.c
index eecd45cb09..7d740a50d5 100644
--- a/src/knot/journal/journal_read.c
+++ b/src/knot/journal/journal_read.c
@@ -196,6 +196,10 @@ bool journal_read_changeset(journal_read_t *ctx, changeset_t *ch)
 	}
 	while (journal_read_rrset(ctx, &rr, false)) {
 		if (rr_is_apex_soa(&rr, ctx->zone)) {
+			if (ch->soa_from != NULL) {
+				ctx->txn.ret = KNOT_EMALF;
+				goto fail;
+			}
 			ch->soa_from = soa;
 			ch->remove = tree;
 			soa = malloc(sizeof(*soa));
diff --git a/src/knot/journal/journal_write.c b/src/knot/journal/journal_write.c
index 5aa95068cb..81a116dd01 100644
--- a/src/knot/journal/journal_write.c
+++ b/src/knot/journal/journal_write.c
@@ -110,7 +110,7 @@ bool journal_delete(knot_lmdb_txn_t *txn, uint32_t from, const knot_dname_t *zon
 void journal_try_flush(zone_journal_t j, knot_lmdb_txn_t *txn, journal_metadata_t *md)
 {
 	bool flush = journal_allow_flush(j);
-	uint32_t merge_orig;
+	uint32_t merge_orig = 0;
 	if (journal_contains(txn, true, 0, j.zone)) {
 		journal_merge(j, txn, true, 0, &merge_orig);
 		if (!flush) {
diff --git a/src/knot/journal/knot_lmdb.c b/src/knot/journal/knot_lmdb.c
index 7aa60147ad..b45d685766 100644
--- a/src/knot/journal/knot_lmdb.c
+++ b/src/knot/journal/knot_lmdb.c
@@ -530,7 +530,9 @@ MDB_val knot_lmdb_make_key(const char *format, ...)
 	va_end(arg);
 
 	// second, alloc the key and fill it
-	key.mv_data = malloc(key.mv_size);
+	if (key.mv_size > 0) {
+		key.mv_data = malloc(key.mv_size);
+	}
 	if (key.mv_data == NULL) {
 		return key;
 	}