From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 17 Jul 2018 20:04:20 +0000 (-0400)
Subject: Stupid static analysis?
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e810b49e25bf330aeb48de05f041af0d08580afd;p=thirdparty%2Ffreeradius-server.git

Stupid static analysis?
---

diff --git a/src/lib/server/state.c b/src/lib/server/state.c
index d0532b111b9..8d3e4bf86f2 100644
--- a/src/lib/server/state.c
+++ b/src/lib/server/state.c
@@ -428,17 +428,17 @@ static fr_state_entry_t *state_entry_create(fr_state_tree_t *state, REQUEST *req
 		 *	16 octets of randomness should be enough to
 		 *	have a globally unique state.
 		 */
-		if (!old) {
-			for (i = 0; i < sizeof(entry->state) / sizeof(x); i++) {
-				x = fr_rand();
-				memcpy(entry->state + (i * 4), &x, sizeof(x));
-			}
+		if (old) {
+			memcpy(entry->state, old_state, sizeof(entry->state));
+			entry->tries = old_tries + 1;
 		/*
 		 *	Base the new state on the old state if we had one.
 		 */
 		} else {
-			memcpy(entry->state, old_state, sizeof(entry->state));
-			entry->tries = old_tries + 1;
+			for (i = 0; i < sizeof(entry->state) / sizeof(x); i++) {
+				x = fr_rand();
+				memcpy(entry->state + (i * 4), &x, sizeof(x));
+			}
 		}
 
 		entry->state_comp.tries = entry->tries + 1;