Merge branch 'master' of ssh://gnunet.org/gnunet

1 files changed, 6 insertions, 7 deletions

diff --git a/src/consensus/plugin_block_consensus.c b/src/consensus/plugin_block_consensus.c
index fb6da5bcd..cdac12ed5 100644
--- a/src/consensus/plugin_block_consensus.c
+++ b/src/consensus/plugin_block_consensus.c
@@ -58,13 +58,12 @@ block_plugin_consensus_evaluate (void *cls,
                                  const void *reply_block,
                                  size_t reply_block_size)
 {
-  if (reply_block_size < sizeof(struct ConsensusElement))
-    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-
   const struct ConsensusElement *ce = reply_block;
 
-  if ((0 != ce->marker) ||
-      (0 == ce->payload_type))
+  if (reply_block_size < sizeof(struct ConsensusElement))
+    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+  if ( (0 != ce->marker) ||
+       (0 == ce->payload_type) )
     return GNUNET_BLOCK_EVALUATION_OK_MORE;
 
   return GNUNET_BLOCK_evaluate (ctx,
@@ -75,8 +74,8 @@ block_plugin_consensus_evaluate (void *cls,
                                 xquery,
                                 xquery_size,
                                 &ce[1],
-                                reply_block_size - sizeof(struct
-                                                          ConsensusElement));
+                                reply_block_size
+                                - sizeof(struct ConsensusElement));
 }